Merge branch 'develop' into feature/WISE-16-remove_user

config/database/hsql/atest-data.sql

@@ -2,9 +2,9 @@ INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (1, 'test@wisemapping
 INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
   VALUES (1, 'Test', 'User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3', 1237, CURDATE(), 1,'D');
 
-INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (2, 'admin@wisemapping.org', CURDATE(),authentication_type);
+INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (2, 'admin@wisemapping.org', CURDATE());
-INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,"D")
+INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
-  VALUES (2, 'Admin', 'User', 'admin', 1237, CURDATE(), 1);
+  VALUES (2, 'Admin', 'User', 'admin', 1237, CURDATE(), 1,'D');
 
 
 COMMIT;

distribution/package-bin.sh

@@ -8,7 +8,7 @@ BASE_DIR=`pwd`
 TARGET_DIR=$BASE_DIR/target
 JETTY_DIR=$TARGET_DIR/wisemapping-$WISE_VERSION
 WISE_WEBAPP_DIR=$JETTY_DIR/webapps/wisemapping
-JETTY_VERSION=8.1.8.v20121106
+JETTY_VERSION=8.1.14.v20131031
 JETTY_DIST_DIR=jetty-distribution-${JETTY_VERSION}
 JETTY_ZIP=${JETTY_DIST_DIR}.zip
 

distribution/package-src.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -e	
-set -u
-
-WISE_VERSION=$1
-TMP_DIR=/tmp/wise-src/wisemapping-src
-TAR_FILE_NAME=wisemapping-${WISE_VERSION}-src.tar.gz
-OUTPUT_DIR=`pwd`"/target"
-OUTPUT_FILE=${OUTPUT_DIR}/${TAR_FILE_NAME}
-
-
-# Clean all.
-cd ..
-rm -rf ${TMP_DIR}/../
-mvn clean 
-
-# Prepare copy 
-mkdir -p ${TMP_DIR}
-rsync -aCv --exclude ".git"  --exclude "wisemapping.i*" --exclude "**/*/Brix*" --exclude "**/brix" --exclude "*/*.iml" --exclude "*/wisemapping.log*" --exclude "**/.DS_Store" --exclude "*.textile" --exclude "**/.gitignore" --exclude "installer" --exclude "*/target" . ${TMP_DIR}
-
-# Zip file
-[ ! -e ${OUTPUT_DIR} ] && mkdir ${OUTPUT_DIR}
-rm -f ${OUTPUT_FILE}
-
-cd ${TMP_DIR}/..
-tar -cvzf ${OUTPUT_FILE} .
-
-echo 
-echo "#################################################################"
-echo "Zip file generated on:"${OUTPUT_FILE}
-echo "#################################################################"

web2d/src/main/javascript/peer/svg/TextPeer.js

@@ -156,16 +156,20 @@ web2d.peer.svg.TextPeer = new Class({
         var computedWidth;
         // Firefox hack for this issue:http://stackoverflow.com/questions/6390065/doing-ajax-updates-in-svg-breaks-getbbox-is-there-a-workaround
         try {
+
             computedWidth = this._native.getBBox().width;
             // Chrome bug is producing this error, oly during page loading. Remove the hack if it works. The issue seems to be
-            // caused when the element is hidden.
+            // caused when the element is hidden. I don't know why, but it works ...
             if(computedWidth==0){
-                computedWidth = getBoundingClientRect().width - 35;
+                var bbox = this._native.getBBox();
+                computedWidth = bbox.width;
             }
 
         } catch(e) {
             computedWidth = 10;
+
         }
+        console.log("Final result:"+computedWidth);
 
         var width = parseInt(computedWidth);
         width = width + this._font.getWidthMargin();

wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java

@@ -115,7 +115,7 @@ public class AdminController extends BaseController {
         userService.changePassword(user);
     }
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "admin/users/{id}", consumes = {"text/plain"})
+    @RequestMapping(method = RequestMethod.DELETE, value = "admin/users/{id}")
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
     public void deleteUserByEmail(@PathVariable long id) throws WiseMappingException {
         final User user = userService.getUserBy(id);

wise-webapp/src/test/java/com/wisemapping/test/rest/RestAdminITCase.java

@@ -107,11 +107,11 @@ public class RestAdminITCase {
 
         // Check that the user has been created ...
         ResponseEntity<RestUser> result = findUser(requestHeaders, templateRest, location);
-        assertEquals(result.getBody(), restUser, "Returned object object seems not be the same.");
+        assertEquals(result.getBody().getEmail(), restUser.getEmail(), "Returned object object seems not be the same.");
 
         // Find by email and check ...
         result = findUserByEmail(requestHeaders, templateRest, restUser.getEmail());
-        assertEquals(result.getBody(), restUser, "Returned object object seems not be the same.");
+        assertEquals(result.getBody().getEmail(), restUser.getEmail(), "Returned object object seems not be the same.");
 
         return restUser.getEmail();
     }
@@ -144,10 +144,10 @@ public class RestAdminITCase {
         List<MediaType> acceptableMediaTypes = new ArrayList<MediaType>();
         acceptableMediaTypes.add(mediaType);
 
-        final HttpHeaders requestHeaders = new HttpHeaders();
+        final HttpHeaders result = new HttpHeaders();
-        requestHeaders.setAccept(acceptableMediaTypes);
+        result.setAccept(acceptableMediaTypes);
-        requestHeaders.setContentType(mediaType);
+        result.setContentType(mediaType);
-        return requestHeaders;
+        return result;
     }
 
     private RestTemplate createTemplate() {