svn commit: r1382341 - in /incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings: app/persistence/beans/rooms/Rooms.java app/persistence/beans/user/Salutations.java servlet/outputhandler/BackupImportController.java

[solomax]

Author: solomax
Date: Sat Sep  8 18:40:21 2012
New Revision: 1382341

URL: http://svn.apache.org/viewvc?rev=1382341&view=rev
Log:
User import should work as expected now

Modified:
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java?rev=1382341&r1=1382340&r2=1382341&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java
 Sat Sep  8 18:40:21 2012
@@ -95,7 +95,7 @@ public class Rooms implements Serializab
        private Long externalRoomId;
        
        @Column(name = "externalRoomType")
-       @Element(data=true)
+       @Element(data=true, required=false)
        private String externalRoomType;
        
        @Column(name = "isdemoroom")

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java?rev=1382341&r1=1382340&r2=1382341&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Salutations.java
 Sat Sep  8 18:40:21 2012
@@ -22,6 +22,8 @@ import java.io.Serializable;
 import java.util.Date;
 
 import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -33,14 +35,17 @@ import javax.persistence.Transient;
 
 @Entity
 @Table(name = "salutations")
+@Root
 public class Salutations implements Serializable {
        private static final long serialVersionUID = -5806449519074435223L;
        @Id
        @GeneratedValue(strategy = GenerationType.IDENTITY)
        @Column(name="id")
+       @Element(name="id", data=true)
        private Long salutations_id;
        
        @Column(name="name")
+       @Element(data=true, required=false)
        private String name;
        
        @Column(name="starttime")
@@ -50,9 +55,11 @@ public class Salutations implements Seri
        private Date updatetime;
        
        @Column(name="deleted")
+       @Element(data=true, required=false)
        private boolean deleted;
        
        @Column(name="fieldvalues_id")
+       @Element(data=true, required=false)
        private Long fieldvalues_id;
        
        @Transient

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1382341&r1=1382340&r2=1382341&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
 Sat Sep  8 18:40:21 2012
@@ -759,7 +759,8 @@ public class BackupImportController exte
                        while (item != null) {
                                try {
                                        Users u = ser.read(Users.class, item, 
false);
-
+                                       u.setSalutations(null); //TODO need to 
be removed
+                                       
                                        //HACK to handle Adresses and 
UserSipData inside user
                                        if (u.getAdresses() == null) {
                                                Adresses a = 
ser.read(Adresses.class, item1, false);