You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/06/03 12:59:19 UTC
svn commit: r1683280 [4/7] - in /openmeetings/trunk/singlewebapp:
openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/
openmeetings-core/src/main/java/org/...
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java Wed Jun 3 10:59:16 2015
@@ -46,16 +46,16 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
@NamedQuery(name = "closePoll", query = "UPDATE RoomPoll rp SET rp.archived = :archived "
- + "WHERE rp.room.id = :rooms_id"),
+ + "WHERE rp.room.id = :roomId"),
@NamedQuery(name = "deletePoll", query = "DELETE FROM RoomPoll rp WHERE rp.id = :id"),
@NamedQuery(name = "getPollById", query = "SELECT rp FROM RoomPoll rp WHERE rp.id = :id"),
@NamedQuery(name = "getPoll", query = "SELECT rp FROM RoomPoll rp "
- + "WHERE rp.room.id = :room_id AND rp.archived = :archived"),
+ + "WHERE rp.room.id = :roomId AND rp.archived = :archived"),
@NamedQuery(name = "getPollListBackup", query = "SELECT rp FROM RoomPoll rp ORDER BY rp.id"),
@NamedQuery(name = "getArchivedPollList", query = "SELECT rp FROM RoomPoll rp "
- + "WHERE rp.room.id = :room_id AND rp.archived = :archived ORDER BY rp.created DESC"),
+ + "WHERE rp.room.id = :roomId AND rp.archived = :archived ORDER BY rp.created DESC"),
@NamedQuery(name = "hasPoll", query = "SELECT COUNT(rp) FROM RoomPoll rp "
- + "WHERE rp.room.id = :room_id AND rp.archived = :archived") })
+ + "WHERE rp.room.id = :roomId AND rp.archived = :archived") })
@Table(name = "room_poll")
@Root(name = "roompoll")
public class RoomPoll implements IDataProviderEntity {
@@ -95,7 +95,7 @@ public class RoomPoll implements IDataPr
private User creator;
@OneToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "rooms_id")
+ @JoinColumn(name = "room_id")
@ForeignKey(enabled = true)
@Element(name = "roomid", data = true, required = false)
private Room room;
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java Wed Jun 3 10:59:16 2015
@@ -40,7 +40,7 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name = "hasVoted", query = "SELECT rpa FROM RoomPollAnswer rpa WHERE rpa.roomPoll.room.id = :room_id " +
+ @NamedQuery(name = "hasVoted", query = "SELECT rpa FROM RoomPollAnswer rpa WHERE rpa.roomPoll.room.id = :roomId " +
"AND rpa.votedUser.id = :userid AND rpa.roomPoll.archived = false")
})
@Table(name = "room_poll_answer")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java Wed Jun 3 10:59:16 2015
@@ -45,11 +45,11 @@ public class RoomType implements IDataPr
@Column(name="id")
private Long id;
- @Column(name = "starttime")
- private Date starttime;
+ @Column(name = "inserted")
+ private Date inserted;
- @Column(name = "updatetime")
- private Date updatetime;
+ @Column(name = "updated")
+ private Date updated;
@Column(name="name")
private String name;
@@ -57,9 +57,9 @@ public class RoomType implements IDataPr
@Column(name = "deleted")
private boolean deleted;
- @Column(name="fieldvalues_id")
- @Element(data=true, required=false)
- private Long fieldvalues_id;
+ @Column(name="label_id")
+ @Element(name="fieldvalues_id", data=true, required=false)
+ private Long labelId;
public String getName() {
return name;
@@ -75,18 +75,18 @@ public class RoomType implements IDataPr
this.id = id;
}
- public Date getStarttime() {
- return starttime;
+ public Date getInserted() {
+ return inserted;
}
- public void setStarttime(Date starttime) {
- this.starttime = starttime;
+ public void setInserted(Date inserted) {
+ this.inserted = inserted;
}
- public Date getUpdatetime() {
- return updatetime;
+ public Date getUpdated() {
+ return updated;
}
- public void setUpdatetime(Date updatetime) {
- this.updatetime = updatetime;
+ public void setUpdated(Date updated) {
+ this.updated = updated;
}
public boolean isDeleted() {
@@ -96,10 +96,10 @@ public class RoomType implements IDataPr
this.deleted = deleted;
}
- public Long getFieldvalues_id() {
- return fieldvalues_id;
+ public Long getLabelId() {
+ return labelId;
}
- public void setFieldvalues_id(Long fieldvalues_id) {
- this.fieldvalues_id = fieldvalues_id;
+ public void setLabelId(Long labelId) {
+ this.labelId = labelId;
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java Wed Jun 3 10:59:16 2015
@@ -41,7 +41,7 @@ public class SOAPLogin implements Serial
private String hash;
@Column(name="room_id")
- private Long room_id;
+ private Long roomId;
@Column(name="session_hash")
private String sessionHash;
@@ -70,8 +70,8 @@ public class SOAPLogin implements Serial
@Column(name="client_url")
private String clientURL;
- @Column(name="room_recording_id")
- private Long roomRecordingId;
+ @Column(name="recording_id")
+ private Long recordingId;
@Column(name="landing_zone")
private String landingZone;
@@ -93,11 +93,11 @@ public class SOAPLogin implements Serial
this.hash = hash;
}
- public Long getRoom_id() {
- return room_id;
+ public Long getRoomId() {
+ return roomId;
}
- public void setRoom_id(Long room_id) {
- this.room_id = room_id;
+ public void setRoomId(Long roomId) {
+ this.roomId = roomId;
}
public String getSessionHash() {
@@ -163,11 +163,11 @@ public class SOAPLogin implements Serial
this.clientURL = clientURL;
}
- public Long getRoomRecordingId() {
- return roomRecordingId;
+ public Long getRecordingId() {
+ return recordingId;
}
- public void setRoomRecordingId(Long roomRecordingId) {
- this.roomRecordingId = roomRecordingId;
+ public void setRecordingId(Long recordingId) {
+ this.recordingId = recordingId;
}
public String getLandingZone() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java Wed Jun 3 10:59:16 2015
@@ -35,11 +35,9 @@ import javax.xml.bind.annotation.XmlRoot
@Entity
@NamedQueries({
@NamedQuery(name = "getSessionById", query = "select c from Sessiondata as c "
- + "where c.session_id LIKE :session_id"),
+ + "where c.sessionId LIKE :sessionId"),
@NamedQuery(name = "getSessionToDelete", query = "Select c from Sessiondata c "
- + "WHERE c.refresh_time < :refresh_time " + "AND ( "
- + "c.storePermanent IS NULL " + "OR "
- + "c.storePermanent = false " + ")")
+ + "WHERE c.refreshed < :refreshed AND (c.permanent = false)")
})
@Table(name = "sessiondata")
@XmlRootElement
@@ -51,29 +49,29 @@ public class Sessiondata implements Seri
private Long id;
@Column(name="user_id")
- private Long user_id;
+ private Long userId;
@Column(name="session_id")
- private String session_id;
+ private String sessionId;
- @Column(name="starttermin_time")
- private Date starttermin_time;
+ @Column(name="created")
+ private Date created;
- @Column(name="refresh_time")
- private Date refresh_time;
+ @Column(name="refreshed")
+ private Date refreshed;
@Lob
- @Column(name="sessionXml")
- private String sessionXml;
+ @Column(name="xml")
+ private String xml;
- @Column(name="storePermanent")
- private Boolean storePermanent;
+ @Column(name="permanent")
+ private boolean permanent;
@Column(name="language_id")
- private Long language_id;
+ private Long languageId;
@Column(name="organization_id")
- private Long organization_id;
+ private Long organizationId;
public Sessiondata() {
}
@@ -85,60 +83,60 @@ public class Sessiondata implements Seri
this.id = id;
}
- public Date getRefresh_time() {
- return refresh_time;
+ public Date getRefreshed() {
+ return refreshed;
}
- public void setRefresh_time(Date refresh_time) {
- this.refresh_time = refresh_time;
+ public void setRefreshed(Date refreshed) {
+ this.refreshed = refreshed;
}
- public String getSession_id() {
- return session_id;
+ public String getSessionId() {
+ return sessionId;
}
- public void setSession_id(String session_id) {
- this.session_id = session_id;
+ public void setSessionId(String sessionId) {
+ this.sessionId = sessionId;
}
- public Date getStarttermin_time() {
- return starttermin_time;
+ public Date getCreated() {
+ return created;
}
- public void setStarttermin_time(Date starttermin_time) {
- this.starttermin_time = starttermin_time;
+ public void setCreated(Date created) {
+ this.created = created;
}
- public Long getUser_id() {
- return user_id;
+ public Long getUserId() {
+ return userId;
}
- public void setUser_id(Long user_id) {
- this.user_id = user_id;
+ public void setUserId(Long userId) {
+ this.userId = userId;
}
- public String getSessionXml() {
- return sessionXml;
+ public String getXml() {
+ return xml;
}
- public void setSessionXml(String sessionXml) {
- this.sessionXml = sessionXml;
+ public void setXml(String xml) {
+ this.xml = xml;
}
- public Boolean getStorePermanent() {
- return storePermanent;
+ public boolean isPermanent() {
+ return permanent;
}
- public void setStorePermanent(Boolean storePermanent) {
- this.storePermanent = storePermanent;
+ public void setPermanent(boolean permanent) {
+ this.permanent = permanent;
}
- public Long getLanguage_id() {
- return language_id;
+ public Long getLanguageId() {
+ return languageId;
}
- public void setLanguage_id(Long language_id) {
- this.language_id = language_id;
+ public void setLanguageId(Long languageId) {
+ this.languageId = languageId;
}
- public Long getOrganization_id() {
- return organization_id;
+ public Long getOrganizationId() {
+ return organizationId;
}
- public void setOrganization_id(Long organization_id) {
- this.organization_id = organization_id;
+ public void setOrganizationId(Long organizationId) {
+ this.organizationId = organizationId;
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java Wed Jun 3 10:59:16 2015
@@ -59,14 +59,14 @@ public class Address implements IDataPro
@Element(data=true, required=false)
private String fax;
- @Column(name = "starttime")
- @Element(data=true, required=false)
- private Date starttime;
+ @Column(name = "inserted")
+ @Element(name = "starttime",data=true, required=false)
+ private Date inserted;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "state_id")
@Element(name="state_id", data=true, required=false)
- private State states;
+ private State state;
@Column(name = "street")
@Element(data=true, required=false)
@@ -76,8 +76,8 @@ public class Address implements IDataPro
@Element(data=true, required=false)
private String town;
- @Column(name = "updatetime")
- private Date updatetime;
+ @Column(name = "updated")
+ private Date updated;
@Column(name = "zip")
@Element(data=true, required=false)
@@ -126,20 +126,20 @@ public class Address implements IDataPro
this.fax = fax;
}
- public Date getStarttime() {
- return starttime;
+ public Date getInserted() {
+ return inserted;
}
- public void setStarttime(Date starttime) {
- this.starttime = starttime;
+ public void setInserted(Date inserted) {
+ this.inserted = inserted;
}
- public State getStates() {
- return states;
+ public State getState() {
+ return state;
}
- public void setStates(State states) {
- this.states = states;
+ public void setState(State state) {
+ this.state = state;
}
public String getStreet() {
@@ -158,12 +158,12 @@ public class Address implements IDataPro
this.town = town;
}
- public Date getUpdatetime() {
- return updatetime;
+ public Date getUpdated() {
+ return updated;
}
- public void setUpdatetime(Date updatetime) {
- this.updatetime = updatetime;
+ public void setUpdated(Date updated) {
+ this.updated = updated;
}
public String getZip() {
@@ -200,7 +200,7 @@ public class Address implements IDataPro
@Override
public String toString() {
- return "Address [id=" + id + ", states=" + states
+ return "Address [id=" + id + ", state=" + state
+ ", street=" + street + ", town=" + town + ", zip=" + zip
+ ", deleted=" + deleted + ", email=" + email + ", phone="
+ phone + "]";
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java Wed Jun 3 10:59:16 2015
@@ -36,13 +36,13 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
@NamedQuery(name="getOrganisationById",
- query="SELECT c FROM Organisation AS c WHERE c.id = :organisation_id AND c.deleted = false")
+ query="SELECT c FROM Organisation AS c WHERE c.id = :organisationId AND c.deleted = false")
, @NamedQuery(name="getAnyOrganisationById",
- query="SELECT c FROM Organisation AS c WHERE c.id = :organisation_id")
+ query="SELECT c FROM Organisation AS c WHERE c.id = :organisationId")
, @NamedQuery(name="getOrganisationsByIds",
query="SELECT c FROM Organisation AS c WHERE c.id IN :ids")
, @NamedQuery(name="getOrganisationsByUserId",
- query="SELECT ou.organisation FROM User u, IN(u.organisationUsers) ou WHERE u.deleted = false AND u.id = :user_id")
+ query="SELECT ou.organisation FROM User u, IN(u.organisationUsers) ou WHERE u.deleted = false AND u.id = :userId")
, @NamedQuery(name="getNondeletedOrganisations", query="SELECT o FROM Organisation o WHERE o.deleted = false ORDER BY o.id")
, @NamedQuery(name="countOrganisations", query="SELECT COUNT(c) FROM Organisation AS c WHERE c.deleted = false")
})
@@ -67,11 +67,11 @@ public class Organisation implements IDa
@Column(name="updatedby")
private Long updatedby;
- @Column(name="starttime")
- private Date starttime;
+ @Column(name="inserted")
+ private Date inserted;
- @Column(name="updatetime")
- private Date updatetime;
+ @Column(name="updated")
+ private Date updated;
@Column(name="deleted")
@Element(data = true, required = false)
@@ -107,18 +107,18 @@ public class Organisation implements IDa
}
- public Date getStarttime() {
- return starttime;
+ public Date getInserted() {
+ return inserted;
}
- public void setStarttime(Date starttime) {
- this.starttime = starttime;
+ public void setInserted(Date inserted) {
+ this.inserted = inserted;
}
- public Date getUpdatetime() {
- return updatetime;
+ public Date getUpdated() {
+ return updated;
}
- public void setUpdatetime(Date updatetime) {
- this.updatetime = updatetime;
+ public void setUpdated(Date updated) {
+ this.updated = updated;
}
public boolean isDeleted() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java Wed Jun 3 10:59:16 2015
@@ -65,11 +65,11 @@ public class OrganisationUser implements
@ForeignKey(enabled = true)
private User user;
- @Column(name = "starttime")
- private Date starttime;
+ @Column(name = "inserted")
+ private Date inserted;
- @Column(name = "updatetime")
- private Date updatetime;
+ @Column(name = "updated")
+ private Date updated;
@Column(name = "deleted")
@Element(data=true)
@@ -99,20 +99,20 @@ public class OrganisationUser implements
this.id = id;
}
- public Date getStarttime() {
- return starttime;
+ public Date getInserted() {
+ return inserted;
}
- public void setStarttime(Date starttime) {
- this.starttime = starttime;
+ public void setInserted(Date inserted) {
+ this.inserted = inserted;
}
- public Date getUpdatetime() {
- return updatetime;
+ public Date getUpdated() {
+ return updated;
}
- public void setUpdatetime(Date updatetime) {
- this.updatetime = updatetime;
+ public void setUpdated(Date updated) {
+ this.updated = updated;
}
public boolean isDeleted() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java Wed Jun 3 10:59:16 2015
@@ -101,7 +101,7 @@ public class PrivateMessage implements I
private boolean bookedRoom;
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "rooms_id")
+ @JoinColumn(name = "room_id")
@ForeignKey(enabled = true)
@Element(data = true, required = false)
private Room room;
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java Wed Jun 3 10:59:16 2015
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.user;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -30,41 +29,42 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
@Table(name = "salutation")
@NamedQueries({
- @NamedQuery(name = "getSalutationById", query = "SELECT s FROM Salutation AS s WHERE s.salutations_id = :id")
+ @NamedQuery(name = "getSalutationById", query = "SELECT s FROM Salutation AS s WHERE s.id = :id")
, @NamedQuery(name = "getSalutations", query = "SELECT s FROM Salutation AS s")
})
@Root
-public class Salutation implements Serializable {
+public class Salutation implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
@Element(name="id", data=true)
- private Long salutations_id;
+ private Long id;
@Column(name="name")
@Element(data=true, required=false)
private String name;
- @Column(name="starttime")
- private Date starttime;
+ @Column(name="inserted")
+ private Date inserted;
- @Column(name="updatetime")
- private Date updatetime;
+ @Column(name="updated")
+ private Date updated;
@Column(name="deleted")
@Element(data=true, required=false)
private boolean deleted;
- @Column(name="fieldvalues_id")
- @Element(data=true, required=false)
- private Long fieldvalues_id;
+ @Column(name="label_id")
+ @Element(name="fieldvalues_id", data=true, required=false)
+ private Long labelId;
public String getName() {
return name;
@@ -73,26 +73,26 @@ public class Salutation implements Seria
this.name = name;
}
- public Long getSalutations_id() {
- return salutations_id;
+ public Long getId() {
+ return id;
}
- public void setSalutations_id(Long salutations_id) {
- this.salutations_id = salutations_id;
+ public void setId(Long id) {
+ this.id = id;
}
- public Date getStarttime() {
- return starttime;
+ public Date getInserted() {
+ return inserted;
}
- public void setStarttime(Date starttime) {
- this.starttime = starttime;
+ public void setInserted(Date inserted) {
+ this.inserted = inserted;
}
- public Date getUpdatetime() {
- return updatetime;
+ public Date getUpdated() {
+ return updated;
}
- public void setUpdatetime(Date updatetime) {
- this.updatetime = updatetime;
+ public void setUpdated(Date updated) {
+ this.updated = updated;
}
public boolean isDeleted() {
@@ -102,10 +102,10 @@ public class Salutation implements Seria
this.deleted = deleted;
}
- public Long getFieldvalues_id() {
- return fieldvalues_id;
+ public Long getLabelId() {
+ return labelId;
}
- public void setFieldvalues_id(Long fieldvalues_id) {
- this.fieldvalues_id = fieldvalues_id;
+ public void setLabelId(Long labelId) {
+ this.labelId = labelId;
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java Wed Jun 3 10:59:16 2015
@@ -33,7 +33,7 @@ import org.apache.openmeetings.db.entity
@Entity
@NamedQueries({
- @NamedQuery(name = "getStateById", query = "select c from State as c where c.id = :state_id AND c.deleted = false"),
+ @NamedQuery(name = "getStateById", query = "select c from State as c where c.id = :id AND c.deleted = false"),
@NamedQuery(name = "getStates", query = "select c from State as c where c.deleted = false"),
@NamedQuery(name = "getStateByName", query = "select c from State as c where lower(c.name) LIKE :name AND c.deleted = false")
})
@@ -48,11 +48,11 @@ public class State implements IDataProvi
@Column(name = "name")
private String name;
- @Column(name = "starttime")
- private Date starttime;
+ @Column(name = "inserted")
+ private Date inserted;
- @Column(name = "updatetime")
- private Date updatetime;
+ @Column(name = "updated")
+ private Date updated;
@Column(name = "deleted")
private boolean deleted;
@@ -79,20 +79,20 @@ public class State implements IDataProvi
this.id = id;
}
- public Date getStarttime() {
- return starttime;
+ public Date getInserted() {
+ return inserted;
}
- public void setStarttime(Date starttime) {
- this.starttime = starttime;
+ public void setInserted(Date inserted) {
+ this.inserted = inserted;
}
- public Date getUpdatetime() {
- return updatetime;
+ public Date getUpdated() {
+ return updated;
}
- public void setUpdatetime(Date updatetime) {
- this.updatetime = updatetime;
+ public void setUpdated(Date updated) {
+ this.updated = updated;
}
public boolean isDeleted() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java Wed Jun 3 10:59:16 2015
@@ -80,9 +80,9 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getUserById", query = "SELECT u FROM User u WHERE u.id = :id"),
@NamedQuery(name = "getUsersByIds", query = "select c from User c where c.id IN :ids"),
@NamedQuery(name = "getUserByLogin", query = "SELECT u FROM User u WHERE u.deleted = false AND u.type = :type AND u.login = :login AND ((:domainId = 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId = :domainId))"),
- @NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User u WHERE u.deleted = false AND u.type = :type AND u.adresses.email = :email AND ((:domainId = 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId = :domainId))"),
+ @NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User u WHERE u.deleted = false AND u.type = :type AND u.address.email = :email AND ((:domainId = 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId = :domainId))"),
@NamedQuery(name = "getUserByHash", query = "SELECT u FROM User u WHERE u.deleted = false AND u.type = :type AND u.resethash = :resethash"),
- @NamedQuery(name = "getContactByEmailAndUser", query = "SELECT u FROM User u WHERE u.deleted = false AND u.adresses.email = :email AND u.type = :type AND u.ownerId = :ownerId"),
+ @NamedQuery(name = "getContactByEmailAndUser", query = "SELECT u FROM User u WHERE u.deleted = false AND u.address.email = :email AND u.type = :type AND u.ownerId = :ownerId"),
@NamedQuery(name = "selectMaxFromUsersWithSearch", query = "select count(c.id) from User c "
+ "where c.deleted = false " + "AND ("
+ "lower(c.login) LIKE :search "
@@ -94,9 +94,9 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "updatePassword", query = "UPDATE User u SET u.password = :password WHERE u.id = :userId"), //
@NamedQuery(name = "getNondeletedUsers", query = "SELECT u FROM User u WHERE u.deleted = false"),
@NamedQuery(name = "countNondeletedUsers", query = "SELECT COUNT(u) FROM User u WHERE u.deleted = false"),
- @NamedQuery(name = "getUsersByOrganisationId", query = "SELECT u FROM User u WHERE u.deleted = false AND u.organisationUsers.organisation.id = :organisation_id"),
- @NamedQuery(name = "getExternalUser", query = "SELECT u FROM User u WHERE u.deleted = false AND u.externalUserId LIKE :externalId AND u.externalUserType LIKE :externalType"),
- @NamedQuery(name = "getUserByLoginOrEmail", query = "SELECT u from User u WHERE u.deleted = false AND u.type = :type AND (u.login = :userOrEmail OR u.adresses.email = :userOrEmail)")
+ @NamedQuery(name = "getUsersByOrganisationId", query = "SELECT u FROM User u WHERE u.deleted = false AND u.organisationUsers.organisation.id = :organisationId"),
+ @NamedQuery(name = "getExternalUser", query = "SELECT u FROM User u WHERE u.deleted = false AND u.externalId LIKE :externalId AND u.externalType LIKE :externalType"),
+ @NamedQuery(name = "getUserByLoginOrEmail", query = "SELECT u from User u WHERE u.deleted = false AND u.type = :type AND (u.login = :userOrEmail OR u.address.email = :userOrEmail)")
})
@Table(name = "om_user")
@Root(name = "user")
@@ -160,15 +160,15 @@ public class User implements IDataProvid
@Element(data = true, required = false)
private Date regdate;
- @Column(name = "salutations_id")
+ @Column(name = "salutation_id")
@Element(name = "title_id", data = true, required = false)
- private Long salutations_id;
+ private Long salutationId;
- @Column(name = "starttime")
- private Date starttime;
+ @Column(name = "inserted")
+ private Date inserted;
- @Column(name = "updatetime")
- private Date updatetime;
+ @Column(name = "updated")
+ private Date updated;
@Column(name = "pictureuri")
@Element(data = true, required = false)
@@ -191,10 +191,10 @@ public class User implements IDataProvid
private String activatehash;
@OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
- @JoinColumn(name = "adresses_id", insertable = true, updatable = true)
+ @JoinColumn(name = "address_id", insertable = true, updatable = true)
@ForeignKey(enabled = true)
@Element(name = "address", required = false)
- private Address adresses;
+ private Address address;
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@JoinColumn(name = "user_id", insertable = true, updatable = true)
@@ -208,13 +208,13 @@ public class User implements IDataProvid
private AsteriskSipUser sipUser;
// Vars to simulate external Users
- @Column(name = "externalUserId")
- @Element(data = true, required = false)
- private String externalUserId;
-
- @Column(name = "externalUserType")
- @Element(data = true, required = false)
- private String externalUserType;
+ @Column(name = "external_id")
+ @Element(name = "externalUserId", data = true, required = false)
+ private String externalId;
+
+ @Column(name = "external_type")
+ @Element(name = "externalUserType", data = true, required = false)
+ private String externalType;
/**
* java.util.TimeZone Id
@@ -278,12 +278,12 @@ public class User implements IDataProvid
this.id = id;
}
- public Address getAdresses() {
- return adresses;
+ public Address getAddress() {
+ return address;
}
- public void setAdresses(Address adresses) {
- this.adresses = adresses;
+ public void setAddress(Address address) {
+ this.address = address;
}
public Date getAge() {
@@ -379,28 +379,28 @@ public class User implements IDataProvid
this.regdate = regdate;
}
- public Long getSalutations_id() {
- return salutations_id;
+ public Long getSalutationId() {
+ return salutationId;
}
- public void setSalutations_id(Long salutations_id) {
- this.salutations_id = salutations_id;
+ public void setSalutationId(Long salutationId) {
+ this.salutationId = salutationId;
}
- public Date getStarttime() {
- return starttime;
+ public Date getInserted() {
+ return inserted;
}
- public void setStarttime(Date starttime) {
- this.starttime = starttime;
+ public void setInserted(Date inserted) {
+ this.inserted = inserted;
}
- public Date getUpdatetime() {
- return updatetime;
+ public Date getUpdated() {
+ return updated;
}
- public void setUpdatetime(Date updatetime) {
- this.updatetime = updatetime;
+ public void setUpdated(Date updated) {
+ this.updated = updated;
}
public boolean isDeleted() {
@@ -456,20 +456,20 @@ public class User implements IDataProvid
this.activatehash = activatehash;
}
- public String getExternalUserId() {
- return externalUserId;
+ public String getExternalId() {
+ return externalId;
}
- public void setExternalUserId(String externalUserId) {
- this.externalUserId = externalUserId;
+ public void setExternalId(String externalId) {
+ this.externalId = externalId;
}
- public String getExternalUserType() {
- return externalUserType;
+ public String getExternalType() {
+ return externalType;
}
- public void setExternalUserType(String externalUserType) {
- this.externalUserType = externalUserType;
+ public void setExternalType(String externalType) {
+ this.externalType = externalType;
}
public Sessiondata getSessionData() {
@@ -544,7 +544,7 @@ public class User implements IDataProvid
}
public String getPhoneForSMS() {
- return getSendSMS() ? getAdresses().getPhone() : "";
+ return getSendSMS() ? getAddress().getPhone() : "";
}
public Type getType() {
@@ -584,8 +584,8 @@ public class User implements IDataProvid
return "User [id=" + id + ", firstname=" + firstname
+ ", lastname=" + lastname + ", login=" + login
+ ", pictureuri=" + pictureuri + ", deleted=" + deleted
- + ", languageId=" + languageId + ", adresses=" + adresses
- + ", externalId=" + externalUserId + ", externalType=" + externalUserType
+ + ", languageId=" + languageId + ", address=" + address
+ + ", externalId=" + externalId + ", externalType=" + externalType
+ ", type=" + type + "]";
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java Wed Jun 3 10:59:16 2015
@@ -42,7 +42,7 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "deleteUserContact", query = "delete from UserContact u where u.userContactId = :userContactDeleteId"),
@NamedQuery(name = "deleteAllUserContacts", query = "delete from UserContact u where u.owner.id = :ownerId"),
@NamedQuery(name = "checkUserContacts", query = "select count(c.userContactId) from UserContact c " +
- "where c.contact.id = :user_id AND c.owner.id = :ownerId "),
+ "where c.contact.id = :userId AND c.owner.id = :ownerId "),
@NamedQuery(name = "getContactsByHash", query = "select c from UserContact c " +
"where c.hash like :hash "),
@NamedQuery(name = "getContactsByUserAndStatus", query = "select c from UserContact c " +
@@ -59,14 +59,14 @@ import org.simpleframework.xml.Root;
"AND c.shareCalendar = :shareCalendar " +
"AND c.contact.deleted = false"),
@NamedQuery(name = "getContactRequestsByUserAndStatus", query = "select c from UserContact c " +
- "where c.contact.id = :user_id " +
+ "where c.contact.id = :userId " +
"AND c.pending = :pending " +
"AND c.contact.deleted = false"),
@NamedQuery(name = "getContactsByUser", query = "SELECT c FROM UserContact c " +
- "WHERE c.contact.id = :user_id " +
+ "WHERE c.contact.id = :userId " +
"AND c.contact.deleted = false ORDER BY c.pending DESC"),
@NamedQuery(name = "countContactsByUser", query = "select COUNT(c) from UserContact c " +
- "where c.contact.id = :user_id " +
+ "where c.contact.id = :userId " +
"AND c.contact.deleted = false"),
@NamedQuery(name = "getUserContactsById", query = "SELECT c FROM UserContact c WHERE c.userContactId = :userContactId"),
@NamedQuery(name = "getUserContacts", query = "SELECT c FROM UserContact c ORDER BY c.userContactId")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java Wed Jun 3 10:59:16 2015
@@ -36,22 +36,22 @@ public class Userdata implements Seriali
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
- private Long data_id;
+ private Long id;
@Column(name="user_id")
- private Long user_id;
+ private Long userId;
@Column(name="data_key")
- private String data_key;
+ private String key;
@Column(name="data")
private String data;
- @Column(name = "starttime")
- private Date starttime;
+ @Column(name = "inserted")
+ private Date inserted;
- @Column(name = "updatetime")
- private Date updatetime;
+ @Column(name = "updated")
+ private Date updated;
@Lob
@Column(name = "comment_field")
@@ -74,33 +74,33 @@ public class Userdata implements Seriali
this.data = data;
}
- public String getData_key() {
- return data_key;
+ public String getKey() {
+ return key;
}
- public void setData_key(String data_key) {
- this.data_key = data_key;
+ public void setKey(String key) {
+ this.key = key;
}
- public Long getData_id() {
- return data_id;
+ public Long getId() {
+ return id;
}
- public void setData_id(Long data_id) {
- this.data_id = data_id;
+ public void setId(Long id) {
+ this.id = id;
}
- public Date getStarttime() {
- return starttime;
+ public Date getInserted() {
+ return inserted;
}
- public void setStarttime(Date starttime) {
- this.starttime = starttime;
+ public void setInserted(Date inserted) {
+ this.inserted = inserted;
}
- public Date getUpdatetime() {
- return updatetime;
+ public Date getUpdated() {
+ return updated;
}
- public void setUpdatetime(Date updatetime) {
- this.updatetime = updatetime;
+ public void setUpdated(Date updated) {
+ this.updated = updated;
}
public boolean isDeleted() {
@@ -110,11 +110,11 @@ public class Userdata implements Seriali
this.deleted = deleted;
}
- public Long getUser_id() {
- return user_id;
+ public Long getUserId() {
+ return userId;
}
- public void setUser_id(Long user_id) {
- this.user_id = user_id;
+ public void setUserId(Long userId) {
+ this.userId = userId;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java Wed Jun 3 10:59:16 2015
@@ -68,7 +68,7 @@ public class FormatHelper {
public static String formatUser(User u, boolean isHTMLEscape) {
String user = "";
if (u != null) {
- String email = u.getAdresses() == null ? "" : u.getAdresses().getEmail();
+ String email = u.getAddress() == null ? "" : u.getAddress().getEmail();
user = String.format("\"%s %s\" <%s>", u.getFirstname(), u.getLastname(), email);
user = isHTMLEscape ? escapeHtml4(user) : user;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java Wed Jun 3 10:59:16 2015
@@ -358,7 +358,7 @@ public class BackupExport {
Serializer serializer = new Persister(strategy);
if (list != null && list.size() > 0) {
- registry.bind(list.get(0).getStarttime().getClass(), DateConverter.class);
+ registry.bind(list.get(0).getInserted().getClass(), DateConverter.class);
}
writeList(serializer, backup_dir, "configs.xml", "configs", list);
@@ -482,11 +482,11 @@ public class BackupExport {
}
log.debug("sid: " + sid);
- Long users_id = sessiondataDao.checkSession(sid);
- Set<Right> rights = usersDao.get(users_id).getRights();
+ Long userId = sessiondataDao.checkSession(sid);
+ Set<Right> rights = usersDao.get(userId).getRights();
- log.debug("users_id: " + users_id);
- log.debug("user_level: " + rights);
+ log.debug("userId: " + userId);
+ log.debug("user level: " + rights);
if (AuthLevelUtil.hasAdminLevel(rights)) {
// if (true) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Wed Jun 3 10:59:16 2015
@@ -244,22 +244,22 @@ public class BackupImport {
List<Configuration> list = readList(serializer, f, "configs.xml", "configs", Configuration.class, true);
for (Configuration c : list) {
- if (c.getConf_key() == null || c.isDeleted()) {
+ if (c.getKey() == null || c.isDeleted()) {
continue;
}
- Configuration cfg = configurationDao.forceGet(c.getConf_key());
+ Configuration cfg = configurationDao.forceGet(c.getKey());
if (cfg != null && !cfg.isDeleted()) {
- log.warn("Non deleted configuration with same key is found! old value: {}, new value: {}", cfg.getConf_value(), c.getConf_value());
+ log.warn("Non deleted configuration with same key is found! old value: {}, new value: {}", cfg.getValue(), c.getValue());
}
c.setId(cfg == null ? null : cfg.getId());
if (c.getUser() != null && c.getUser().getId() == null) {
c.setUser(null);
}
- if (CONFIG_CRYPT_KEY.equals(c.getConf_key())) {
+ if (CONFIG_CRYPT_KEY.equals(c.getKey())) {
try {
- Class.forName(c.getConf_value());
+ Class.forName(c.getValue());
} catch (ClassNotFoundException e) {
- c.setConf_value(MD5Implementation.class.getCanonicalName());
+ c.setValue(MD5Implementation.class.getCanonicalName());
}
}
configurationDao.update(c, null);
@@ -307,7 +307,7 @@ public class BackupImport {
u.setForceTimeZoneCheck(false);
}
- u.setStarttime(new Date());
+ u.setInserted(new Date());
long userId = u.getId();
u.setId(null);
if (u.getSipUser() != null && u.getSipUser().getId() != 0) {
@@ -908,7 +908,7 @@ public class BackupImport {
return list;
}
- //FIXME (need to be removed in later versions) HACK to fix 2 deleted nodes in users.xml and inline Adresses and sipData
+ //FIXME (need to be removed in later versions) HACK to fix 2 deleted nodes in users.xml and inline Address and sipData
private List<User> readUserList(InputSource xml, String listNodeName) throws Exception {
Registry registry = new Registry();
Strategy strategy = new RegistryStrategy(registry);
@@ -924,10 +924,10 @@ public class BackupImport {
//add existence email from database
List<User> users = usersDao.getAllUsers();
for (User u : users){
- if (u.getAdresses() == null || u.getAdresses().getEmail() == null || User.Type.user != u.getType()) {
+ if (u.getAddress() == null || u.getAddress().getEmail() == null || User.Type.user != u.getType()) {
continue;
}
- userEmailMap.put(u.getAdresses().getEmail(), -1);
+ userEmailMap.put(u.getAddress().getEmail(), -1);
}
Node nList = getNode(getNode(doc, "root"), listNodeName);
if (nList != null) {
@@ -970,9 +970,9 @@ public class BackupImport {
boolean needToSkip1 = true;
//HACK to handle Address inside user
- if (u.getAdresses() == null) {
+ if (u.getAddress() == null) {
Address a = ser.read(Address.class, item1, false);
- u.setAdresses(a);
+ u.setAddress(a);
needToSkip1 = false;
}
if (needToSkip1) {
@@ -980,14 +980,14 @@ public class BackupImport {
item1 = listNode1.getNext(); //HACK to handle Address inside user
} while (item1 != null && !"user".equals(item1.getName()));
}
- String level_id = null, status = null;
+ String levelId = null, status = null;
do {
if (u.getTimeZoneId() == null && "omTimeZone".equals(item2.getName())) {
String jName = item2.getValue();
u.setTimeZoneId(jName == null ? null : tzUtil.getTimezoneByInternalJName(jName).getID());
}
if ("level_id".equals(item2.getName())) {
- level_id = item2.getValue();
+ levelId = item2.getValue();
}
if ("status".equals(item2.getName())) {
status = item2.getValue();
@@ -1000,22 +1000,22 @@ public class BackupImport {
u.getRights().add(Right.Dashboard);
u.getRights().add(Right.Login);
}
- if ("3".equals(level_id)) {
+ if ("3".equals(levelId)) {
u.getRights().add(Right.Admin);
u.getRights().add(Right.Soap);
}
- if ("4".equals(level_id)) {
+ if ("4".equals(levelId)) {
u.getRights().add(Right.Soap);
}
}
// check that email is unique
- if (u.getAdresses() != null && u.getAdresses().getEmail() != null && User.Type.user == u.getType()) {
- if (userEmailMap.containsKey(u.getAdresses().getEmail())) {
+ if (u.getAddress() != null && u.getAddress().getEmail() != null && User.Type.user == u.getType()) {
+ if (userEmailMap.containsKey(u.getAddress().getEmail())) {
log.warn("Email is duplicated for user " + u.toString());
- String updateEmail = "modified_by_import_<" + list.size() + ">" + u.getAdresses().getEmail();
- u.getAdresses().setEmail(updateEmail);
+ String updateEmail = "modified_by_import_<" + list.size() + ">" + u.getAddress().getEmail();
+ u.getAddress().setEmail(updateEmail);
}
- userEmailMap.put(u.getAdresses().getEmail(), userEmailMap.size());
+ userEmailMap.put(u.getAddress().getEmail(), userEmailMap.size());
}
list.add(u);
item = listNode.getNext();
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/StateConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/StateConverter.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/StateConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/StateConverter.java Wed Jun 3 10:59:16 2015
@@ -35,7 +35,7 @@ public class StateConverter extends OmCo
}
public State read(InputNode node) throws Exception {
- return statemanagement.getStateById(getlongValue(node));
+ return statemanagement.get(getlongValue(node));
}
public void write(OutputNode node, State value) throws Exception {
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Wed Jun 3 10:59:16 2015
@@ -248,9 +248,9 @@ public class ImportInitvalues {
Element row = it.next();
- Long errorvalues_id = null;
- Long fieldvalues_id = null;
- Long errortype_id = null;
+ Long errorvalueId = null;
+ Long labelId = null;
+ Long typeId = null;
for (@SuppressWarnings("unchecked")
Iterator<Element> itSub = row.elementIterator("field"); itSub.hasNext();) {
@@ -260,17 +260,17 @@ public class ImportInitvalues {
String text = field.getText();
// System.out.println("NAME | TEXT "+name+" | "+text);
if (name.equals("errorvalues_id")) {
- errorvalues_id = Long.valueOf(text);
+ errorvalueId = Long.valueOf(text);
}
if (name.equals("fieldvalues_id")) {
- fieldvalues_id = Long.valueOf(text);
+ labelId = Long.valueOf(text);
}
if (name.equals("errortype_id")) {
- errortype_id = Long.valueOf(text);
+ typeId = Long.valueOf(text);
}
}
- errorManagement.addErrorValues(errorvalues_id, errortype_id, fieldvalues_id);
+ errorManagement.addErrorValues(errorvalueId, typeId, labelId);
}
log.debug("ErrorMappings ADDED");
}
@@ -452,20 +452,17 @@ public class ImportInitvalues {
}
public void loadRoomTypes() {
- long conference_Id = roomTypeDao.addRoomType(
- "conference", 1541, false);
- log.debug("conference_Id: " + conference_Id);
+ long conferenceId = roomTypeDao.addRoomType("conference", 1541, false);
+ log.debug("conferenceId: " + conferenceId);
// Audience room type is not in use anymore
roomTypeDao.addRoomType("audience", -1, true);
- long restricted_Id = roomTypeDao.addRoomType(
- "restricted", 1542, false);
- log.debug("restricted_Id: " + restricted_Id);
-
- long interview_Id = roomTypeDao.addRoomType(
- "interview", 1543, false);
- log.debug("interview_Id: " + interview_Id);
+ long restrictedId = roomTypeDao.addRoomType("restricted", 1542, false);
+ log.debug("restrictedId: " + restrictedId);
+
+ long interviewId = roomTypeDao.addRoomType("interview", 1543, false);
+ log.debug("interviewId: " + interviewId);
// Custom room type is not in use anymore
roomTypeDao.addRoomType("custom", -2, true);
@@ -476,7 +473,7 @@ public class ImportInitvalues {
Room r = new Room();
r.setName(name);
r.setComment("");
- r.setStarttime(new Date());
+ r.setInserted(new Date());
r.setNumberOfPartizipants(capacity);
r.setRoomtype(roomTypeDao.get(typeId));
r.setIspublic(isPublic);
@@ -512,7 +509,7 @@ public class ImportInitvalues {
RoomOrganisation ro = new RoomOrganisation();
ro.setRoom(r);
ro.setOrganisation(organisationDao.get(orgId));
- ro.setStarttime(new Date());
+ ro.setInserted(new Date());
}
r = roomDao.update(r, null);
return r;
@@ -520,26 +517,26 @@ public class ImportInitvalues {
public void loadDefaultRooms(boolean createRooms) {
if (createRooms) {
// hardcoded IDs (they are not intended to be changed)
- long conference_Id = 1;
- long restricted_Id = 3;
- long interview_Id = 4;
-
- createRoom("public Interview Room", interview_Id, 16L, true, null);
- createRoom("public Conference Room", conference_Id, 32L, true, null);
- Room r = createRoom("public Video Only Room", conference_Id, 32L, true, null);
+ long conferenceId = 1;
+ long restrictedId = 3;
+ long interviewId = 4;
+
+ createRoom("public Interview Room", interviewId, 16L, true, null);
+ createRoom("public Conference Room", conferenceId, 32L, true, null);
+ Room r = createRoom("public Video Only Room", conferenceId, 32L, true, null);
r.setHideWhiteboard(true);
roomDao.update(r, null);
- createRoom("public Video And Whiteboard Room", conference_Id, 32L, true, null);
- createRoom("public Restricted Room", restricted_Id, 100L, true, null);
- r = createRoom("restricted room with micro option set", restricted_Id, 100L, true, null);
+ createRoom("public Video And Whiteboard Room", conferenceId, 32L, true, null);
+ createRoom("public Restricted Room", restrictedId, 100L, true, null);
+ r = createRoom("restricted room with micro option set", restrictedId, 100L, true, null);
r.setShowMicrophoneStatus(true);
roomDao.update(r, null);
- r = createRoom("conference room with micro option set", conference_Id, 32L, true, null);
+ r = createRoom("conference room with micro option set", conferenceId, 32L, true, null);
r.setShowMicrophoneStatus(true);
roomDao.update(r, null);
- createRoom("private Conference Room", conference_Id, 32L, false, 1L);
+ createRoom("private Conference Room", conferenceId, 32L, false, 1L);
}
}
@@ -549,7 +546,7 @@ public class ImportInitvalues {
org.setName(cfg.group);
org.setInsertedby(1L);
org.setDeleted(false);
- org.setStarttime(new Date());
+ org.setInserted(new Date());
org = organisationDao.update(org, null);
User u = userDao.getNewUserInstance(null);
@@ -559,7 +556,7 @@ public class ImportInitvalues {
u.setLogin(cfg.username);
u.setFirstname("firstname");
u.setLastname("lastname");
- u.getAdresses().setEmail(cfg.email);
+ u.getAddress().setEmail(cfg.email);
u.getOrganisationUsers().add(new OrganisationUser(org));
u = userDao.update(u, cfg.password, -1);
@@ -589,7 +586,7 @@ public class ImportInitvalues {
Iterator it = root.elementIterator("country"); it.hasNext();) {
Element item = (Element) it.next();
- statemanagement.addState(item.attributeValue("name"),
+ statemanagement.add(item.attributeValue("name"),
item.attributeValue("short"),
Integer.parseInt(item.attributeValue("code")));
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java Wed Jun 3 10:59:16 2015
@@ -96,7 +96,7 @@ public class AppointmentLogic {
private void sendReminder(User u, Appointment a, Invitation inv) throws Exception {
if (inv == null) {
log.error(String.format("Error retrieving Invitation for member %s in Appointment %s"
- , u.getAdresses().getEmail(), a.getTitle()));
+ , u.getAddress().getEmail(), a.getTitle()));
return;
}
@@ -111,7 +111,7 @@ public class AppointmentLogic {
AppointmentReminderTemplate t = AppointmentReminderTemplate.get(langId, a, tz);
invitationManager.sendInvitionLink(inv, MessageType.Create, t.getSubject(), t.getEmail(), false);
- invitationManager.sendInvitationReminderSMS(u.getAdresses().getPhone(), smsSubject, langId);
+ invitationManager.sendInvitationReminderSMS(u.getAddress().getPhone(), smsSubject, langId);
if (inv.getHash() != null) {
inv.setUpdated(new Date());
invitationDao.update(inv);
@@ -179,7 +179,7 @@ public class AppointmentLogic {
// Iterate through all MeetingMembers
for (MeetingMember mm : members) {
- log.debug("doScheduledMeetingReminder : Member " + mm.getUser().getAdresses().getEmail());
+ log.debug("doScheduledMeetingReminder : Member " + mm.getUser().getAddress().getEmail());
Invitation inv = mm.getInvitation();
@@ -200,7 +200,7 @@ public class AppointmentLogic {
Boolean isDaily, Boolean isWeekly, Boolean isMonthly,
Boolean isYearly, Long categoryId, Long remind, String[] mmClient,
Long roomType, Long languageId,
- Boolean isPasswordProtected, String password, long roomId, Long users_id) {
+ Boolean isPasswordProtected, String password, long roomId, Long userId) {
Appointment a = new Appointment();
a.setTitle(appointmentName);
a.setLocation(appointmentLocation);
@@ -221,7 +221,7 @@ public class AppointmentLogic {
a.getRoom().setName(appointmentName);
a.getRoom().setRoomtype(roomTypeDao.get(roomType));
}
- a.setOwner(userDao.get(users_id));
+ a.setOwner(userDao.get(userId));
a.setPasswordProtected(isPasswordProtected);
a.setPassword(password);
a.setMeetingMembers(new ArrayList<MeetingMember>());
@@ -229,7 +229,7 @@ public class AppointmentLogic {
if (Strings.isEmpty(singleClient)) {
continue;
}
- MeetingMember mm = getMeetingMember(users_id, languageId, singleClient);
+ MeetingMember mm = getMeetingMember(userId, languageId, singleClient);
mm.setAppointment(a);
a.getMeetingMembers().add(mm);
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java Wed Jun 3 10:59:16 2015
@@ -29,6 +29,7 @@ public class SessionClearJob {
private static Logger log = Red5LoggerFactory.getLogger(SessionClearJob.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
private SessiondataDao sessiondataDao;
+ private long timeout = 1800000L;
public void doIt() {
log.trace("SessionClearJob.execute");
@@ -37,9 +38,17 @@ public class SessionClearJob {
}
try {
// TODO Generate report
- sessiondataDao.clearSessionTable();
+ sessiondataDao.clearSessionTable(timeout);
} catch (Exception err){
log.error("execute",err);
}
}
+
+ public long getTimeout() {
+ return timeout;
+ }
+
+ public void setTimeout(long timeout) {
+ this.timeout = timeout;
+ }
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java Wed Jun 3 10:59:16 2015
@@ -114,8 +114,8 @@ public class InvitationManager implement
String invitorName = owner.getFirstname() + " " + owner.getLastname();
String template = InvitationTemplate.getEmail(i.getInvitee().getLanguageId(), invitorName, message, invitation_link);
- String email = i.getInvitee().getAdresses().getEmail();
- String replyToEmail = owner.getAdresses().getEmail();
+ String email = i.getInvitee().getAddress().getEmail();
+ String replyToEmail = owner.getAddress().getEmail();
if (ical) {
String username = i.getInvitee().getLogin();
@@ -158,11 +158,11 @@ public class InvitationManager implement
* @param subject
* @return
*/
- public boolean sendInvitationReminderSMS(String phone, String subject, long language_id) {
+ public boolean sendInvitationReminderSMS(String phone, String subject, long languageId) {
if (!Strings.isEmpty(phone)) {
log.debug("sendInvitationReminderSMS to " + phone + ": " + subject);
try {
- return smsHandler.sendSMS(phone, subject, language_id);
+ return smsHandler.sendSMS(phone, subject, languageId);
} catch (Exception e) {
log.error("sendInvitationReminderSMS", e);
}
@@ -259,10 +259,6 @@ public class InvitationManager implement
if (obj instanceof Invitation) {
Invitation invitation = (Invitation) obj;
- // log.debug("invitationId "+invitation.getInvitations_id());
- // log.debug("pass "+pass);
- // log.debug("getInvitationpass "+invitation.getInvitationpass());
-
if (ManageCryptStyle.getInstanceOfCrypt().verifyPassword(pass, invitation.getPassword())) {
return new Long(1);
} else {
@@ -319,7 +315,7 @@ public class InvitationManager implement
public Invitation getInvitation(Invitation _invitation, User inveetee, Room room
, boolean isPasswordProtected, String invitationpass, Valid valid,
- User createdBy, Long language_id, Date gmtTimeStart, Date gmtTimeEnd
+ User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd
, Appointment appointment) {
Invitation invitation = _invitation;
@@ -358,8 +354,8 @@ public class InvitationManager implement
invitation.setInvitedBy(createdBy);
invitation.setInvitee(inveetee);
- if (language_id != null && Type.contact == invitation.getInvitee().getType()) {
- invitation.getInvitee().setLanguageId(language_id);
+ if (languageId != null && Type.contact == invitation.getInvitee().getType()) {
+ invitation.getInvitee().setLanguageId(languageId);
}
invitation.setRoom(room);
invitation.setInserted(new Date());
@@ -387,10 +383,10 @@ public class InvitationManager implement
* @return
*/
public Invitation getInvitation(User inveetee, Room room, boolean isPasswordProtected, String invitationpass, Valid valid,
- User createdBy, Long language_id, Date gmtTimeStart, Date gmtTimeEnd, Appointment appointment)
+ User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd, Appointment appointment)
{
Invitation i = getInvitation((Invitation)null, inveetee, room, isPasswordProtected, invitationpass, valid, createdBy
- , language_id, gmtTimeStart, gmtTimeEnd, appointment);
+ , languageId, gmtTimeStart, gmtTimeEnd, appointment);
i = invitationDao.update(i);
return i;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java Wed Jun 3 10:59:16 2015
@@ -150,7 +150,7 @@ public class UserManager implements IUse
if (sessionData != null) {
- User u = usersDao.get(sessionData.getUser_id());
+ User u = usersDao.get(sessionData.getUserId());
sessiondataDao.updateUserWithoutSession(SID, u.getId());
@@ -163,16 +163,16 @@ public class UserManager implements IUse
return null;
}
- public Long logout(String SID, long USER_ID) {
+ public Long logout(String SID, long userId) {
sessiondataDao.updateUser(SID, 0, false, null);
return -12L;
}
- public List<Userdata> getUserdataDashBoard(Long user_id) {
- if (user_id != null && user_id.longValue() > 0) {
+ public List<Userdata> getUserdataDashBoard(Long userId) {
+ if (userId != null && userId.longValue() > 0) {
try {
- TypedQuery<Userdata> query = em.createQuery("select c from Userdata as c where c.user_id = :user_id AND c.deleted = false", Userdata.class);
- query.setParameter("user_id", user_id);
+ TypedQuery<Userdata> query = em.createQuery("select c from Userdata as c where c.userId = :userId AND c.deleted = false", Userdata.class);
+ query.setParameter("userId", userId);
List<Userdata> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
@@ -182,13 +182,13 @@ public class UserManager implements IUse
return null;
}
- public Userdata getUserdataByKey(Long user_id, String DATA_KEY) {
+ public Userdata getUserdataByKey(Long userId, String key) {
Userdata userdata = new Userdata();
- if (user_id != null && user_id.longValue() > 0) {
+ if (userId != null && userId.longValue() > 0) {
try {
- TypedQuery<Userdata> query = em.createQuery("select c from Userdata as c where c.user_id = :user_id AND c.data_key = :data_key AND c.deleted = false", Userdata.class);
- query.setParameter("user_id", user_id);
- query.setParameter("data_key", DATA_KEY);
+ TypedQuery<Userdata> query = em.createQuery("select c from Userdata as c where c.userId = :userId AND c.key = :key AND c.deleted = false", Userdata.class);
+ query.setParameter("userId", userId);
+ query.setParameter("key", key);
for (Iterator<Userdata> it2 = query.getResultList().iterator(); it2.hasNext();) {
userdata = it2.next();
}
@@ -196,23 +196,23 @@ public class UserManager implements IUse
log.error("getUserdataByKey", ex2);
}
} else {
- userdata.setComment("Error: No USER_ID given");
+ userdata.setComment("Error: No user id given");
}
return userdata;
}
- public String updateUserdata(int DATA_ID, long USER_ID, String DATA_KEY,
- String DATA, String Comment) {
+ public String updateUserdata(int dataId, long userId, String key,
+ String data, String comment) {
String res = "Fehler beim Update";
try {
- String hqlUpdate = "update userdata set DATA_KEY= :DATA_KEY, USER_ID = :USER_ID, DATA = :DATA, updatetime = :updatetime, comment = :Comment where DATA_ID= :DATA_ID";
+ String hqlUpdate = "update userdata set key= :key, userId = :userId, data = :data, updated = :updated, comment = :comment where id= :id";
int updatedEntities = em.createQuery(hqlUpdate)
- .setParameter("DATA_KEY", DATA_KEY)
- .setParameter("USER_ID", USER_ID)
- .setParameter("DATA", DATA)
- .setParameter("updatetime", -1L)
- .setParameter("Comment", Comment)
- .setParameter("DATA_ID", DATA_ID).executeUpdate();
+ .setParameter("key", key)
+ .setParameter("userId", userId)
+ .setParameter("data", data)
+ .setParameter("updated", -1L)
+ .setParameter("comment", comment)
+ .setParameter("id", dataId).executeUpdate();
res = "Success" + updatedEntities;
} catch (Exception ex2) {
log.error("updateUserdata", ex2);
@@ -220,18 +220,17 @@ public class UserManager implements IUse
return res;
}
- public String updateUserdataByKey(Long USER_ID, String DATA_KEY,
- String DATA, String Comment) {
+ public String updateUserdataByKey(Long userId, String key, String data, String comment) {
String res = "Fehler beim Update";
try {
- String hqlUpdate = "UPDATE Userdata set data = :data, updatetime = :updatetime, "
- + "comment = :comment where user_id= :user_id AND data_key = :data_key";
+ String hqlUpdate = "UPDATE Userdata set data = :data, updated = :updated, "
+ + "comment = :comment where userId= :userId AND key = :key";
int updatedEntities = em.createQuery(hqlUpdate)
- .setParameter("data", DATA)
- .setParameter("updatetime", -1L)
- .setParameter("comment", Comment)
- .setParameter("user_id", USER_ID)
- .setParameter("data_key", DATA_KEY).executeUpdate();
+ .setParameter("data", data)
+ .setParameter("updated", -1L)
+ .setParameter("comment", comment)
+ .setParameter("userId", userId)
+ .setParameter("key", key).executeUpdate();
res = "Success" + updatedEntities;
} catch (Exception ex2) {
log.error("updateUserdataByKey", ex2);
@@ -239,16 +238,15 @@ public class UserManager implements IUse
return res;
}
- public String addUserdata(long USER_ID, String DATA_KEY, String DATA,
- String Comment) {
+ public String addUserdata(long userId, String key, String data, String comment) {
String ret = "Fehler beim speichern der Userdata";
Userdata userdata = new Userdata();
- userdata.setData_key(DATA_KEY);
- userdata.setData(DATA);
- userdata.setStarttime(new Date());
- userdata.setUpdatetime(null);
- userdata.setComment(Comment);
- userdata.setUser_id(USER_ID);
+ userdata.setKey(key);
+ userdata.setData(data);
+ userdata.setInserted(new Date());
+ userdata.setUpdated(null);
+ userdata.setComment(comment);
+ userdata.setUserId(userId);
userdata.setDeleted(false);
try {
em.merge(userdata);
@@ -278,15 +276,15 @@ public class UserManager implements IUse
* @param additionalname
* @param fax
* @param zip
- * @param states_id
+ * @param stateId
* @param town
- * @param language_id
+ * @param languageId
* @return
*/
public Long registerUser(String login, String Userpass, String lastname,
String firstname, String email, Date age, String street,
- String additionalname, String fax, String zip, long states_id,
- String town, long language_id, String phone, boolean sendSMS, boolean generateSipUserData, String jNameTimeZone) {
+ String additionalname, String fax, String zip, long stateId,
+ String town, long languageId, String phone, boolean sendSMS, boolean generateSipUserData, String jNameTimeZone) {
String baseURL = configurationDao.getBaseUrl();
boolean sendConfirmation = baseURL != null
@@ -294,25 +292,25 @@ public class UserManager implements IUse
&& 1 == configurationDao.getConfValue("sendEmailWithVerficationCode", Integer.class, "0");
return registerUser(login, Userpass, lastname, firstname, email, age,
- street, additionalname, fax, zip, states_id, town, language_id,
+ street, additionalname, fax, zip, stateId, town, languageId,
phone, sendSMS, generateSipUserData, jNameTimeZone, sendConfirmation);
}
public Long registerUserNoEmail(String login, String Userpass,
String lastname, String firstname, String email, Date age,
String street, String additionalname, String fax, String zip,
- long states_id, String town, long language_id, String phone, boolean sendSMS,
+ long stateId, String town, long languageId, String phone, boolean sendSMS,
boolean generateSipUserData, String jNameTimeZone) {
return registerUser(login, Userpass, lastname, firstname, email, age,
- street, additionalname, fax, zip, states_id, town, language_id,
+ street, additionalname, fax, zip, stateId, town, languageId,
phone, sendSMS, generateSipUserData, jNameTimeZone, false);
}
private Long registerUser(String login, String Userpass, String lastname,
String firstname, String email, Date age, String street,
- String additionalname, String fax, String zip, long states_id,
- String town, long language_id, String phone, boolean sendSMS,
+ String additionalname, String fax, String zip, long stateId,
+ String town, long languageId, String phone, boolean sendSMS,
boolean generateSipUserData, String jNameTimeZone, Boolean sendConfirmation) {
try {
// Checks if FrontEndUsers can register
@@ -320,17 +318,17 @@ public class UserManager implements IUse
// TODO: Read and generate SIP-Data via RPC-Interface Issue 1098
- Long user_id = registerUserInit(UserDao.getDefaultRights(), login,
+ Long userId = registerUserInit(UserDao.getDefaultRights(), login,
Userpass, lastname, firstname, email, age, street,
- additionalname, fax, zip, states_id, town, language_id,
+ additionalname, fax, zip, stateId, town, languageId,
true, Arrays.asList(configurationDao.getConfValue(CONFIG_DEFAULT_GROUP_ID, Long.class, null)), phone,
sendSMS, sendConfirmation, timezoneUtil.getTimeZone(jNameTimeZone), false, "", "", false, true, null);
- if (user_id > 0 && sendConfirmation) {
+ if (userId > 0 && sendConfirmation) {
return -40L;
}
- return user_id;
+ return userId;
}
} catch (Exception e) {
log.error("[registerUser]", e);
@@ -352,9 +350,9 @@ public class UserManager implements IUse
* @param additionalname
* @param fax
* @param zip
- * @param states_id
+ * @param stateId
* @param town
- * @param language_id
+ * @param languageId
* @param sendWelcomeMessage
* @param organisations
* @param phone
@@ -373,8 +371,8 @@ public class UserManager implements IUse
*/
public Long registerUserInit(Set<Right> rights, String login, String password, String lastname,
String firstname, String email, Date age, String street,
- String additionalname, String fax, String zip, long states_id,
- String town, long language_id, boolean sendWelcomeMessage,
+ String additionalname, String fax, String zip, long stateId,
+ String town, long languageId, boolean sendWelcomeMessage,
List<Long> organisations, String phone, boolean sendSMS, Boolean sendConfirmation,
TimeZone timezone, Boolean forceTimeZoneCheck,
String userOffers, String userSearchs, Boolean showContactData,
@@ -401,7 +399,7 @@ public class UserManager implements IUse
if (!sendMail.equals("success"))
return -19L;
}
- Address adr = usersDao.getAddress(street, zip, town, states_id, additionalname, fax, phone, email);
+ Address adr = usersDao.getAddress(street, zip, town, stateId, additionalname, fax, phone, email);
// If this user needs first to click his E-Mail verification
// code then set the status to 0
@@ -413,7 +411,7 @@ public class UserManager implements IUse
for (Long id : organisations) {
orgList.add(new OrganisationUser(orgDao.get(id)));
}
- User u = usersDao.addUser(rights, firstname, login, lastname, language_id,
+ User u = usersDao.addUser(rights, firstname, login, lastname, languageId,
password, adr, sendSMS, age, hash, timezone,
forceTimeZoneCheck, userOffers, userSearchs, showContactData,
showContactDataToContacts, null, null, orgList, null);
@@ -422,12 +420,6 @@ public class UserManager implements IUse
}
log.debug("Added user-Id " + u.getId());
- /*
- * Long adress_emails_id =
- * emailManagement.registerEmail(email, address_id,""); if
- * (adress_emails_id==null) { return new Long(-112); }
- */
-
if (adr.getId() > 0 && u.getId() > 0) {
return u.getId();
} else {
@@ -463,8 +455,8 @@ public class UserManager implements IUse
return true;
}
String scopeName = "hibernate";
- if (rcl.getRoom_id() != null) {
- scopeName = rcl.getRoom_id().toString();
+ if (rcl.getRoomId() != null) {
+ scopeName = rcl.getRoomId().toString();
}
IScope currentScope = scopeApplicationAdapter
.getRoomScope(scopeName);
@@ -488,10 +480,10 @@ public class UserManager implements IUse
public Boolean kickUserByPublicSID(String SID, String publicSID) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.checkSession(SID);
// admins only
- if (AuthLevelUtil.hasWebServiceLevel(usersDao.getRights(users_id))) {
+ if (AuthLevelUtil.hasWebServiceLevel(usersDao.getRights(userId))) {
Client rcl = sessionManager
.getClientByPublicSID(publicSID, false, null);
@@ -501,8 +493,8 @@ public class UserManager implements IUse
}
String scopeName = "hibernate";
- if (rcl.getRoom_id() != null) {
- scopeName = rcl.getRoom_id().toString();
+ if (rcl.getRoomId() != null) {
+ scopeName = rcl.getRoomId().toString();
}
IScope currentScope = scopeApplicationAdapter
.getRoomScope(scopeName);
Modified: openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java Wed Jun 3 10:59:16 2015
@@ -118,8 +118,8 @@ public class OmFileHelper {
return getDir(getUploadProfilesDir(), profilesPrefix + userId);
}
- public static File getUploadProfilesUserDir(String users_id) {
- return getDir(getUploadProfilesDir(), profilesPrefix + users_id);
+ public static File getUploadProfilesUserDir(String userId) {
+ return getDir(getUploadProfilesDir(), profilesPrefix + userId);
}
public static File getDefaultProfilePicture() {
@@ -166,8 +166,8 @@ public class OmFileHelper {
return getDir(getUploadTempDir(), PROFILES_DIR);
}
- public static File getUploadTempProfilesUserDir(Long users_id) {
- return getDir(getUploadTempProfilesDir(), OmFileHelper.profilesPrefix + users_id);
+ public static File getUploadTempProfilesUserDir(Long userId) {
+ return getDir(getUploadTempProfilesDir(), OmFileHelper.profilesPrefix + userId);
}
public static File getUploadTempRoomDir(String roomName) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java Wed Jun 3 10:59:16 2015
@@ -60,7 +60,7 @@ public class ConfigForm extends AdminBas
super(id, new CompoundPropertyModel<Configuration>(configuration));
setOutputMarkupId(true);
this.listContainer = listContainer;
- add(new RequiredTextField<String>("conf_key").setLabel(Model.of(Application.getString(267))).add(new IValidator<String>(){
+ add(new RequiredTextField<String>("key").setLabel(Model.of(Application.getString(267))).add(new IValidator<String>(){
private static final long serialVersionUID = 1L;
public void validate(IValidatable<String> validatable) {
@@ -70,8 +70,8 @@ public class ConfigForm extends AdminBas
}
}
}));
- add(new TextField<String>("conf_value").setLabel(Model.of(Application.getString(271))));
- add(forDatePattern("updatetime", WEB_DATE_PATTERN));
+ add(new TextField<String>("value").setLabel(Model.of(Application.getString(271))));
+ add(forDatePattern("updated", WEB_DATE_PATTERN));
add(new Label("user.login"));
add(new TextArea<String>("comment"));
@@ -83,7 +83,7 @@ public class ConfigForm extends AdminBas
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
- Configuration c = cfgDao.forceGet(getModelObject().getConf_key());
+ Configuration c = cfgDao.forceGet(getModelObject().getKey());
if (c != null && c.isDeleted() && !c.getId().equals(getModelObject().getId())) {
getModelObject().setId(c.getId());
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html Wed Jun 3 10:59:16 2015
@@ -46,8 +46,8 @@
<tbody wicket:id="listContainer" >
<tr wicket:id="configList">
<td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="id"></span></div></td>
- <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="conf_key"></span></div></td>
- <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="conf_value"></span></div></td>
+ <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="key"></span></div></td>
+ <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="value"></span></div></td>
</tr>
</tbody>
</table>
@@ -60,13 +60,13 @@
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="266" /></legend>
<div class="formelement">
- <label><wicket:message key="267" /></label><input type="text" wicket:id="conf_key"/>
+ <label><wicket:message key="267" /></label><input type="text" wicket:id="key"/>
</div>
<div class="formelement">
- <label><wicket:message key="271" /></label><input type="text" wicket:id="conf_value"/>
+ <label><wicket:message key="271" /></label><input type="text" wicket:id="value"/>
</div>
<div class="formelement">
- <label><wicket:message key="268" /></label><span wicket:id="updatetime"/>
+ <label><wicket:message key="268" /></label><span wicket:id="updated"/>
</div>
<div class="formelement">
<label><wicket:message key="269" /></label><span wicket:id="user.login"/>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Wed Jun 3 10:59:16 2015
@@ -61,8 +61,8 @@ public class ConfigsPanel extends AdminP
protected void populateItem(final Item<Configuration> item) {
final Configuration c = item.getModelObject();
item.add(new Label("id", c.getId()));
- item.add(new Label("conf_key", c.getConf_key()));
- item.add(new Label("conf_value", c.getConf_value()));
+ item.add(new Label("key", c.getKey()));
+ item.add(new Label("value", c.getValue()));
item.add(new AjaxEventBehavior("onclick") {
private static final long serialVersionUID = 1L;
@@ -87,9 +87,9 @@ public class ConfigsPanel extends AdminP
}
};
DataViewContainer<Configuration> container = new DataViewContainer<Configuration>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<Configuration>("orderById", "configuration_id", container))
- .addLink(new OmOrderByBorder<Configuration>("orderByKey", "conf_key", container))
- .addLink(new OmOrderByBorder<Configuration>("orderByValue", "conf_value", container));
+ container.addLink(new OmOrderByBorder<Configuration>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<Configuration>("orderByKey", "key", container))
+ .addLink(new OmOrderByBorder<Configuration>("orderByValue", "value", container));
add(container.getLinks());
add(navigator);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Wed Jun 3 10:59:16 2015
@@ -59,8 +59,7 @@ import com.googlecode.wicket.jquery.ui.f
import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
/**
- * Language Editor, add/insert/update {@link Fieldlanguagesvalues} and
- * add/delete {@link FieldLanguage} contains several Forms and one list
+ * Language Editor, add/insert/update Label and add/delete language contains several Forms and one list
*
* @author solomax, swagner
*