Update to HSQLDB driver

Remove DWR
Remove native SVG tables
Add new REST services for persistence.

wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java

@@ -3,9 +3,7 @@ package com.wisemapping.rest.model;
 
 import com.wisemapping.model.MindMap;
 import com.wisemapping.model.User;
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.*;
 import org.jetbrains.annotations.NotNull;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -17,14 +15,19 @@ import java.util.Date;
 
 @XmlRootElement(name = "map")
 @XmlAccessorType(XmlAccessType.PROPERTY)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE,
-        getterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY, isGetterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY)
+@JsonAutoDetect(
+        fieldVisibility = JsonAutoDetect.Visibility.NONE,
+        setterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY,
+        isGetterVisibility = JsonAutoDetect.Visibility.NONE,
+        getterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY
+)
 public class RestMindmap {
 
+    @JsonIgnore
     private MindMap mindmap;
 
     public RestMindmap() {
-        this(null);
+        this(new MindMap());
 
     }
 
@@ -73,12 +76,12 @@ public class RestMindmap {
     }
 
     public String getXml() throws IOException {
-        return mindmap.getNativeXml();
+        return mindmap.getXmlStr();
     }
 
-    public void setXml(String xml) throws IOException {
+    public void setXml(@NotNull String xml) throws IOException {
 
-        mindmap.setNativeXml(xml);
+        mindmap.setXmlStr(xml);
     }
 
     public void setId(int id) {
@@ -105,6 +108,7 @@ public class RestMindmap {
         mindmap.setCreator(creatorUser);
     }
 
+
     public void setProperties(String properties) {
         mindmap.setProperties(properties);
     }
@@ -117,6 +121,10 @@ public class RestMindmap {
         mindmap.setLastModifierUser(lastModifierUser);
     }
 
+    public String getProperties() {
+        return mindmap.getProperties();
+    }
+
     @JsonIgnore
     public MindMap getDelegated() {
         return this.mindmap;

wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java

@@ -0,0 +1,102 @@
+package com.wisemapping.rest.model;
+
+
+import com.wisemapping.model.MindMap;
+import com.wisemapping.model.User;
+import org.codehaus.jackson.annotate.JsonAutoDetect;
+import org.codehaus.jackson.annotate.JsonIgnore;
+import org.jetbrains.annotations.NotNull;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Set;
+
+@XmlRootElement(name = "user")
+@XmlAccessorType(XmlAccessType.PROPERTY)
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE,
+        getterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY, isGetterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY)
+public class RestUser {
+
+    private User user;
+
+    public RestUser() {
+        this(new User());
+    }
+
+    public RestUser(@NotNull User user) {
+        this.user = user;
+    }
+
+    public Calendar getCreationDate() {
+        return user.getCreationDate();
+    }
+
+    public void setTags(Set<String> tags) {
+        user.setTags(tags);
+    }
+
+    public Set<String> getTags() {
+        return user.getTags();
+    }
+
+    public String getFirstname() {
+        return user.getFirstname();
+    }
+
+    public void setFirstname(String firstname) {
+        user.setFirstname(firstname);
+    }
+
+    public String getLastname() {
+        return user.getLastname();
+    }
+
+    public void setLastname(String lastname) {
+        user.setLastname(lastname);
+    }
+
+    public boolean isActive() {
+        return user.isActive();
+    }
+
+    public String getUsername() {
+        return user.getUsername();
+    }
+
+    public void setUsername(String username) {
+        user.setUsername(username);
+    }
+
+    public long getId() {
+        return user.getId();
+    }
+
+    public void setId(long id) {
+        user.setId(id);
+    }
+
+    public String getEmail() {
+        return user.getEmail();
+    }
+
+    public void setEmail(String email) {
+        user.setEmail(email);
+    }
+
+    public void setCreationDate(Calendar creationDate) {
+//        user.setCreationDate(creationDate);
+    }
+
+    public void setPassword(@NotNull final String password){
+        this.user.setPassword(password);
+    }
+
+    @JsonIgnore
+    public User getDelegated(){
+        return this.user;
+    }
+}