Merge branch 'master' of ssh://wisemapping.com/var/git-repos/wise-source

installer/build.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 
 set -e	
+set -u
 
-WISE_VERSION=0.96
+WISE_VERSION=$1
 BASE_DIR=`pwd`
 TARGET_DIR=$BASE_DIR/target
 JETTY_DIR=$TARGET_DIR/wisemapping-$WISE_VERSION
@@ -17,7 +18,7 @@ rm -fr ${JETTY_DIR}
 rm -fr ${TARGET_DIR}/jetty-distribution-7.3.0.v20110203
 
 # Prepare resources ..
-mvn -f $BASE_DIR/../pom.xml install
+mvn -f $BASE_DIR/../pom.xml install -Dmaven.test.skip=true
 
 if [ ! -f ./target/${JETTY_ZIP}  ]
 then	
@@ -29,7 +30,6 @@ echo "Unzip Jetty ...:"
 unzip ${TARGET_DIR}/${JETTY_ZIP}  -d ${TARGET_DIR}/ > /dev/null
 mv ${TARGET_DIR}/${JETTY_DIST_DIR} ${JETTY_DIR}
                    
-
 # Clean unsed files ...
 rm -r $JETTY_DIR/webapps/*
 rm -r $JETTY_DIR/contexts/*
@@ -48,7 +48,11 @@ cp $BASE_DIR/wisemapping.xml $JETTY_DIR/contexts/
 sed 's/target\/db\/wisemapping/webapps\/wisemapping\/WEB-INF\/database\/wisemapping/' $WISE_WEBAPP_DIR/WEB-INF/app.properties > $WISE_WEBAPP_DIR/WEB-INF/app.properties2
 mv $WISE_WEBAPP_DIR/WEB-INF/app.properties2 $WISE_WEBAPP_DIR/WEB-INF/app.properties
 
-#Build final Zip
+
+# Distribute scripts
+cp -r $BASE_DIR/../wise-webapp/src/test/sql $TARGET_DIR/wisemapping-$WISE_VERSION/config
+
+# Zip all ...
 cd $TARGET_DIR
 zip -r wisemapping-$WISE_VERSION.zip wisemapping-$WISE_VERSION
 cd ..

wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java

@@ -18,13 +18,11 @@
 
 package com.wisemapping.exporter;
 
-import com.wisemapping.exporter.ExportException;
+
-import com.wisemapping.exporter.Exporter;
 import com.wisemapping.importer.freemind.FreemindIconConverter;
 import com.wisemapping.model.MindMap;
 import com.wisemapping.model.ShapeStyle;
 import com.wisemapping.util.JAXBUtils;
-import com.wisemapping.xml.Style;
 import com.wisemapping.xml.freemind.*;
 import com.wisemapping.xml.mindmap.RelationshipType;
 import com.wisemapping.xml.mindmap.TopicType;
@@ -140,7 +138,7 @@ public class FreemindExporter
 
         final String shape = mindmapTopic.getShape();
         if (shape != null && !shape.isEmpty()) {
-            if ( isRoot && !ShapeStyle.ROUNDED_RETAGLE.getStyle().endsWith(shape) || !isRoot && !ShapeStyle.LINE.getStyle().endsWith(shape) ) {
+            if (isRoot && !ShapeStyle.ROUNDED_RETAGLE.getStyle().endsWith(shape) || !isRoot && !ShapeStyle.LINE.getStyle().endsWith(shape)) {
 
                 String style = shape;
                 if (ShapeStyle.ROUNDED_RETAGLE.getStyle().equals(shape)) {
@@ -156,6 +154,16 @@ public class FreemindExporter
             addEdgeNode(freemindNode, mindmapTopic);
             addNote(freemindNode, mindmapTopic);
 
+            final String position = mindmapTopic.getPosition();
+            if (position != null && !position.isEmpty()) {
+                freemindNode.setWcoords(position);
+            }
+
+            final Integer order = mindmapTopic.getOrder();
+            if (order != null) {
+                freemindNode.setWorder(BigInteger.valueOf(order));
+            }
+
             Boolean shrink = mindmapTopic.isShrink();
             if (shrink != null && shrink)
                 freemindNode.setFOLDED(String.valueOf(shrink));

wise-webapp/src/main/java/com/wisemapping/importer/Importer.java

@@ -20,6 +20,7 @@ package com.wisemapping.importer;
 
 import com.wisemapping.model.MindMap;
 
+import java.io.IOException;
 import java.io.InputStream;
 
 public interface Importer

wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java

@@ -45,6 +45,8 @@ import java.math.BigInteger;
 public class FreemindImporter
         implements Importer {
 
+    public static final String CODE_VERSION = "pela";
+    public static final int HALF_ROOT_TOPICS_SEPARATION = 25;
     private com.wisemapping.xml.mindmap.ObjectFactory mindmapObjectFactory;
     private static final String POSITION_LEFT = "left";
     private static final String BOLD = "bold";
@@ -53,45 +55,80 @@ public class FreemindImporter
     private java.util.Map<String, TopicType> nodesMap = null;
     private List<RelationshipType> relationships = null;
     private static final String EMPTY_FONT_STYLE = ";;;;;";
+    private final static Charset UTF_8_CHARSET = Charset.forName("UTF-8");
+    private final static int ORDER_SEPARATION_FACTOR = 2;
 
     private int currentId;
 
+    public static void main(String argv[]) {
+
+
+        // Now, calculate the order it belongs to ...
+        // 3 = -100  0
+        // 1 = -50   1
+        // 0 =  0    2
+        // 2 = 50    3
+        // 4 = 100   4
+
+        int total = 2;
+        int center = (total - 1) / 2;
+
+
+        for (int i = 0; i < total; i++) {
+
+            int result = i - center + ((total % 2 == 0) ? 0 : 1);
+            if (result > 0) {
+                result = (result - 1) * 2;
+            } else {
+                result = (result * -2) + 1;
+            }
+
+            System.out.println(i + "->" + result);
+        }
+
+    }
+
     public MindMap importMap(String mapName, String description, InputStream input) throws ImporterException {
 
-        final MindMap map;
+        final MindMap result = new MindMap();
+        nodesMap = new HashMap<String, TopicType>();
+        relationships = new ArrayList<RelationshipType>();
         mindmapObjectFactory = new com.wisemapping.xml.mindmap.ObjectFactory();
+
         try {
+            String wiseXml;
             final Map freemindMap = (Map) JAXBUtils.getMapObject(input, "com.wisemapping.xml.freemind");
+            final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
             final com.wisemapping.xml.mindmap.Map mindmapMap = mindmapObjectFactory.createMap();
-            mindmapMap.setVersion("pela");
+            mindmapMap.setVersion(CODE_VERSION);
             currentId = 0;
 
-            final Node centralNode = freemindMap.getNode();
+            final Node freeNode = freemindMap.getNode();
-            final TopicType centralTopic = mindmapObjectFactory.createTopicType();
+            final TopicType wiseTopic = mindmapObjectFactory.createTopicType();
-            centralTopic.setId(String.valueOf(currentId++));
+            wiseTopic.setId(String.valueOf(currentId++));
-            centralTopic.setCentral(true);
+            wiseTopic.setCentral(true);
 
-            setNodePropertiesToTopic(centralTopic, centralNode);
+            convertNodeProperties(freeNode, wiseTopic);
-            centralTopic.setShape(ShapeStyle.ROUNDED_RETAGLE.getStyle());
+
-            mindmapMap.getTopic().add(centralTopic);
+            wiseTopic.setShape(ShapeStyle.ROUNDED_RETAGLE.getStyle());
+            mindmapMap.getTopic().add(wiseTopic);
             mindmapMap.setName(mapName);
 
-            nodesMap = new HashMap<String, TopicType>();
+            nodesMap.put(freeNode.getID(), wiseTopic);
-            relationships = new ArrayList<RelationshipType>();
+
-            nodesMap.put(centralNode.getID(), centralTopic);
+            convertChildNodes(freeNode, wiseTopic, 1);
-            addTopicFromNode(centralNode, centralTopic);
-            fixCentralTopicChildOrder(centralTopic);
 
             addRelationships(mindmapMap);
 
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            JAXBUtils.saveMap(mindmapMap, baos, "com.wisemapping.xml.mindmap");
-            JAXBUtils.saveMap(mindmapMap, out, "com.wisemapping.xml.mindmap");
 
-            map = new MindMap();
+            wiseXml = new String(baos.toByteArray(), UTF_8_CHARSET);
-            map.setNativeXml(new String(out.toByteArray(), Charset.forName("UTF-8")));
+
-            map.setTitle(mapName);
+
-            map.setDescription(description);
+            result.setNativeXml(wiseXml);
+            result.setTitle(mapName);
+            result.setDescription(description);
 
         } catch (JAXBException e) {
             throw new ImporterException(e);
@@ -99,7 +136,7 @@ public class FreemindImporter
             throw new ImporterException(e);
         }
 
-        return map;
+        return result;
     }
 
     private void addRelationships(@NotNull com.wisemapping.xml.mindmap.Map mindmapMap) {
@@ -122,7 +159,7 @@ public class FreemindImporter
         }
     }
 
-    private void fixRelationshipControlPoints(RelationshipType relationship) {
+    private void fixRelationshipControlPoints(@NotNull RelationshipType relationship) {
         //Both relationship node's ids should be freemind ones at this point.
         TopicType srcTopic = nodesMap.get(relationship.getSrcTopicId());
         TopicType destTopicType = nodesMap.get(relationship.getDestTopicId());
@@ -139,7 +176,7 @@ public class FreemindImporter
             relationship.setDestCtrlPoint(x + "," + destCtrlPoint[1]);
         }
 
-        //Fix y coord
+        //Fix coord
         if (srcTopic.getOrder() % 2 != 0) { //Odd order.
             String[] srcCtrlPoint = relationship.getSrcCtrlPoint().split(",");
             int y = Integer.valueOf(srcCtrlPoint[1]) * -1;
@@ -153,168 +190,110 @@ public class FreemindImporter
 
     }
 
-    private void fixCentralTopicChildOrder(@NotNull TopicType centralTopic) {
-        List<TopicType> topics = centralTopic.getTopic();
-        List<TopicType> leftTopics = new ArrayList<TopicType>();
-        List<TopicType> rightTopics = new ArrayList<TopicType>();
-
-        for (TopicType topic : topics) {
-            if (isOnLeftSide(topic)) {
-                leftTopics.add(topic);
-            } else {
-                rightTopics.add(topic);
-            }
-        }
-
-        if (leftTopics.size() > 0) {
-            int size = leftTopics.size();
-            int index = 0;
-            int center = size / 2;
-            if (size % 2 == 0) { //Even number, then place middle point in 1 index
-                index = 1;
-                center--;
-            }
-            int index2 = index;
-
-            leftTopics.get(center).setOrder(index);
-            for (int i = center - 1; i >= 0; i--) {
-                if (index == 0) {
-                    index++;
-                } else {
-                    index += 2;
-                }
-                leftTopics.get(i).setOrder(index);
-            }
-            index = index2;
-            for (int i = center + 1; i < size; i++) {
-                if (index == 1) {
-                    index++;
-                } else {
-                    index += 2;
-                }
-                leftTopics.get(i).setOrder(index);
-            }
-        }
-        if (rightTopics.size() > 0) {
-            int size = rightTopics.size();
-            int index = 0;
-            int center = size / 2;
-            if (size % 2 == 0) { //Even number, then place middle point in 1 index
-                index = 1;
-                center--;
-            }
-            int index2 = index;
-            rightTopics.get(center).setOrder(index);
-            for (int i = center - 1; i >= 0; i--) {
-                if (index == 0) {
-                    index++;
-                } else {
-                    index += 2;
-                }
-                rightTopics.get(i).setOrder(index);
-            }
-            index = index2;
-            for (int i = center + 1; i < size; i++) {
-                if (index == 1) {
-                    index++;
-                } else {
-                    index += 2;
-                }
-                rightTopics.get(i).setOrder(index);
-            }
-        }
-    }
-
     private boolean isOnLeftSide(TopicType topic) {
         String[] position = topic.getPosition().split(",");
         int x = Integer.parseInt(position[0]);
         return x < 0;
     }
 
-    private void addTopicFromNode(@NotNull Node mainNode, @NotNull TopicType topic) {
+    private boolean isOnLeftSide(@NotNull String pos) {
-        final List<Object> freemindNodes = mainNode.getArrowlinkOrCloudOrEdge();
+        String[] position = pos.split(",");
-        TopicType currentTopic = topic;
+        int x = Integer.parseInt(position[0]);
+        return x < 0;
+    }
+
+    private void convertChildNodes(@NotNull Node freeParent, @NotNull TopicType wiseParent, final int depth) {
+        final List<Object> freeChilden = freeParent.getArrowlinkOrCloudOrEdge();
+        TopicType currentWiseTopic = wiseParent;
+
         int order = 0;
-        for (Object freemindNode : freemindNodes) {
+        for (Object element : freeChilden) {
 
-            if (freemindNode instanceof Node) {
+            if (element instanceof Node) {
-                final Node node = (Node) freemindNode;
+                final Node freeChild = (Node) element;
-                TopicType newTopic = mindmapObjectFactory.createTopicType();
+                final TopicType wiseChild = mindmapObjectFactory.createTopicType();
-                newTopic.setId(String.valueOf(currentId++));
-                nodesMap.put(node.getID(), newTopic);  //Lets use freemind id temporarily. This will be fixed when adding relationship to the map.
-                newTopic.setOrder(order++);
 
-                // Is there any link ?
+                // Set an incremental id ...
-                final String url = node.getLINK();
+                wiseChild.setId(String.valueOf(currentId++));
-                if (url != null) {
+
-                    final Link link = new Link();
+                // Lets use freemind id temporarily. This will be fixed when adding relationship to the map.
-                    link.setUrl(url);
+                nodesMap.put(freeChild.getID(), wiseChild);
-                    newTopic.setLink(link);
+
+                // Set node order ...
+                int norder;
+                if (depth != 1) {
+                    norder = order++;
+                } else {
+                    norder = calcFirstLevelOrder(freeChilden, freeChild);
                 }
+                wiseChild.setOrder(norder);
 
-                if (POSITION_LEFT.equals(mainNode.getPOSITION())) {
+                // Convert node position ...
-                    node.setPOSITION(POSITION_LEFT);
+                final String position = convertPosition(wiseParent, freeChild, depth, norder);
+                wiseChild.setPosition(position);
+
+                // Convert the rest of the node properties ...
+                convertNodeProperties(freeChild, wiseChild);
+
+                convertChildNodes(freeChild, wiseChild, depth + 1);
+
+                if (!wiseChild.equals(wiseParent)) {
+                    wiseParent.getTopic().add(wiseChild);
                 }
+                currentWiseTopic = wiseChild;
 
-                setNodePropertiesToTopic(newTopic, node);
+            } else if (element instanceof Font) {
-                addTopicFromNode(node, newTopic);
+                final Font font = (Font) element;
-                if (!newTopic.equals(topic)) {
+                final String fontStyle = generateFontStyle(freeParent, font);
-                    topic.getTopic().add(newTopic);
-                }
-                currentTopic = newTopic;
-
-            } else if (freemindNode instanceof Font) {
-                final Font font = (Font) freemindNode;
-                final String fontStyle = generateFontStyle(mainNode, font);
                 if (fontStyle != null) {
-                    currentTopic.setFontStyle(fontStyle);
+                    currentWiseTopic.setFontStyle(fontStyle);
                 }
-            } else if (freemindNode instanceof Edge) {
+            } else if (element instanceof Edge) {
-                final Edge edge = (Edge) freemindNode;
+                final Edge edge = (Edge) element;
-                currentTopic.setBrColor(edge.getCOLOR());
+                currentWiseTopic.setBrColor(edge.getCOLOR());
-            } else if (freemindNode instanceof Icon) {
+            } else if (element instanceof Icon) {
-                final Icon freemindIcon = (Icon) freemindNode;
+                final Icon freemindIcon = (Icon) element;
 
                 String iconId = freemindIcon.getBUILTIN();
                 final String wiseIconId = FreemindIconConverter.toWiseId(iconId);
                 if (wiseIconId != null) {
                     final com.wisemapping.xml.mindmap.Icon mindmapIcon = new com.wisemapping.xml.mindmap.Icon();
                     mindmapIcon.setId(wiseIconId);
-                    currentTopic.getIcon().add(mindmapIcon);
+                    currentWiseTopic.getIcon().add(mindmapIcon);
                 }
 
-            } else if (freemindNode instanceof Hook) {
+            } else if (element instanceof Hook) {
-                final Hook hook = (Hook) freemindNode;
+                final Hook hook = (Hook) element;
                 final com.wisemapping.xml.mindmap.Note mindmapNote = new com.wisemapping.xml.mindmap.Note();
                 String textNote = hook.getText();
                 if (textNote == null) // It is not a note is a BlinkingNodeHook or AutomaticLayout Hook
                 {
                     textNote = EMPTY_NOTE;
                     mindmapNote.setText(textNote);
-                    currentTopic.setNote(mindmapNote);
+                    currentWiseTopic.setNote(mindmapNote);
                 }
-            } else if (freemindNode instanceof Richcontent) {
+            } else if (element instanceof Richcontent) {
-                final Richcontent content = (Richcontent) freemindNode;
+                final Richcontent content = (Richcontent) element;
                 final String type = content.getTYPE();
 
                 if (type.equals("NODE")) {
                     String text = getText(content);
                     text = text.replaceAll("\n", "");
                     text = text.trim();
-                    currentTopic.setText(text);
+                    currentWiseTopic.setText(text);
                 } else {
                     String text = getRichContent(content);
                     final com.wisemapping.xml.mindmap.Note mindmapNote = new com.wisemapping.xml.mindmap.Note();
                     text = text != null ? text.replaceAll("\n", "%0A") : EMPTY_NOTE;
                     mindmapNote.setText(text);
-                    currentTopic.setNote(mindmapNote);
+                    currentWiseTopic.setNote(mindmapNote);
 
                 }
-            } else if (freemindNode instanceof Arrowlink) {
+            } else if (element instanceof Arrowlink) {
-                final Arrowlink arrow = (Arrowlink) freemindNode;
+                final Arrowlink arrow = (Arrowlink) element;
                 RelationshipType relationship = mindmapObjectFactory.createRelationshipType();
                 String destId = arrow.getDESTINATION();
-                relationship.setSrcTopicId(mainNode.getID());
+                relationship.setSrcTopicId(freeParent.getID());
                 relationship.setDestTopicId(destId);
                 String[] inclination = arrow.getENDINCLINATION().split(";");
                 relationship.setDestCtrlPoint(inclination[0] + "," + inclination[1]);
@@ -329,6 +308,91 @@ public class FreemindImporter
         }
     }
 
+    private int calcFirstLevelOrder(@NotNull List<Object> freeChilden, @NotNull Node freeChild) {
+        final List<Node> nodes = new ArrayList<Node>();
+        int result;
+        if (freeChild.getWorder() != null) {
+            result = freeChild.getWorder().intValue();
+        } else {
+            for (Object child : freeChilden) {
+                if (child instanceof Node) {
+                    Node node = (Node) child;
+
+                    final String side = node.getPOSITION();
+                    if (freeChild.getPOSITION().equals(side)) {
+                        nodes.add(node);
+                    }
+                }
+            }
+
+            // What is the index of the current node ?
+            int nodeIndex = 0;
+            for (Node node : nodes) {
+                if (node == freeChild) {
+                    break;
+                }
+                nodeIndex++;
+            }
+
+            int size = ORDER_SEPARATION_FACTOR * nodes.size();
+            int center = (size - 1) / 2;
+            result = (nodeIndex * ORDER_SEPARATION_FACTOR) - center + ((size % 2 == 0) ? 0 : 1);
+
+            if (result > 0) {
+                result = (result - 1) * 2;
+            } else {
+                result = (result * -2) + 1;
+            }
+
+        }
+        return result;
+    }
+
+    /**
+     * Position is (x,y).
+     * x values greater than 0 are right axis
+     * x values lower than 0 are left axis
+     */
+    private
+    @NotNull
+    String convertPosition(@NotNull TopicType wiseParent, @NotNull Node freeChild, final int depth, int order) {
+
+        // Which side must be the node be positioned ?
+        String result = freeChild.getWcoords();
+        if (result == null) {
+
+            final int xaxis;
+            int y;
+            if (depth == 1) {
+
+                final String side = freeChild.getPOSITION();
+                assert side != null : "This should not happen";
+                xaxis = POSITION_LEFT.equals(side) ? -1 : 1;
+
+                // 3 = -100  1
+                // 1 = -50   2
+                // 0 =  0    3
+                // 2 = 50    4
+                // 4 = 100   5
+                if (order % 2 == 0) {
+                    y = HALF_ROOT_TOPICS_SEPARATION * order;
+                } else {
+                    y = -HALF_ROOT_TOPICS_SEPARATION * (order + 1);
+                }
+
+            } else {
+                final String position = wiseParent.getPosition();
+                xaxis = isOnLeftSide(position) ? -1 : 1;
+                y = 100 * depth; // Todo: This is not right at all. This must be changed. Position must be calculated based on the parent position
+
+            }
+            int x = xaxis * 200 * depth;
+            result = x + "," + y;
+
+        }
+        return result;
+    }
+
     private String getRichContent(Richcontent content) {
         String result = null;
         List<Element> elementList = content.getHtml().getAny();
@@ -346,6 +410,7 @@ public class FreemindImporter
         return result;
     }
 
+    @NotNull
     private String getText(Richcontent content) {
         String result = "";
         List<Element> elementList = content.getHtml().getAny();
@@ -384,34 +449,30 @@ public class FreemindImporter
         return text.toString();
     }
 
-    private void setNodePropertiesToTopic(@NotNull com.wisemapping.xml.mindmap.TopicType wiseTopic, @NotNull com.wisemapping.xml.freemind.Node freemindNode) {
+    private void convertNodeProperties(@NotNull com.wisemapping.xml.freemind.Node freeNode, @NotNull com.wisemapping.xml.mindmap.TopicType wiseTopic) {
-        wiseTopic.setText(freemindNode.getTEXT());
+        final String text = freeNode.getTEXT();
-        wiseTopic.setBgColor(freemindNode.getBACKGROUNDCOLOR());
+        wiseTopic.setText(text);
 
-        final String shape = getShapeFormFromNode(freemindNode);
+        final String bgcolor = freeNode.getBACKGROUNDCOLOR();
+        wiseTopic.setBgColor(bgcolor);
+
+        final String shape = getShapeFormFromNode(freeNode);
         wiseTopic.setShape(shape);
-        int pos = 1;
-        if (POSITION_LEFT.equals(freemindNode.getPOSITION())) {
-            pos = -1;
-        }
-        Integer orderPosition = wiseTopic.getOrder() != null ? wiseTopic.getOrder() : 0;
-        int position = pos * 200 + (orderPosition + 1) * 10;
 
-        wiseTopic.setPosition(position + "," + 200 * orderPosition);
+        final String fontStyle = generateFontStyle(freeNode, null);
-        final String fontStyle = generateFontStyle(freemindNode, null);
         if (fontStyle != null) {
             wiseTopic.setFontStyle(fontStyle);
         }
 
         // Is there any link ?
-        final String url = freemindNode.getLINK();
+        final String url = freeNode.getLINK();
         if (url != null) {
             final Link link = new Link();
             link.setUrl(url);
             wiseTopic.setLink(link);
         }
 
-        final Boolean folded = Boolean.valueOf(freemindNode.getFOLDED());
+        final Boolean folded = Boolean.valueOf(freeNode.getFOLDED());
         if (folded) {
             wiseTopic.setShrink(folded);
         }
@@ -477,7 +538,9 @@ public class FreemindImporter
         return result;
     }
 
-    private @NotNull String getShapeFormFromNode(@NotNull Node node) {
+    private
+    @NotNull
+    String getShapeFormFromNode(@NotNull Node node) {
         String result = node.getSTYLE();
         // In freemind a node without style is a line
         if ("bubble".equals(result)) {

wise-webapp/src/main/java/com/wisemapping/util/JAXBUtils.java

@@ -18,28 +18,47 @@
 
 package com.wisemapping.util;
 
+import org.jetbrains.annotations.NotNull;
+
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
 
 public class JAXBUtils {
 
-    public static Object getMapObject(InputStream stream,String pakage) throws JAXBException {
+    private final static Map<String, JAXBContext> context = new HashMap<String, JAXBContext>();
 
-        final JAXBContext context = JAXBContext.newInstance(pakage);
+    public static Object getMapObject(@NotNull InputStream stream, @NotNull final String pakage) throws JAXBException {
-        final Unmarshaller unmarshaller = context.createUnmarshaller() ;
 
-        return unmarshaller.unmarshal (stream) ;
+        final JAXBContext context = getInstance(pakage);
+        final Unmarshaller unmarshaller = context.createUnmarshaller();
+
+        return unmarshaller.unmarshal(stream);
     }
 
-    public static void saveMap(Object obj, OutputStream out,String pakage) throws JAXBException {
+    private static JAXBContext getInstance(@NotNull String pakage) throws JAXBException {
 
-        final JAXBContext context = JAXBContext.newInstance(pakage);
+        JAXBContext result = context.get(pakage);
-        final Marshaller marshaller =   context.createMarshaller();
+        if (result == null) {
+            synchronized (context) {
+                result = JAXBContext.newInstance(pakage);
+                context.put(pakage, result);
+            }
+        }
+        return result;
 
-        marshaller.marshal(obj, out) ;
+    }
+
+    public static void saveMap(@NotNull Object obj, @NotNull OutputStream out, String pachage) throws JAXBException {
+
+        final JAXBContext context = getInstance(pachage);
+        final Marshaller marshaller = context.createMarshaller();
+
+        marshaller.marshal(obj, out);
     }
 }

wise-webapp/src/main/java/com/wisemapping/xml/freemind/Node.java

@@ -26,9 +26,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ * <p/>
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * <p/>
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -75,25 +75,23 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "arrowlinkOrCloudOrEdge"
+        "arrowlinkOrCloudOrEdge"
 })
 @XmlRootElement(name = "node")
 public class Node {
 
     @XmlElements({
-        @XmlElement(name = "icon", type = Icon.class),
+            @XmlElement(name = "icon", type = Icon.class),
-        @XmlElement(name = "node", type = Node.class),
+            @XmlElement(name = "node", type = Node.class),
-        @XmlElement(name = "edge", type = Edge.class),
+            @XmlElement(name = "edge", type = Edge.class),
-        @XmlElement(name = "arrowlink", type = Arrowlink.class),
+            @XmlElement(name = "arrowlink", type = Arrowlink.class),
-        @XmlElement(name = "font", type = Font.class),
+            @XmlElement(name = "font", type = Font.class),
-        @XmlElement(name = "hook", type = Hook.class),
+            @XmlElement(name = "hook", type = Hook.class),
-        @XmlElement(name = "richcontent", type = Richcontent.class),
+            @XmlElement(name = "richcontent", type = Richcontent.class),
-        @XmlElement(name = "cloud", type = Cloud.class)
+            @XmlElement(name = "cloud", type = Cloud.class)
     })
     protected List<Object> arrowlinkOrCloudOrEdge;
     @XmlAttribute(name = "BACKGROUND_COLOR")
@@ -123,28 +121,35 @@ public class Node {
     protected BigInteger hgap;
     @XmlAttribute(name = "VGAP")
     protected BigInteger vgap;
+
     @XmlAttribute(name = "VSHIFT")
     protected BigInteger vshift;
     @XmlAttribute(name = "ENCRYPTED_CONTENT")
     protected String encryptedcontent;
 
+    // Wise Extensions
+    @XmlAttribute(name = "wCOORDS")
+    protected String wcoords;
+    @XmlAttribute(name = "WORDER")
+    protected BigInteger worder;
+
     /**
      * Gets the value of the arrowlinkOrCloudOrEdge property.
-     * 
+     * <p/>
-     * <p>
+     * <p/>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
      * This is why there is not a <CODE>set</CODE> method for the arrowlinkOrCloudOrEdge property.
-     * 
+     * <p/>
-     * <p>
+     * <p/>
      * For example, to add a new item, do as follows:
      * <pre>
      *    getArrowlinkOrCloudOrEdge().add(newItem);
      * </pre>
-     * 
+     * <p/>
-     * 
+     * <p/>
-     * <p>
+     * <p/>
      * Objects of the following type(s) are allowed in the list
      * {@link Icon }
      * {@link Node }
@@ -154,8 +159,6 @@ public class Node {
      * {@link Hook }
      * {@link Richcontent }
      * {@link Cloud }
-     * 
-     * 
      */
     public List<Object> getArrowlinkOrCloudOrEdge() {
         if (arrowlinkOrCloudOrEdge == null) {
@@ -167,10 +170,8 @@ public class Node {
     /**
      * Gets the value of the backgroundcolor property.
      *
-     * @return
+     * @return possible object is
-     *     possible object is
+     *         {@link String }
-     *     {@link String }
-     *     
      */
     public String getBACKGROUNDCOLOR() {
         return backgroundcolor;
@@ -179,10 +180,8 @@ public class Node {
     /**
      * Sets the value of the backgroundcolor property.
      *
-     * @param value
+     * @param value allowed object is
-     *     allowed object is
+     *              {@link String }
-     *     {@link String }
-     *     
      */
     public void setBACKGROUNDCOLOR(String value) {
         this.backgroundcolor = value;
@@ -191,22 +190,26 @@ public class Node {
     /**
      * Gets the value of the color property.
      *
-     * @return
+     * @return possible object is
-     *     possible object is
+     *         {@link String }
-     *     {@link String }
-     *     
      */
     public String getCOLOR() {
         return color;
     }
 
+    public BigInteger getWorder() {
+        return worder;
+    }
+
+    public void setWorder(BigInteger worder) {
+        this.worder = worder;
+    }
+
     /**
      * Sets the value of the color property.
      *
-     * @param value
+     * @param value allowed object is
-     *     allowed object is
+     *              {@link String }
-     *     {@link String }
-     *     
      */
     public void setCOLOR(String value) {
         this.color = value;
@@ -215,10 +218,8 @@ public class Node {
     /**
      * Gets the value of the folded property.
      *
-     * @return
+     * @return possible object is
-     *     possible object is
+     *         {@link String }
-     *     {@link String }
-     *     
      */
     public String getFOLDED() {
         return folded;
@@ -227,10 +228,8 @@ public class Node {
     /**
      * Sets the value of the folded property.
      *
-     * @param value
+     * @param value allowed object is
-     *     allowed object is
+     *              {@link String }
-     *     {@link String }
-     *     
      */
     public void setFOLDED(String value) {
         this.folded = value;
@@ -239,10 +238,8 @@ public class Node {
     /**
      * Gets the value of the id property.
      *
-     * @return
+     * @return possible object is
-     *     possible object is
+     *         {@link String }
-     *     {@link String }
-     *     
      */
     public String getID() {
         return id;
@@ -251,10 +248,8 @@ public class Node {
     /**
      * Sets the value of the id property.
      *
-     * @param value
+     * @param value allowed object is
-     *     allowed object is
+     *              {@link String }
-     *     {@link String }
-     *     
      */
     public void setID(String value) {
         this.id = value;
@@ -263,10 +258,8 @@ public class Node {
     /**
      * Gets the value of the link property.
      *
-     * @return
+     * @return possible object is
-     *     possible object is
+     *         {@link String }
-     *     {@link String }
-     *     
      */
     public String getLINK() {
         return link;
@@ -275,10 +268,8 @@ public class Node {
     /**
      * Sets the value of the link property.
      *
-     * @param value
+     * @param value allowed object is
-     *     allowed object is
+     *              {@link String }
-     *     {@link String }
-     *     
      */
     public void setLINK(String value) {
         this.link = value;
@@ -287,10 +278,8 @@ public class Node {
     /**
      * Gets the value of the position property.
      *
-     * @return
+     * @return possible object is
-     *     possible object is
+     *         {@link String }
-     *     {@link String }
-     *     
      */
     public String getPOSITION() {
         return position;
@@ -299,10 +288,8 @@ public class Node {
     /**
      * Sets the value of the position property.
      *
-     * @param value
+     * @param value allowed object is
-     *     allowed object is
+     *              {@link String }
-     *     {@link String }
-     *     
      */
     public void setPOSITION(String value) {
         this.position = value;
@@ -311,10 +298,8 @@ public class Node {
     /**
      * Gets the value of the style property.
      *
-     * @return
+     * @return possible object is
-     *     possible object is
+     *         {@link String }
-     *     {@link String }
-     *     
      */
     public String getSTYLE() {
         return style;
@@ -323,10 +308,8 @@ public class Node {
     /**
      * Sets the value of the style property.
      *
-     * @param value
+     * @param value allowed object is
-     *     allowed object is
+     *              {@link String }
-     *     {@link String }
-     *     
      */
     public void setSTYLE(String value) {
         this.style = value;
@@ -335,10 +318,8 @@ public class Node {
     /**
      * Gets the value of the text property.
      *
-     * @return
+     * @return possible object is
-     *     possible object is
+     *         {@link String }
-     *     {@link String }
-     *     
      */
     public String getTEXT() {
         return text;
@@ -347,10 +328,8 @@ public class Node {
     /**
      * Sets the value of the text property.
      *
-     * @param value
+     * @param value allowed object is
-     *     allowed object is
+     *              {@link String }
-     *     {@link String }
-     *     
      */
     public void setTEXT(String value) {
         this.text = value;
@@ -359,10 +338,8 @@ public class Node {
     /**
      * Gets the value of the created property.
      *
-     * @return
+     * @return possible object is
-     *     possible object is
+     *         {@link BigInteger }
-     *     {@link BigInteger }
-     *     
      */
     public BigInteger getCREATED() {
         return created;
@@ -371,10 +348,8 @@ public class Node {
     /**
      * Sets the value of the created property.
      *
-     * @param value
+     * @param value allowed object is
-     *     allowed object is
+     *              {@link BigInteger }
-     *     {@link BigInteger }
-     *     
      */
     public void setCREATED(BigInteger value) {
         this.created = value;
@@ -383,22 +358,26 @@ public class Node {
     /**
      * Gets the value of the modified property.
      *
-     * @return
+     * @return possible object is
-     *     possible object is
+     *         {@link BigInteger }
-     *     {@link BigInteger }
-     *     
      */
     public BigInteger getMODIFIED() {
         return modified;
     }
 
+    public String getWcoords() {
+        return wcoords;
+    }
+
+    public void setWcoords(String wcoords) {
+        this.wcoords = wcoords;
+    }
+
     /**
      * Sets the value of the modified property.
      *
-     * @param value
+     * @param value allowed object is
-     *     allowed object is
+     *              {@link BigInteger }
-     *     {@link BigInteger }
-     *     
      */
     public void setMODIFIED(BigInteger value) {
         this.modified = value;
@@ -407,10 +386,8 @@ public class Node {
     /**
      * Gets the value of the hgap property.
      *
-     * @return
+     * @return possible object is
-     *     possible object is
+     *         {@link BigInteger }
-     *     {@link BigInteger }
-     *     
      */
     public BigInteger getHGAP() {
         return hgap;
@@ -419,10 +396,8 @@ public class Node {
     /**
      * Sets the value of the hgap property.
      *
-     * @param value
+     * @param value allowed object is
-     *     allowed object is
+     *              {@link BigInteger }
-     *     {@link BigInteger }
-     *     
      */
     public void setHGAP(BigInteger value) {
         this.hgap = value;
@@ -431,10 +406,8 @@ public class Node {
     /**
      * Gets the value of the vgap property.
      *
-     * @return
+     * @return possible object is
-     *     possible object is
+     *         {@link BigInteger }
-     *     {@link BigInteger }
-     *     
      */
     public BigInteger getVGAP() {
         return vgap;
@@ -443,10 +416,8 @@ public class Node {
     /**
      * Sets the value of the vgap property.
      *
-     * @param value
+     * @param value allowed object is
-     *     allowed object is
+     *              {@link BigInteger }
-     *     {@link BigInteger }
-     *     
      */
     public void setVGAP(BigInteger value) {
         this.vgap = value;
@@ -455,10 +426,8 @@ public class Node {
     /**
      * Gets the value of the vshift property.
      *
-     * @return
+     * @return possible object is
-     *     possible object is
+     *         {@link BigInteger }
-     *     {@link BigInteger }
-     *     
      */
     public BigInteger getVSHIFT() {
         return vshift;
@@ -467,10 +436,8 @@ public class Node {
     /**
      * Sets the value of the vshift property.
      *
-     * @param value
+     * @param value allowed object is
-     *     allowed object is
+     *              {@link BigInteger }
-     *     {@link BigInteger }
-     *     
      */
     public void setVSHIFT(BigInteger value) {
         this.vshift = value;
@@ -479,10 +446,8 @@ public class Node {
     /**
      * Gets the value of the encryptedcontent property.
      *
-     * @return
+     * @return possible object is
-     *     possible object is
+     *         {@link String }
-     *     {@link String }
-     *     
      */
     public String getENCRYPTEDCONTENT() {
         return encryptedcontent;
@@ -491,10 +456,8 @@ public class Node {
     /**
      * Sets the value of the encryptedcontent property.
      *
-     * @param value
+     * @param value allowed object is
-     *     allowed object is
+     *              {@link String }
-     *     {@link String }
-     *     
      */
     public void setENCRYPTEDCONTENT(String value) {
         this.encryptedcontent = value;

wise-webapp/src/main/java/com/wisemapping/xml/freemind_0_9_0.xsd

@@ -149,6 +149,9 @@
             <xs:attribute name='MODIFIED' type='xs:integer' use='optional'/>
             <xs:attribute name='HGAP' type='xs:integer' use='optional'/>
             <xs:attribute name='VGAP' type='xs:integer' use='optional'/>
+            <xs:attribute name='WCOORDS' type='xs:string' use='optional'/>
+            <xs:attribute name='WORDER' type='xs:integer' use='optional'/>
+
             <xs:attribute name='VSHIFT' type='xs:integer' use='optional'/>
             <xs:attribute name='ENCRYPTED_CONTENT' type='xs:string' use='optional'/>
         </xs:complexType>

wise-webapp/src/main/webapp/WEB-INF/app.properties

@@ -3,8 +3,8 @@
 #database.url=jdbc:mysql://localhost/wisemapping
 #database.driver=com.mysql.jdbc.Driver
 #database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
-#database.username=root
+#database.username=wisemapping
-#database.password=
+#database.password=password
 
 # HSQL Configuration properties
 database.url=jdbc:hsqldb:file:target/db/wisemapping

wise-webapp/src/test/data/freemind/basic.mmr

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node TEXT="This is the root node" ID="ID_0"><node TEXT="Child Level 1 Right 1" POSITION="right" ID="ID_1"/><node TEXT="Child Level 1 Left 1" POSITION="left" ID="ID_2"><node TEXT="Child Level 2 Left 11" POSITION="left" ID="ID_3"/><node TEXT="Child Level 2 Left 12" POSITION="left" ID="ID_4"/></node><node TEXT="Child Level 1 Right 2" POSITION="right" ID="ID_5"/><node TEXT="Child Level 1 Left  2" POSITION="left" ID="ID_6"><node TEXT="Child Level 2 Left 21 " POSITION="left" ID="ID_7"/><node TEXT="Child Level 2 Left 22" POSITION="left" ID="ID_8"/></node></node></map>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node TEXT="This is the root node" ID="ID_0"><node WORDER="3" wCOORDS="200,-100" TEXT="Child Level 1 Right 1" POSITION="right" ID="ID_1"/><node WORDER="3" wCOORDS="-200,-100" TEXT="Child Level 1 Left 1" POSITION="left" ID="ID_2"><node WORDER="0" wCOORDS="-400,200" TEXT="Child Level 2 Left 11" POSITION="left" ID="ID_3"/><node WORDER="1" wCOORDS="-400,200" TEXT="Child Level 2 Left 12" POSITION="left" ID="ID_4"/></node><node WORDER="0" wCOORDS="200,0" TEXT="Child Level 1 Right 2" POSITION="right" ID="ID_5"/><node WORDER="0" wCOORDS="-200,0" TEXT="Child Level 1 Left  2" POSITION="left" ID="ID_6"><node WORDER="0" wCOORDS="-400,200" TEXT="Child Level 2 Left 21 " POSITION="left" ID="ID_7"/><node WORDER="1" wCOORDS="-400,200" TEXT="Child Level 2 Left 22" POSITION="left" ID="ID_8"/></node></node></map>

wise-webapp/src/test/data/freemind/basic.wxml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" shape="rounded rectagle" text="This is the root node"><topic id="1" position="200,-100" order="3" shape="line" text="Child Level 1 Right 1"/><topic id="2" position="-200,-100" order="3" shape="line" text="Child Level 1 Left 1"><topic id="3" position="-400,200" order="0" shape="line" text="Child Level 2 Left 11"/><topic id="4" position="-400,200" order="1" shape="line" text="Child Level 2 Left 12"/></topic><topic id="5" position="200,0" order="0" shape="line" text="Child Level 1 Right 2"/><topic id="6" position="-200,0" order="0" shape="line" text="Child Level 1 Left  2"><topic id="7" position="-400,200" order="0" shape="line" text="Child Level 2 Left 21 "/><topic id="8" position="-400,200" order="1" shape="line" text="Child Level 2 Left 22"/></topic></topic></map>

wise-webapp/src/test/data/freemind/fonts.mmr

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node TEXT="Fonts" ID="ID_0"><node TEXT="Styles" POSITION="right" ID="ID_1"><node TEXT="Bold" POSITION="right" ID="ID_2"><font SIZE="12" NAME="Arial" BOLD="true"/></node><node TEXT="Italic" POSITION="right" ID="ID_3"><font SIZE="12" NAME="Arial" ITALIC="true"/></node></node><node TEXT="Sizes" POSITION="left" ID="ID_4"><node TEXT="Normal----" POSITION="left" ID="ID_5"><font SIZE="8" NAME="Arial"/></node><node TEXT="Normal---" POSITION="left" ID="ID_6"><font SIZE="9" NAME="Arial"/></node><node TEXT="Normal--" POSITION="left" ID="ID_7"><font SIZE="10" NAME="Arial"/></node><node TEXT="Normal-" POSITION="left" ID="ID_8"><font SIZE="11" NAME="Arial"/></node><node TEXT="Normal" POSITION="left" ID="ID_9"/><node TEXT="Nomal+" POSITION="left" ID="ID_10"><font SIZE="13" NAME="Arial"/></node><node TEXT="Normal++" POSITION="left" ID="ID_11"><font SIZE="14" NAME="Arial"/></node><node TEXT="Normal+++" POSITION="left" ID="ID_12"><font SIZE="15" NAME="Arial"/></node><node TEXT="Normal++++" POSITION="left" ID="ID_13"><font SIZE="16" NAME="Arial"/></node></node></node></map>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node TEXT="Fonts" ID="ID_0"><node WORDER="1" wCOORDS="200,-50" TEXT="Styles" POSITION="right" ID="ID_1"><node WORDER="0" wCOORDS="400,200" TEXT="Bold" POSITION="right" ID="ID_2"><font SIZE="12" NAME="Arial" BOLD="true"/></node><node WORDER="1" wCOORDS="400,200" TEXT="Italic" POSITION="right" ID="ID_3"><font SIZE="12" NAME="Arial" ITALIC="true"/></node></node><node WORDER="1" wCOORDS="-200,-50" TEXT="Sizes" POSITION="left" ID="ID_4"><node WORDER="0" wCOORDS="-400,200" TEXT="Normal----" POSITION="left" ID="ID_5"><font SIZE="8" NAME="Arial"/></node><node WORDER="1" wCOORDS="-400,200" TEXT="Normal---" POSITION="left" ID="ID_6"><font SIZE="9" NAME="Arial"/></node><node WORDER="2" wCOORDS="-400,200" TEXT="Normal--" POSITION="left" ID="ID_7"><font SIZE="10" NAME="Arial"/></node><node WORDER="3" wCOORDS="-400,200" TEXT="Normal-" POSITION="left" ID="ID_8"><font SIZE="11" NAME="Arial"/></node><node WORDER="4" wCOORDS="-400,200" TEXT="Normal" POSITION="left" ID="ID_9"/><node WORDER="5" wCOORDS="-400,200" TEXT="Nomal+" POSITION="left" ID="ID_10"><font SIZE="13" NAME="Arial"/></node><node WORDER="6" wCOORDS="-400,200" TEXT="Normal++" POSITION="left" ID="ID_11"><font SIZE="14" NAME="Arial"/></node><node WORDER="7" wCOORDS="-400,200" TEXT="Normal+++" POSITION="left" ID="ID_12"><font SIZE="15" NAME="Arial"/></node><node WORDER="8" wCOORDS="-400,200" TEXT="Normal++++" POSITION="left" ID="ID_13"><font SIZE="16" NAME="Arial"/></node></node></node></map>

wise-webapp/src/test/data/freemind/fonts.wxml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" shape="rounded rectagle" text="Fonts"><topic id="1" position="200,-50" order="1" shape="line" text="Styles"><topic id="2" position="400,200" order="0" fontStyle="Arial;12;;bold;;" shape="line" text="Bold"/><topic id="3" position="400,200" order="1" fontStyle="Arial;12;;;italic;" shape="line" text="Italic"/></topic><topic id="4" position="-200,-50" order="1" shape="line" text="Sizes"><topic id="5" position="-400,200" order="0" fontStyle="Arial;8;;;;" shape="line" text="Normal----"/><topic id="6" position="-400,200" order="1" fontStyle="Arial;9;;;;" shape="line" text="Normal---"/><topic id="7" position="-400,200" order="2" fontStyle="Arial;10;;;;" shape="line" text="Normal--"/><topic id="8" position="-400,200" order="3" fontStyle="Arial;11;;;;" shape="line" text="Normal-"/><topic id="9" position="-400,200" order="4" shape="line" text="Normal"/><topic id="10" position="-400,200" order="5" fontStyle="Arial;13;;;;" shape="line" text="Nomal+"/><topic id="11" position="-400,200" order="6" fontStyle="Arial;14;;;;" shape="line" text="Normal++"/><topic id="12" position="-400,200" order="7" fontStyle="Arial;15;;;;" shape="line" text="Normal+++"/><topic id="13" position="-400,200" order="8" fontStyle="Arial;16;;;;" shape="line" text="Normal++++"/></topic></topic></map>

wise-webapp/src/test/data/freemind/links.mmr

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node TEXT="Node Links" LINK="http://www.google.com" ID="ID_0"><icon BUILTIN="closed"/><node TEXT="Link Topic" POSITION="right" LINK="http://www.bing.com" ID="ID_1" FOLDED="true"><icon BUILTIN="info"/><node TEXT="Link Topic Topic" POSITION="right" LINK="http://bing.com" ID="ID_2"><icon BUILTIN="messagebox_warning"/></node></node></node></map>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node TEXT="Node Links" LINK="http://www.google.com" ID="ID_0"><icon BUILTIN="closed"/><node WORDER="1" wCOORDS="200,-50" TEXT="Link Topic" POSITION="right" LINK="http://www.bing.com" ID="ID_1" FOLDED="true"><icon BUILTIN="info"/><node WORDER="0" wCOORDS="400,200" TEXT="Link Topic Topic" POSITION="right" LINK="http://bing.com" ID="ID_2"><icon BUILTIN="messagebox_warning"/></node></node></node></map>

wise-webapp/src/test/data/freemind/links.wxml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" shape="rounded rectagle" text="Node Links"><icon id="onoff_delete"/><link url="http://www.google.com"/><topic shrink="true" id="1" position="200,-50" order="1" shape="line" text="Link Topic"><icon id="sign_info"/><link url="http://www.bing.com"/><topic id="2" position="400,200" order="0" shape="line" text="Link Topic Topic"><icon id="sign_warning"/><link url="http://bing.com"/></topic></topic></topic></map>

wise-webapp/src/test/data/freemind/node-styles.mmr

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node TEXT="Shapes" ID="ID_0"><node TEXT="Node Styles" POSITION="right" ID="ID_1"><node TEXT="Fork" POSITION="right" ID="ID_2"><edge COLOR="#808080"/></node><node TEXT="Bubble" STYLE="bubble" POSITION="right" ID="ID_3"><edge COLOR="#808080"/></node><node TEXT="As parent" POSITION="right" ID="ID_4"><edge COLOR="#808080"/></node><node TEXT="Combined" POSITION="right" ID="ID_5"><edge COLOR="#808080"/></node></node><node TEXT="Node Background Color" POSITION="left" ID="ID_6" BACKGROUND_COLOR="#f20707"><node TEXT="Fork" POSITION="left" ID="ID_7" BACKGROUND_COLOR="#0000cc"><edge COLOR="#808080"/></node><node TEXT="Bubble" STYLE="bubble" POSITION="left" ID="ID_8" BACKGROUND_COLOR="#ccffcc"><edge COLOR="#808080"/></node><node TEXT="As parent" POSITION="left" ID="ID_9" BACKGROUND_COLOR="#00ffff"><edge COLOR="#808080"/></node><node TEXT="Combined" POSITION="left" ID="ID_10" BACKGROUND_COLOR="#990099"><edge COLOR="#808080"/></node></node><node TEXT="Node Text Color" POSITION="left" ID="ID_11" BACKGROUND_COLOR="#f20707"><node TEXT="Fork" POSITION="left" ID="ID_12" COLOR="#ffff00" BACKGROUND_COLOR="#0000cc"><edge COLOR="#808080"/></node><node TEXT="Bubble" STYLE="bubble" POSITION="left" ID="ID_13" COLOR="#ff6666" BACKGROUND_COLOR="#ccffcc"><edge COLOR="#808080"/></node><node TEXT="As parent" POSITION="left" ID="ID_14" COLOR="#009999" BACKGROUND_COLOR="#00ffff"><edge COLOR="#808080"/></node><node TEXT="Combined" POSITION="left" ID="ID_15" COLOR="#009999" BACKGROUND_COLOR="#990099"><edge COLOR="#808080"/></node></node></node></map>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node TEXT="Shapes" ID="ID_0"><node WORDER="1" wCOORDS="200,-50" TEXT="Node Styles" POSITION="right" ID="ID_1"><node WORDER="0" wCOORDS="400,200" TEXT="Fork" POSITION="right" ID="ID_2"><edge COLOR="#808080"/></node><node WORDER="1" wCOORDS="400,200" TEXT="Bubble" STYLE="bubble" POSITION="right" ID="ID_3"><edge COLOR="#808080"/></node><node WORDER="2" wCOORDS="400,200" TEXT="As parent" POSITION="right" ID="ID_4"><edge COLOR="#808080"/></node><node WORDER="3" wCOORDS="400,200" TEXT="Combined" POSITION="right" ID="ID_5"><edge COLOR="#808080"/></node></node><node WORDER="3" wCOORDS="-200,-100" TEXT="Node Background Color" POSITION="left" ID="ID_6" BACKGROUND_COLOR="#f20707"><node WORDER="0" wCOORDS="-400,200" TEXT="Fork" POSITION="left" ID="ID_7" BACKGROUND_COLOR="#0000cc"><edge COLOR="#808080"/></node><node WORDER="1" wCOORDS="-400,200" TEXT="Bubble" STYLE="bubble" POSITION="left" ID="ID_8" BACKGROUND_COLOR="#ccffcc"><edge COLOR="#808080"/></node><node WORDER="2" wCOORDS="-400,200" TEXT="As parent" POSITION="left" ID="ID_9" BACKGROUND_COLOR="#00ffff"><edge COLOR="#808080"/></node><node WORDER="3" wCOORDS="-400,200" TEXT="Combined" POSITION="left" ID="ID_10" BACKGROUND_COLOR="#990099"><edge COLOR="#808080"/></node></node><node WORDER="0" wCOORDS="-200,0" TEXT="Node Text Color" POSITION="left" ID="ID_11" BACKGROUND_COLOR="#f20707"><node WORDER="0" wCOORDS="-400,200" TEXT="Fork" POSITION="left" ID="ID_12" COLOR="#ffff00" BACKGROUND_COLOR="#0000cc"><edge COLOR="#808080"/></node><node WORDER="1" wCOORDS="-400,200" TEXT="Bubble" STYLE="bubble" POSITION="left" ID="ID_13" COLOR="#ff6666" BACKGROUND_COLOR="#ccffcc"><edge COLOR="#808080"/></node><node WORDER="2" wCOORDS="-400,200" TEXT="As parent" POSITION="left" ID="ID_14" COLOR="#009999" BACKGROUND_COLOR="#00ffff"><edge COLOR="#808080"/></node><node WORDER="3" wCOORDS="-400,200" TEXT="Combined" POSITION="left" ID="ID_15" COLOR="#009999" BACKGROUND_COLOR="#990099"><edge COLOR="#808080"/></node></node></node></map>

wise-webapp/src/test/data/freemind/node-styles.wxml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" shape="rounded rectagle" text="Shapes"><topic id="1" position="200,-50" order="1" shape="line" text="Node Styles"><topic id="2" position="400,200" order="0" brColor="#808080" shape="line" text="Fork"/><topic id="3" position="400,200" order="1" brColor="#808080" shape="rounded rectagle" text="Bubble"/><topic id="4" position="400,200" order="2" brColor="#808080" shape="line" text="As parent"/><topic id="5" position="400,200" order="3" brColor="#808080" shape="line" text="Combined"/></topic><topic id="6" position="-200,-100" order="3" bgColor="#f20707" shape="line" text="Node Background Color"><topic id="7" position="-400,200" order="0" brColor="#808080" bgColor="#0000cc" shape="line" text="Fork"/><topic id="8" position="-400,200" order="1" brColor="#808080" bgColor="#ccffcc" shape="rounded rectagle" text="Bubble"/><topic id="9" position="-400,200" order="2" brColor="#808080" bgColor="#00ffff" shape="line" text="As parent"/><topic id="10" position="-400,200" order="3" brColor="#808080" bgColor="#990099" shape="line" text="Combined"/></topic><topic id="11" position="-200,0" order="0" bgColor="#f20707" shape="line" text="Node Text Color"><topic id="12" position="-400,200" order="0" brColor="#808080" bgColor="#0000cc" fontStyle=";;#ffff00;;;" shape="line" text="Fork"/><topic id="13" position="-400,200" order="1" brColor="#808080" bgColor="#ccffcc" fontStyle=";;#ff6666;;;" shape="rounded rectagle" text="Bubble"/><topic id="14" position="-400,200" order="2" brColor="#808080" bgColor="#00ffff" fontStyle=";;#009999;;;" shape="line" text="As parent"/><topic id="15" position="-400,200" order="3" brColor="#808080" bgColor="#990099" fontStyle=";;#009999;;;" shape="line" text="Combined"/></topic></topic></map>

wise-webapp/src/test/java/com/wisemapping/test/freemind/ImportExportTest.java

@@ -29,45 +29,65 @@ public class ImportExportTest {
 
 
     @Test(dataProvider = "Data-Provider-Function")
-    public void exportImportExportTest(@NotNull final File freeMindFile, @NotNull final File recFile) throws ImporterException, IOException, ExportException {
+    public void exportImportExportTest(@NotNull final File freeMindFile, @NotNull final File wiseFile, @NotNull final File freeRecFile) throws ImporterException, IOException, ExportException {
 
 
-        FileInputStream fileInputStream = new FileInputStream(freeMindFile.getAbsolutePath());
+        final FileInputStream fileInputStream = new FileInputStream(freeMindFile.getAbsolutePath());
         final MindMap mindMap = importer.importMap("basic", "basic", fileInputStream);
 
-        if (recFile.exists()) {
+
+        // Compare mindmap output ...
+        if (wiseFile.exists()) {
             // Compare rec and file ...
+            final String recContent = readFile(wiseFile);
 
-            // Load rec file co
+            // Export mile content ...
-            final FileInputStream fis = new FileInputStream(recFile);
+            Assert.assertEquals(mindMap.getUnzippedXml(), recContent);
-            final InputStreamReader isr = new InputStreamReader(fis);
-            final BufferedReader br = new BufferedReader(isr);
 
-            final StringBuilder recContent = new StringBuilder();
+        } else {
-            String line = br.readLine();
+            final FileOutputStream fos = new FileOutputStream(wiseFile);
-            while (line != null) {
+            fos.write(mindMap.getUnzippedXml().getBytes());
-                recContent.append(line);
+            fos.close();
-                line = br.readLine();
+        }
 
-            }
+        // Compare freemind output ...
-
+        if (freeRecFile.exists()) {
-            fis.close();
+            // Compare rec and file ...
+            final String recContent = readFile(freeRecFile);
 
             // Export mile content ...
             final ByteArrayOutputStream bos = new ByteArrayOutputStream();
             exporter.export(mindMap, bos);
             final String exportContent = new String(bos.toByteArray());
 
-            Assert.assertEquals(recContent.toString(), exportContent);
+            Assert.assertEquals(exportContent, recContent);
 
         } else {
-            final FileOutputStream fos = new FileOutputStream(recFile);
+            final FileOutputStream fos = new FileOutputStream(freeRecFile);
             exporter.export(mindMap, fos);
             fos.close();
         }
 
     }
 
+    private String readFile(@NotNull File file) throws IOException {
+        // Load rec file co
+        final FileInputStream fis = new FileInputStream(file);
+        final InputStreamReader isr = new InputStreamReader(fis);
+        final BufferedReader br = new BufferedReader(isr);
+
+        final StringBuilder result = new StringBuilder();
+        String line = br.readLine();
+        while (line != null) {
+            result.append(line);
+            line = br.readLine();
+
+        }
+
+        fis.close();
+        return result.toString();
+    }
+
     //This function will provide the parameter data
     @DataProvider(name = "Data-Provider-Function")
     public Object[][] parameterIntTestProvider() {
@@ -84,7 +104,8 @@ public class ImportExportTest {
         for (int i = 0; i < freeMindFiles.length; i++) {
             File freeMindFile = freeMindFiles[i];
             final String name = freeMindFile.getName();
-            result[i] = new Object[]{freeMindFile, new File(DATA_DIR_PATH, name.substring(0, name.lastIndexOf(".")) + ".mmr")};
+            String testName = name.substring(0, name.lastIndexOf("."));
+            result[i] = new Object[]{freeMindFile, new File(DATA_DIR_PATH, testName + ".wxml"), new File(DATA_DIR_PATH, testName + ".mmr")};
         }
 
         return result;

wise-webapp/src/test/sql/mysql/create-database.sql

@@ -0,0 +1,3 @@
+CREATE DATABASE wisemapping CHARACTER SET='utf8' COLLATE='utf8_unicode_ci'; 
+CREATE USER 'wisemapping'@'localhost' IDENTIFIED BY 'password'; 
+GRANT ALL ON wisemapping.* TO 'wisemapping'@'localhost';

wise-webapp/src/test/sql/mysql/test-data.sql

@@ -1,4 +1,4 @@
-INSERT INTO COLABORATOR(id,email,creation_date) values (1,'test@wisemapping.com',CURRENT_DATE());
+INSERT INTO COLABORATOR(id,email,creation_date) values (1,'test@wisemapping.org',CURRENT_DATE());
 INSERT INTO USER (colaborator_id,username,firstname, lastname, password, activationCode,activation_date,allowSendEmail)
 values(1,'Wise Mapping Test User','Wise','Test', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3',1237,CURRENT_DATE(),1);
 COMMIT;