Merge branch 'master' into wise-org-pela

mindplot/src/main/javascript/XMLMindmapSerializer_Beta.js

@@ -64,7 +64,10 @@ mindplot.XMLMindmapSerializer_Beta.prototype._topicToXML = function(document, to
         } else
         {
             var order = topic.getOrder();
-            parentTopic.setAttribute("order", order);
+             if(core.Utils.isDefined(order) && !isNaN(order-0))
+             {
+                 parentTopic.setAttribute("order", order);
+             }
         }
     }
 
@@ -213,7 +216,7 @@ mindplot.XMLMindmapSerializer_Beta.prototype._deserializeNode = function(domElem
     }
 
     var order = domElem.getAttribute('order');
-    if (core.Utils.isDefined(order)) {
+    if (core.Utils.isDefined(order) && !isNaN(order-0)) {
         topic.setOrder(order);
     }
 

mindplot/src/main/javascript/XMLMindmapSerializer_Pela.js

@@ -83,7 +83,10 @@ mindplot.XMLMindmapSerializer_Pela.prototype._topicToXML = function(document, to
 //        } else
 //        {
             var order = topic.getOrder();
-            parentTopic.setAttribute("order", order);
+            if(core.Utils.isDefined(order) && !isNaN(order-0))
+            {
+                parentTopic.setAttribute("order", order);
+            }
 //        }
     }
 
@@ -281,7 +284,7 @@ mindplot.XMLMindmapSerializer_Pela.prototype._deserializeNode = function(domElem
     }
 
     var order = domElem.getAttribute('order');
-    if (core.Utils.isDefined(order)) {
+    if (core.Utils.isDefined(order) && !isNaN(order-0)) {
         topic.setOrder(parseInt(order));
     }
 

mindplot/src/main/javascript/layoutManagers/OriginalLayoutManager.js

@@ -41,6 +41,13 @@ mindplot.layoutManagers.OriginalLayoutManager = mindplot.layoutManagers.BaseLayo
                         maxOrder=order;
                 }
                 result[order] = child;
+
+                //remove position for all childs in depth >1
+                var parent = node.getParent();
+                if(core.Utils.isDefined(parent)){
+                    child._position = null;
+                    child._finalPosition = null;
+                }
             }
         }
         nodesByOrder=null;

wise-webapp/src/main/java/com/wisemapping/security/CustomTokenBasedRememberMeServices.java

@@ -18,14 +18,19 @@
 
 package com.wisemapping.security;
 
+import com.wisemapping.dao.UserManager;
+import com.wisemapping.model.UserLogin;
 import org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices;
 import org.acegisecurity.Authentication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Calendar;
 
 public class CustomTokenBasedRememberMeServices extends
         TokenBasedRememberMeServices {
+    private UserManager userManager;
+
     public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
     {
      if(authentication!=null)
@@ -37,4 +42,24 @@ public class CustomTokenBasedRememberMeServices extends
      }
     }
 
+    @Override
+    public void loginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) {
+        final User user = (User)successfulAuthentication.getPrincipal();
+
+        final UserLogin userLogin = new UserLogin();
+        final Calendar now = Calendar.getInstance();
+        userLogin.setLoginDate(now);
+        userLogin.setEmail(user.getUsername());
+        userManager.auditLogin(userLogin);
+
+        super.loginSuccess(request, response, successfulAuthentication);    //To change body of overridden methods use File | Settings | File Templates.
+    }
+
+    public void setUserManager(UserManager userManager) {
+        this.userManager = userManager;
+    }
+
+    public UserManager getUserManager() {
+        return userManager;
+    }
 }

wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml

@@ -123,6 +123,7 @@
     <bean id="rememberMeServices" class="com.wisemapping.security.CustomTokenBasedRememberMeServices">
         <property name="userDetailsService" ref="userDetailsService"/>
         <property name="key" value="changeThis"/>
+        <property name="userManager" ref="userManager"/>
     </bean>
 
     <bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">

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

@@ -13,7 +13,7 @@ import org.testng.annotations.Test;
 import java.io.*;
 
 @Test
-public class ExportTest {
+public class FreemindExportTest {
     private static final String DATA_DIR_PATH = "src/test/data/wisemaps/";
 
     @Test(dataProvider = "Data-Provider-Function")
@@ -28,7 +28,7 @@ public class ExportTest {
 
             // Load rec file co
             final FileInputStream fis = new FileInputStream(recFile);
-            final InputStreamReader isr = new InputStreamReader(fis);
+            final InputStreamReader isr = new InputStreamReader(fis,"UTF-8");
             final BufferedReader br = new BufferedReader(isr);
 
             final StringBuilder recContent = new StringBuilder();
@@ -59,7 +59,7 @@ public class ExportTest {
 
     private MindMap load(@NotNull File wisemap) throws IOException {
         final FileInputStream fis = new FileInputStream(wisemap);
-        final InputStreamReader isr = new InputStreamReader(fis);
+        final InputStreamReader isr = new InputStreamReader(fis,"UTF-8");
         final BufferedReader br = new BufferedReader(isr);
 
         final StringBuilder content = new StringBuilder();
@@ -85,7 +85,7 @@ public class ExportTest {
         final File[] freeMindFiles = dataDir.listFiles(new FilenameFilter() {
 
             public boolean accept(File dir, String name) {
-                return name.endsWith(".xml");
+                return name.endsWith(".wxml");
             }
         });