You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2013/09/11 07:03:56 UTC
svn commit: r1521735 - in
/openmeetings/branches/2.x/src/org/apache/openmeetings:
persistence/beans/calendar/ persistence/beans/room/
persistence/beans/sip/asterisk/ persistence/beans/user/
servlet/outputhandler/
Author: vdegtyarev
Date: Wed Sep 11 05:03:55 2013
New Revision: 1521735
URL: http://svn.apache.org/r1521735
Log:
OPENMEETINGS-791 is fixed. Backup import is completed successfully.
Modified:
openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/room/Room.java
openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java
openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/user/User.java
openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java?rev=1521735&r1=1521734&r2=1521735&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java Wed Sep 11 05:03:55 2013
@@ -128,19 +128,19 @@ public class Appointment implements Seri
private AppointmentReminderTyps remind;
@Column(name = "isdaily")
- @Element(data=true)
+ @Element(data=true, required = false)
private Boolean isDaily;
@Column(name = "isweekly")
- @Element(data=true)
+ @Element(data=true, required = false)
private Boolean isWeekly;
@Column(name = "ismonthly")
- @Element(data=true)
+ @Element(data=true, required = false)
private Boolean isMonthly;
@Column(name = "isyearly")
- @Element(data=true)
+ @Element(data=true, required = false)
private Boolean isYearly;
@ManyToOne(fetch = FetchType.EAGER)
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/room/Room.java?rev=1521735&r1=1521734&r2=1521735&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/room/Room.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/room/Room.java Wed Sep 11 05:03:55 2013
@@ -86,7 +86,7 @@ public class Room implements Serializabl
private Long rooms_id;
@Column(name = "name")
- @Element(data = true)
+ @Element(data = true, required=false)
private String name;
@Lob
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java?rev=1521735&r1=1521734&r2=1521735&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java Wed Sep 11 05:03:55 2013
@@ -86,9 +86,9 @@ public class AsteriskSipUser implements
@Element(data=true, required = false)
private String defaultuser; // Varchar 128
- @Column(name = "fullcontact", length=128)
+ @Column(name = "fullcontact", length=512)
@Element(data=true, required = false)
- private String fullcontact; // Varchar 128
+ private String fullcontact;
@Column(name = "regserver", nullable = true, length=128)
@Element(data=true, required = false)
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/user/User.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/user/User.java?rev=1521735&r1=1521734&r2=1521735&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/user/User.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/persistence/beans/user/User.java Wed Sep 11 05:03:55 2013
@@ -141,7 +141,7 @@ public class User implements Serializabl
private Long level_id;
@Column(name = "login")
- @Element(data = true)
+ @Element(data = true, required = false)
private String login;
@Basic(fetch = FetchType.LAZY)
@@ -151,7 +151,7 @@ public class User implements Serializabl
private String password;
@Column(name = "regdate")
- @Element(data = true)
+ @Element(data = true, required = false)
private Date regdate;
@Column(name = "status")
@@ -173,7 +173,7 @@ public class User implements Serializabl
private String pictureuri;
@Column(name = "deleted")
- @Element(data = true)
+ @Element(data = true, required = false)
private boolean deleted;
@Column(name = "language_id")
@@ -197,15 +197,9 @@ public class User implements Serializabl
@Transient
private Userlevel userlevel;
- @Transient
- private Userdata rechnungsaddressen;
-
- @Transient
- private Userdata lieferadressen;
-
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "user_id", insertable = true, updatable = true)
- @ElementList(name = "organisations")
+ @ElementList(name = "organisations", required = false)
@ElementDependent
private List<Organisation_Users> organisation_users = new ArrayList<Organisation_Users>();
@@ -347,14 +341,6 @@ public class User implements Serializabl
this.level_id = level_id;
}
- public Userdata getLieferadressen() {
- return lieferadressen;
- }
-
- public void setLieferadressen(Userdata lieferadressen) {
- this.lieferadressen = lieferadressen;
- }
-
public String getLogin() {
return login;
}
@@ -405,14 +391,6 @@ public class User implements Serializabl
this.password = password;
}
- public Userdata getRechnungsaddressen() {
- return rechnungsaddressen;
- }
-
- public void setRechnungsaddressen(Userdata rechnungsaddressen) {
- this.rechnungsaddressen = rechnungsaddressen;
- }
-
public Date getRegdate() {
return regdate;
}
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1521735&r1=1521734&r2=1521735&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java Wed Sep 11 05:03:55 2013
@@ -547,15 +547,15 @@ public class BackupImportController exte
List<RoomPoll> list = readList(serializer, f, "roompolls.xml", "roompolls", RoomPoll.class, true);
for (RoomPoll rp : list) {
- if (rp.getRoom().getRooms_id() == null) {
+ if (rp.getRoom() == null || rp.getRoom().getRooms_id() == null) {
//room was deleted
continue;
}
- if (rp.getCreatedBy().getUser_id() == null) {
+ if (rp.getCreatedBy() == null || rp.getCreatedBy().getUser_id() == null) {
rp.setCreatedBy(null);
}
for (RoomPollAnswers rpa : rp.getRoomPollAnswerList()) {
- if (rpa.getVotedUser().getUser_id() == null) {
+ if (rpa.getVotedUser() == null || rpa.getVotedUser().getUser_id() == null) {
rpa.setVotedUser(null);
}
}