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/04 12:14:27 UTC
svn commit: r1519967 - in /openmeetings/trunk/singlewebapp/src/main:
java/org/apache/openmeetings/data/user/dao/
java/org/apache/openmeetings/persistence/beans/room/
java/org/apache/openmeetings/persistence/beans/sip/asterisk/
java/org/apache/openmeeti...
Author: vdegtyarev
Date: Wed Sep 4 10:14:27 2013
New Revision: 1519967
URL: http://svn.apache.org/r1519967
Log:
OPENMEETINGS-776 - fix some errors to backup contacts.
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AbstractUserDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/Room.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/User.java
openmeetings/trunk/singlewebapp/src/main/webapp/languages/timezones.xml
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AbstractUserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AbstractUserDao.java?rev=1519967&r1=1519966&r2=1519967&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AbstractUserDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AbstractUserDao.java Wed Sep 4 10:14:27 2013
@@ -326,7 +326,7 @@ public class AbstractUserDao {
}
return us;
} catch (Exception e) {
- log.error("[getUserByAdressesId]", e);
+ log.error("[getUserByEmail] " + email, e);
}
return null;
}
@@ -349,7 +349,7 @@ public class AbstractUserDao {
return new Long(-5);
}
} catch (Exception e) {
- log.error("[getUserByAdressesId]", e);
+ log.error("[getUserByHash]", e);
}
return new Long(-1);
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/Room.java?rev=1519967&r1=1519966&r2=1519967&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/Room.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/Room.java Wed Sep 4 10:14:27 2013
@@ -89,7 +89,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/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java?rev=1519967&r1=1519966&r2=1519967&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java Wed Sep 4 10:14:27 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/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/User.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/User.java?rev=1519967&r1=1519966&r2=1519967&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/User.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/User.java Wed Sep 4 10:14:27 2013
@@ -179,7 +179,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")
@@ -203,15 +203,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>();
@@ -363,14 +357,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;
}
@@ -416,14 +402,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/trunk/singlewebapp/src/main/webapp/languages/timezones.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/timezones.xml?rev=1519967&r1=1519966&r2=1519967&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/timezones.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/timezones.xml Wed Sep 4 10:14:27 2013
@@ -93,4 +93,5 @@
<timezone orderId="28" name="Etc/GMT-9" label="Anchorage, Fairbanks, Juneau" iCal="America/Juneau" />
<timezone orderId="28" name="Etc/GMT-9 (Alaska)" label="United States (most of Alaska)" iCal="US/Alaska" />
<timezone orderId="29" name="Etc/GMT-10" label="Hawaii" iCal="Pacific/Honolulu" />
+ <timezone orderId="30" name="Etc/GMT-11" label="Samoa" iCal="Pacific/Apia" />
</timezones>