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/11/10 03:59:28 UTC
svn commit: r1713575 [2/7] - in /openmeetings: branches/3.1.x/
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
branches/3.1.x/ope...
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java Tue Nov 10 02:59:26 2015
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.basic;
-import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -37,21 +36,22 @@ import javax.persistence.OrderBy;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
@Entity
@NamedQueries({
@NamedQuery(name = "getNavigation", query = "SELECT DISTINCT ng from Naviglobal ng JOIN ng.mainnavi nm "
- + "WHERE nm.deleted = false AND ng.level_id <= :level_id AND nm.level_id <= :level_id "
+ + "WHERE nm.deleted = false AND ng.levelId <= :levelId AND nm.levelId <= :levelId "
+ "AND ng.deleted = false ORDER BY ng.naviorder ASC"),
- @NamedQuery(name = "getNavigationById", query = "SELECT ng from Naviglobal ng WHERE ng.global_id = :global_id") })
+ @NamedQuery(name = "getNavigationById", query = "SELECT ng from Naviglobal ng WHERE ng.id = :id") })
@Table(name = "naviglobal")
-public class Naviglobal implements Serializable {
+public class Naviglobal implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- private Long global_id;
+ private Long id;
@Column(name = "name")
private String name;
@@ -68,29 +68,29 @@ public class Naviglobal implements Seria
@Column(name = "action")
private String action;
- @Column(name = "updatetime")
- private Date updatetime;
+ @Column(name = "updated")
+ private Date updated;
- @Column(name = "starttime")
- private Date starttime;
+ @Column(name = "inserted")
+ private Date inserted;
- @Column(name = "comment_field")
+ @Column(name = "comment")
private String comment;
@Column(name = "naviorder")
private Integer naviorder;
@Column(name = "level_id")
- private Long level_id;
+ private Long levelId;
@Column(name = "deleted")
private boolean deleted;
- @Column(name = "fieldvalues_id")
- private Long fieldvalues_id;
+ @Column(name = "label_id")
+ private Long labelId;
- @Column(name = "tooltip_fieldvalues_id")
- private Long tooltip_fieldvalues_id;
+ @Column(name = "tooltip_label_id")
+ private Long tooltipLabelId;
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "global_id")
@@ -98,6 +98,14 @@ public class Naviglobal implements Seria
@OrderBy("naviorder")
private List<Navimain> mainnavi;
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
public String getAction() {
return action;
}
@@ -114,14 +122,6 @@ public class Naviglobal implements Seria
this.comment = comment;
}
- public Long getGlobal_id() {
- return global_id;
- }
-
- public void setGlobal_id(Long global_id) {
- this.global_id = global_id;
- }
-
public String getIcon() {
return icon;
}
@@ -146,23 +146,23 @@ public class Naviglobal implements Seria
this.isopen = isopen;
}
- 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 getDeleted() {
+ public boolean isDeleted() {
return deleted;
}
@@ -186,12 +186,12 @@ public class Naviglobal implements Seria
this.naviorder = naviorder;
}
- public Long getLevel_id() {
- return level_id;
+ public Long getLevelId() {
+ return levelId;
}
- public void setLevel_id(Long level_id) {
- this.level_id = level_id;
+ public void setLevelId(Long levelId) {
+ this.levelId = levelId;
}
public List<Navimain> getMainnavi() {
@@ -202,26 +202,26 @@ public class Naviglobal implements Seria
this.mainnavi = mainnavi;
}
- 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;
}
- public Long getTooltip_fieldvalues_id() {
- return tooltip_fieldvalues_id;
+ public Long getTooltipLabelId() {
+ return tooltipLabelId;
}
- public void setTooltip_fieldvalues_id(Long tooltip_fieldvalues_id) {
- this.tooltip_fieldvalues_id = tooltip_fieldvalues_id;
+ public void setTooltipLabelId(Long tooltipLabelId) {
+ this.tooltipLabelId = tooltipLabelId;
}
@Override
public String toString() {
- return "Naviglobal [global_id=" + global_id + ", name=" + name + ", action=" + action + ", naviorder=" + naviorder + ", deleted="
- + deleted + ", fieldvalues_id=" + fieldvalues_id + ", tooltip_fieldvalues_id=" + tooltip_fieldvalues_id + "]";
+ return "Naviglobal [id=" + id + ", name=" + name + ", action=" + action + ", naviorder=" + naviorder + ", deleted="
+ + deleted + ", labelId=" + labelId + ", tooltipLabelId=" + tooltipLabelId + "]";
}
}
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java Tue Nov 10 02:59:26 2015
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.basic;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -28,18 +27,20 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
+
@Entity
@Table(name = "navimain")
-public class Navimain implements Serializable {
- private static final long serialVersionUID = 1691787896183701877L;
+public class Navimain implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- private Long main_id;
+ private Long id;
@Column(name = "global_id")
- private Long global_id;
+ private Long globalId;
@Column(name = "name")
private String name;
@@ -59,29 +60,37 @@ public class Navimain implements Seriali
@Column(name = "params")
private String params;
- @Column(name = "updatetime")
- private Date updatetime;
+ @Column(name = "updated")
+ private Date updated;
- @Column(name = "starttime")
- private Date starttime;
+ @Column(name = "inserted")
+ private Date inserted;
- @Column(name = "comment_field")
+ @Column(name = "comment")
private String comment;
@Column(name = "naviorder")
private Integer naviorder;
@Column(name = "level_id")
- private Long level_id;
+ private Long levelId;
- @Column(name = "fieldvalues_id")
- private Long fieldvalues_id;
+ @Column(name = "label_id")
+ private Long labelId;
@Column(name = "deleted")
private boolean deleted;
- @Column(name = "tooltip_fieldvalues_id")
- private Long tooltip_fieldvalues_id;
+ @Column(name = "tooltip_label_id")
+ private Long tooltipLabelId;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
public String getAction() {
return action;
@@ -91,20 +100,20 @@ public class Navimain implements Seriali
this.action = action;
}
- public Long getLevel_id() {
- return level_id;
+ public Long getLevelId() {
+ return levelId;
}
- public void setLevel_id(Long level_id) {
- this.level_id = level_id;
+ public void setLevelId(Long levelId) {
+ this.levelId = levelId;
}
- public Long getGlobal_id() {
- return global_id;
+ public Long getGlobalId() {
+ return globalId;
}
- public void setGlobal_id(Long global_id) {
- this.global_id = global_id;
+ public void setGlobalId(Long globalId) {
+ this.globalId = globalId;
}
public String getComment() {
@@ -115,14 +124,6 @@ public class Navimain implements Seriali
this.comment = comment;
}
- public Long getMain_id() {
- return main_id;
- }
-
- public void setMain_id(Long main_id) {
- this.main_id = main_id;
- }
-
public String getIcon() {
return icon;
}
@@ -147,23 +148,23 @@ public class Navimain implements Seriali
this.isopen = isopen;
}
- 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 getDeleted() {
+ public boolean isDeleted() {
return deleted;
}
@@ -187,20 +188,20 @@ public class Navimain implements Seriali
this.naviorder = naviorder;
}
- 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;
}
- public Long getTooltip_fieldvalues_id() {
- return tooltip_fieldvalues_id;
+ public Long getTooltipLabelId() {
+ return tooltipLabelId;
}
- public void setTooltip_fieldvalues_id(Long tooltip_fieldvalues_id) {
- this.tooltip_fieldvalues_id = tooltip_fieldvalues_id;
+ public void setTooltipLabelId(Long tooltipLabelId) {
+ this.tooltipLabelId = tooltipLabelId;
}
public String getParams() {
@@ -213,8 +214,8 @@ public class Navimain implements Seriali
@Override
public String toString() {
- return "Navimain [main_id=" + main_id + ", global_id=" + global_id + ", name=" + name + ", action=" + action + ", params=" + params
- + ", naviorder=" + naviorder + ", fieldvalues_id=" + fieldvalues_id + ", deleted=" + deleted + ", tooltip_fieldvalues_id="
- + tooltip_fieldvalues_id + "]";
+ return "Navimain [id=" + id + ", globalId=" + globalId + ", name=" + name + ", action=" + action + ", params=" + params
+ + ", naviorder=" + naviorder + ", labelId=" + labelId + ", deleted=" + deleted + ", tooltipLabelId="
+ + tooltipLabelId + "]";
}
}
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java Tue Nov 10 02:59:26 2015
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.calendar;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.CascadeType;
@@ -35,13 +34,14 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.room.Invitation;
import org.apache.openmeetings.db.entity.user.User;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
-@Table(name = "meeting_members")
+@Table(name = "meeting_member")
@NamedQueries({
@NamedQuery(name="getMeetingMemberById"
, query="SELECT mm FROM MeetingMember mm WHERE mm.deleted = false AND mm.id = :id")
@@ -50,8 +50,8 @@ import org.simpleframework.xml.Root;
, query="SELECT mm.id FROM MeetingMember mm WHERE mm.deleted = false AND mm.appointment.id = :id")
})
@Root(name = "meetingmember")
-public class MeetingMember implements Serializable {
- private static final long serialVersionUID = -3864571325368787524L;
+public class MeetingMember implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@@ -74,10 +74,10 @@ public class MeetingMember implements Se
@Element(data = true, required = false)
private String appointmentStatus; // status of the appointment denial, acceptance, wait.
- @Column(name = "starttime")
+ @Column(name = "inserted")
private Date inserted;
- @Column(name = "updatetime")
+ @Column(name = "updated")
private Date updated;
@Column(name = "deleted")
@@ -132,7 +132,7 @@ public class MeetingMember implements Se
this.invitation = invitation;
}
- public Date getStarttime() {
+ public Date getInserted() {
return inserted;
}
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java Tue Nov 10 02:59:26 2015
@@ -183,13 +183,13 @@ public class Client implements IDataProv
* @see Client#isScreenClient()
*/
@Column(name = "is_screenclient")
- private boolean isScreenClient = false;
+ private boolean isScreenClient;
/**
* @see Client#isAvClient()
*/
@Column(name = "is_avclient")
- private boolean isAVClient = false;
+ private boolean isAVClient;
/**
* @see Client#getUsercolor()
@@ -216,7 +216,7 @@ public class Client implements IDataProv
private int userport;
/**
- * @see Client#getRoom_id()
+ * @see Client#getRoomId()
*/
@Column(name = "room_id")
private Long room_id;
@@ -234,7 +234,7 @@ public class Client implements IDataProv
private long broadCastID = -2;
/**
- * @see Client#getUser_id()
+ * @see Client#getUserId()
*/
@Column(name = "user_id")
private Long user_id = null;
@@ -307,15 +307,15 @@ public class Client implements IDataProv
private String roomRecordingName;
/**
- * @see Client#getFlvRecordingId()
+ * @see Client#getRecordingId()
*/
- @Column(name = "flvrecording_id")
+ @Column(name = "recording_id")
private Long flvRecordingId;
/**
- * @see Client#getFlvRecordingMetaDataId()
+ * @see Client#getRecordingMetaDataId()
*/
- @Column(name = "flvrecordingmetadata_id")
+ @Column(name = "recording_metadata_id")
private Long flvRecordingMetaDataId;
/**
@@ -405,14 +405,14 @@ public class Client implements IDataProv
public Client() {}
- public Client(String streamid, String publicSID, Long room_id,
- Long user_id, String firstname, String lastname, boolean avClient,
+ public Client(String streamid, String publicSID, Long roomId,
+ Long userId, String firstname, String lastname, boolean avClient,
String username, String connectedSince, String scope) {
super();
this.streamid = streamid;
this.publicSID = publicSID;
- this.room_id = room_id;
- this.user_id = user_id;
+ this.room_id = roomId;
+ this.user_id = userId;
this.firstname = firstname;
this.lastname = lastname;
this.isAVClient = avClient;
@@ -421,8 +421,8 @@ public class Client implements IDataProv
this.scope = scope;
}
- public void setUserObject(Long user_id, String username, String firstname, String lastname) {
- this.user_id = user_id;
+ public void setUserObject(Long userId, String username, String firstname, String lastname) {
+ this.user_id = userId;
this.username = username;
this.firstname = firstname;
this.lastname = lastname;
@@ -586,20 +586,20 @@ public class Client implements IDataProv
this.picture_uri = picture_uri;
}
- public Long getUser_id() {
+ public Long getUserId() {
return user_id;
}
- public void setUser_id(Long user_id) {
- this.user_id = user_id;
+ public void setUserId(Long userId) {
+ this.user_id = userId;
}
- public Long getRoom_id() {
+ public Long getRoomId() {
return room_id;
}
- public void setRoom_id(Long room_id) {
- this.room_id = room_id;
+ public void setRoomId(Long roomId) {
+ this.room_id = roomId;
}
public Date getRoomEnter() {
@@ -762,20 +762,20 @@ public class Client implements IDataProv
this.streamPublishName = streamPublishName;
}
- public Long getFlvRecordingId() {
+ public Long getRecordingId() {
return flvRecordingId;
}
- public void setFlvRecordingId(Long flvRecordingId) {
- this.flvRecordingId = flvRecordingId;
+ public void setRecordingId(Long recordingId) {
+ this.flvRecordingId = recordingId;
}
- public Long getFlvRecordingMetaDataId() {
+ public Long getRecordingMetaDataId() {
return flvRecordingMetaDataId;
}
- public void setFlvRecordingMetaDataId(Long flvRecordingMetaDataId) {
- this.flvRecordingMetaDataId = flvRecordingMetaDataId;
+ public void setRecordingMetaDataId(Long recordingMetaDataId) {
+ this.flvRecordingMetaDataId = recordingMetaDataId;
}
public boolean isScreenPublishStarted() {
@@ -893,9 +893,9 @@ public class Client implements IDataProv
@Override
public String toString() {
return "Client [streamid=" + streamid + ", publicSID=" + publicSID + ", isScreenClient=" + isScreenClient
- + ", isAVClient=" + isAVClient + ", isMobile = " + mobile + ", room_id=" + room_id + ", broadCastID=" + broadCastID + ", user_id="
- + user_id + ", avsettings=" + avsettings + ", isRecording=" + isRecording + ", flvRecordingId="
- + flvRecordingId + ", flvRecordingMetaDataId=" + flvRecordingMetaDataId + ", screenPublishStarted="
+ + ", avClient=" + isAVClient + ", isMobile = " + mobile + ", roomId=" + room_id + ", broadCastID=" + broadCastID + ", userId="
+ + user_id + ", avsettings=" + avsettings + ", isRecording=" + isRecording + ", recordingId="
+ + flvRecordingId + ", recordingMetaDataId=" + flvRecordingMetaDataId + ", screenPublishStarted="
+ screenPublishStarted + ", interviewPodId=" + interviewPodId + ", server=" + server + "]";
}
}
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java Tue Nov 10 02:59:26 2015
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.room;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.CascadeType;
@@ -38,6 +37,7 @@ import javax.persistence.Table;
import javax.persistence.Transient;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.user.User;
@@ -47,9 +47,9 @@ import org.apache.openmeetings.db.entity
@NamedQuery(name = "getInvitationByHashCode", query = "SELECT i FROM Invitation i where i.hash LIKE :hashCode AND i.deleted = false"),
@NamedQuery(name = "getInvitationByAppointment", query = "SELECT i FROM Invitation i WHERE i.appointment.id = :appointmentId ")
})
-@Table(name = "invitations")
-public class Invitation implements Serializable {
- private static final long serialVersionUID = 1153321347974705506L;
+@Table(name = "invitation")
+public class Invitation implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
public enum MessageType {
Create
@@ -190,7 +190,7 @@ public class Invitation implements Seria
this.updated = updated;
}
- public boolean getDeleted() {
+ public boolean isDeleted() {
return deleted;
}
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java Tue Nov 10 02:59:26 2015
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.room;
-import java.io.Serializable;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@@ -26,6 +25,8 @@ import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
@@ -36,8 +37,10 @@ import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlType;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.user.User;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
@@ -45,79 +48,117 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name = "closePoll", query = "UPDATE RoomPoll rp SET rp.archived = :archived " +
- "WHERE rp.room.rooms_id = :rooms_id"),
- @NamedQuery(name = "deletePoll", query = "DELETE FROM RoomPoll rp WHERE rp.roomPollId = :roomPollId"),
- @NamedQuery(name = "getPoll", query = "SELECT rp FROM RoomPoll rp " +
- "WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived"),
- @NamedQuery(name = "getPollListBackup", query = "SELECT rp FROM RoomPoll rp ORDER BY rp.roomPollId"),
- @NamedQuery(name = "getArchivedPollList", query = "SELECT rp FROM RoomPoll rp " +
- "WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived"),
- @NamedQuery(name = "hasPoll", query = "SELECT COUNT(rp) FROM RoomPoll rp " +
- "WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived")
+ @NamedQuery(name = "closePoll", query = "UPDATE RoomPoll rp SET rp.archived = :archived "
+ + "WHERE rp.room.rooms_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.rooms_id = :roomId AND rp.archived = false"),
+ @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.rooms_id = :roomId AND rp.archived = true ORDER BY rp.created DESC"),
+ @NamedQuery(name = "hasPoll", query = "SELECT COUNT(rp) FROM RoomPoll rp "
+ + "WHERE rp.room.rooms_id = :roomId AND rp.archived = :archived")
})
-@Table(name = "room_polls")
-@Root(name="roompoll")
-public class RoomPoll implements Serializable {
+@Table(name = "room_poll")
+@Root(name = "roompoll")
+public class RoomPoll implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
-
+ public static final int YES_NO_TYPE_ID = 1;
+ public static final int NUMERIC_TYPE_ID = 2;
+
+ @XmlType(namespace="org.apache.openmeetings.room.poll.type")
+ public enum Type {
+ yesNo
+ , numeric;
+ private int id;
+
+ Type() {} //default;
+ Type(int id) {
+ this.id = id;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public static Type get(Long type) {
+ return get(type == null ? 1 : type.intValue());
+ }
+
+ public static Type get(Integer type) {
+ return get(type == null ? 1 : type.intValue());
+ }
+
+ public static Type get(int type) {
+ Type rt = Type.yesNo;
+ switch (type) {
+ case NUMERIC_TYPE_ID:
+ rt = Type.numeric;
+ break;
+ default:
+ //no-op
+ }
+ return rt;
+ }
+ }
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- private Long roomPollId;
+ private Long id;
- @Column(name = "poll_name")
- @Element(name="pollname", data=true, required=false)
- private String pollName;
-
- @Column(name = "poll_question")
- @Element(name="pollquestion", data=true, required=false)
- private String pollQuestion;
+ @Column(name = "name")
+ @Element(name = "pollname", data = true, required = false)
+ private String name;
+ @Column(name = "question")
+ @Element(name = "pollquestion", data = true, required = false)
+ private String question;
+
@Column(name = "created")
- @Element(data=true, required=false)
+ @Element(data = true, required = false)
private Date created;
-
+
@Column(name = "archived")
- @Element(data=true, required=false)
+ @Element(data = true, required = false)
private boolean archived;
- @OneToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "poll_type_id")
- @ForeignKey(enabled = true)
- @Element(name="polltypeid", data=true, required=false)
- private PollType pollType;
+ @Column(name = "type")
+ @Element(name = "polltypeid", data = true, required = false)
+ @Enumerated(EnumType.STRING)
+ private Type type;
@OneToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "users_id")
+ @JoinColumn(name = "user_id")
@ForeignKey(enabled = true)
- @Element(name="createdbyuserid", data=true, required=false)
- private User createdBy;
-
+ @Element(name = "createdbyuserid", data = true, required = false)
+ 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)
+ @Element(name = "roomid", data = true, required = false)
private Room room;
-
- @OneToMany(fetch = FetchType.EAGER, cascade=CascadeType.ALL)
- @JoinColumn(name = "room_poll_id")
- @ElementList(name="roompollanswers", required=false)
- private List<RoomPollAnswer> roomPollAnswerList;
+
+ @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+ @JoinColumn(name = "poll_id")
+ @ElementList(name = "roompollanswers", required = false)
+ private List<RoomPollAnswer> answers;
/**
- * @return the createdBy
+ * @return the creator
*/
- public User getCreatedBy() {
- return createdBy;
+ public User getCreator() {
+ return creator;
}
/**
- * @param createdBy
- * the createdBy to set
+ * @param creator
+ * the creator to set
*/
- public void setCreatedBy(User createdBy) {
- this.createdBy = createdBy;
+ public void setCreator(User creator) {
+ this.creator = creator;
}
/**
@@ -136,62 +177,62 @@ public class RoomPoll implements Seriali
}
/**
- * @return the pollQuestion
+ * @return the question
*/
- public String getPollQuestion() {
- return pollQuestion;
+ public String getQuestion() {
+ return question;
}
/**
- * @param pollQuestion
- * the pollQuestion to set
+ * @param question
+ * the question to set
*/
- public void setPollQuestion(String pollQuestion) {
- this.pollQuestion = pollQuestion;
+ public void setQuestion(String question) {
+ this.question = question;
}
/**
- * @return the roomPollAnswerList
+ * @return the answers
*/
- public List<RoomPollAnswer> getRoomPollAnswerList() {
- if (roomPollAnswerList == null) {
- roomPollAnswerList = new LinkedList<RoomPollAnswer>();
+ public List<RoomPollAnswer> getAnswers() {
+ if (answers == null) {
+ answers = new LinkedList<RoomPollAnswer>();
}
- return roomPollAnswerList;
+ return answers;
}
/**
- * @param roomPollAnswerList
- * the roomPollAnswerList to set
+ * @param answers
+ * the answers to set
*/
- public void setRoomPollAnswerList(List<RoomPollAnswer> roomPollAnswerList) {
- this.roomPollAnswerList = roomPollAnswerList;
+ public void setAnswers(List<RoomPollAnswer> answers) {
+ this.answers = answers;
}
/**
- * @return the roomPollId
+ * @return the id
*/
- public Long getRoomPollId() {
- return roomPollId;
+ public Long getId() {
+ return id;
}
/**
- * @param roomPollId
- * the roomPollId to set
+ * @param id
+ * the id to set
*/
- public void setRoomPollId(Long roomPollId) {
- this.roomPollId = roomPollId;
+ public void setId(Long id) {
+ this.id = id;
}
/**
- * @return the pollTypeId
+ * @return the type
*/
- public PollType getPollType() {
- return pollType;
+ public Type getType() {
+ return type;
}
- public void setPollType(PollType pollType) {
- this.pollType = pollType;
+ public void setType(Type type) {
+ this.type = type;
}
public Room getRoom() {
@@ -217,17 +258,17 @@ public class RoomPoll implements Seriali
}
/**
- * @return the pollName
+ * @return the name
*/
- public String getPollName() {
- return pollName;
+ public String getName() {
+ return name;
}
/**
- * @param pollName the pollName to set
+ * @param name the name to set
*/
- public void setPollName(String pollName) {
- this.pollName = pollName;
+ public void setName(String name) {
+ this.name = name;
}
}
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java Tue Nov 10 02:59:26 2015
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.room;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -34,19 +33,19 @@ import javax.persistence.OneToOne;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.user.User;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name = "hasVoted", query = "SELECT rpa FROM RoomPollAnswers rpa "
- + "WHERE rpa.roomPoll.room.rooms_id = :room_id " +
- "AND rpa.votedUser.user_id = :userid AND rpa.roomPoll.archived = :archived")
+ @NamedQuery(name = "hasVoted", query = "SELECT rpa FROM RoomPollAnswer rpa WHERE rpa.roomPoll.room.rooms_id = :roomId "
+ + "AND rpa.votedUser.user_id = :userId AND rpa.roomPoll.archived = false")
})
@Table(name = "room_poll_answer")
@Root(name="roompollanswer")
-public class RoomPollAnswer implements Serializable {
+public class RoomPollAnswer implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
@Id
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java Tue Nov 10 02:59:26 2015
@@ -89,10 +89,7 @@ import org.simpleframework.xml.Root;
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search )"),
@NamedQuery(name = "getAllUsers", query = "SELECT u FROM User u ORDER BY u.user_id"),
- @NamedQuery(name = "checkPassword", query = "select count(c.user_id) from User c "
- + "where c.deleted = false " //
- + "AND c.user_id = :userId " //
- + "AND c.password LIKE :password"), //
+ @NamedQuery(name = "checkPassword", query = "SELECT COUNT(u) from User u WHERE u.deleted = false AND u.user_id = :userId AND u.password LIKE :password"), //
@NamedQuery(name = "updatePassword", query = "UPDATE User u SET u.password = :password WHERE u.user_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"),
@@ -213,14 +210,15 @@ public class User implements IDataProvid
@Element(data = true, required = false)
private Date regdate;
- @Column(name = "salutations_id")
+ @Column(name = "salutation")
+ @Enumerated(EnumType.STRING)
@Element(name = "title_id", data = true, required = false)
- private Long salutations_id;
+ private Salutation salutations_id;
- @Column(name = "starttime")
+ @Column(name = "inserted")
private Date starttime;
- @Column(name = "updatetime")
+ @Column(name = "updated")
private Date updatetime;
@Column(name = "pictureuri")
@@ -261,12 +259,12 @@ public class User implements IDataProvid
private AsteriskSipUser sipUser;
// Vars to simulate external Users
- @Column(name = "externalUserId")
- @Element(data = true, required = false)
+ @Column(name = "external_id")
+ @Element(name = "externalUserId", data = true, required = false)
private String externalUserId;
- @Column(name = "externalUserType")
- @Element(data = true, required = false)
+ @Column(name = "external_type")
+ @Element(name = "externalUserType", data = true, required = false)
private String externalUserType;
/**
@@ -295,11 +293,11 @@ public class User implements IDataProvid
@Element(data = true, required = false)
private String userSearchs;
- @Column(name = "show_contact_data")
+ @Column(name = "show_contact_data", nullable = false)
@Element(data = true, required = false)
private boolean showContactData;
- @Column(name = "show_contact_data_to_contacts")
+ @Column(name = "show_contact_data_to_contacts", nullable = false)
@Element(data = true, required = false)
private boolean showContactDataToContacts;
@@ -432,31 +430,31 @@ public class User implements IDataProvid
this.regdate = regdate;
}
- public Long getSalutations_id() {
+ public Salutation getSalutation() {
return salutations_id;
}
- public void setSalutations_id(Long salutations_id) {
- this.salutations_id = salutations_id;
+ public void setSalutation(Salutation salutation) {
+ this.salutations_id = salutation;
}
- public Date getStarttime() {
+ public Date getInserted() {
return starttime;
}
- public void setStarttime(Date starttime) {
- this.starttime = starttime;
+ public void setInserted(Date inserted) {
+ this.starttime = inserted;
}
- public Date getUpdatetime() {
+ public Date getUpdated() {
return updatetime;
}
- public void setUpdatetime(Date updatetime) {
- this.updatetime = updatetime;
+ public void setUpdated(Date updated) {
+ this.updatetime = updated;
}
- public boolean getDeleted() {
+ public boolean isDeleted() {
return deleted;
}
@@ -580,7 +578,7 @@ public class User implements IDataProvid
this.userSearchs = userSearchs;
}
- public boolean getShowContactData() {
+ public boolean isShowContactData() {
return showContactData;
}
@@ -588,7 +586,7 @@ public class User implements IDataProvid
this.showContactData = showContactData;
}
- public boolean getShowContactDataToContacts() {
+ public boolean isShowContactDataToContacts() {
return showContactDataToContacts;
}
@@ -637,7 +635,7 @@ public class User implements IDataProvid
return "User [id=" + user_id + ", firstname=" + firstname
+ ", lastname=" + lastname + ", login=" + login
+ ", pictureuri=" + pictureuri + ", deleted=" + deleted
- + ", language_id=" + language_id + ", address=" + address
+ + ", languageId=" + language_id + ", address=" + address
+ ", externalId=" + externalUserId + ", externalType=" + externalUserType
+ ", type=" + type + "]";
}
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java Tue Nov 10 02:59:26 2015
@@ -32,37 +32,38 @@ import javax.persistence.Table;
@Entity
@Table(name = "user_data")
public class Userdata implements Serializable {
- private static final long serialVersionUID = 8365799229794940172L;
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="id")
- private Long data_id;
-
- @Column(name="user_id")
- private Long user_id;
-
- @Column(name="data_key")
- private String data_key;
-
- @Column(name="data")
- private String data;
-
- @Column(name = "starttime")
+ @Column(name = "id")
+ private Long data_id;
+
+ @Column(name = "user_id")
+ private Long user_id;
+
+ @Column(name = "data_key")
+ private String data_key;
+
+ @Column(name = "data")
+ private String data;
+
+ @Column(name = "inserted")
private Date starttime;
-
- @Column(name = "updatetime")
+
+ @Column(name = "updated")
private Date updatetime;
-
+
@Lob
- @Column(name = "comment_field")
- private String comment;
-
+ @Column(name = "comment")
+ private String comment;
+
@Column(name = "deleted")
- private boolean deleted;
+ private boolean deleted;
public String getComment() {
return comment;
}
+
public void setComment(String comment) {
this.comment = comment;
}
@@ -70,53 +71,56 @@ public class Userdata implements Seriali
public String getData() {
return data;
}
+
public void setData(String data) {
this.data = data;
}
- public String getData_key() {
+ public String getKey() {
return data_key;
}
- public void setData_key(String data_key) {
- this.data_key = data_key;
+
+ public void setKey(String key) {
+ this.data_key = key;
}
-
- public Long getData_id() {
+
+ public Long getId() {
return data_id;
}
- public void setData_id(Long data_id) {
- this.data_id = data_id;
+
+ public void setId(Long id) {
+ this.data_id = id;
}
-
- public Date getStarttime() {
+ public Date getInserted() {
return starttime;
}
- public void setStarttime(Date starttime) {
- this.starttime = starttime;
+
+ public void setInserted(Date inserted) {
+ this.starttime = inserted;
}
-
- public Date getUpdatetime() {
+
+ public Date getUpdated() {
return updatetime;
}
- public void setUpdatetime(Date updatetime) {
- this.updatetime = updatetime;
+
+ public void setUpdated(Date updated) {
+ this.updatetime = updated;
}
-
- public boolean getDeleted() {
+
+ public boolean isDeleted() {
return deleted;
}
+
public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
- public Long getUser_id() {
+ public Long getUserId() {
return user_id;
}
- public void setUser_id(Long user_id) {
- this.user_id = user_id;
- }
-
-
+ public void setUserId(Long userId) {
+ this.user_id = userId;
+ }
}
Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java Tue Nov 10 02:59:26 2015
@@ -61,7 +61,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
import org.apache.openmeetings.db.entity.record.Recording;
-import org.apache.openmeetings.db.entity.room.PollType;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.apache.openmeetings.db.entity.server.LdapConfig;
@@ -135,7 +134,7 @@ public class BackupExport {
@Autowired
private RoomDao roomDao;
@Autowired
- private RoomGroupDao roomOrganisationDao;
+ private RoomGroupDao roomGroupDao;
public void performExport(File filePath, File backup_dir, boolean includeFiles, ProgressHolder progressHolder) throws Exception {
if (!backup_dir.exists()) {
@@ -145,7 +144,7 @@ public class BackupExport {
progressHolder.setProgress(0);
/*
- * ##################### Backup Organizations
+ * ##################### Backup Groups
*/
writeList(simpleSerializer, backup_dir, "organizations.xml",
"organisations", organisationDao.get(0, Integer.MAX_VALUE));
@@ -172,7 +171,7 @@ public class BackupExport {
}
/*
- * ##################### Backup Room Organizations
+ * ##################### Backup Room Groups
*/
{
Registry registry = new Registry();
@@ -182,7 +181,7 @@ public class BackupExport {
registry.bind(Organisation.class, OrganisationConverter.class);
registry.bind(Room.class, RoomConverter.class);
- writeList(serializer, backup_dir, "rooms_organisation.xml", "room_organisations", roomOrganisationDao.get());
+ writeList(serializer, backup_dir, "rooms_organisation.xml", "room_organisations", roomGroupDao.get());
progressHolder.setProgress(20);
}
@@ -317,8 +316,7 @@ public class BackupExport {
registry.bind(list.get(0).getInserted().getClass(), DateConverter.class);
}
- writeList(serializer, backup_dir, "flvRecordings.xml",
- "flvrecordings", list);
+ writeList(serializer, backup_dir, "flvRecordings.xml", "flvrecordings", list);
progressHolder.setProgress(70);
}
@@ -326,14 +324,14 @@ public class BackupExport {
* ##################### Polls
*/
{
- List<RoomPoll> list = pollManager.getPollListBackup();
+ List<RoomPoll> list = pollManager.get();
Registry registry = new Registry();
Strategy strategy = new RegistryStrategy(registry);
Serializer serializer = new Persister(strategy);
registry.bind(User.class, UserConverter.class);
registry.bind(Room.class, RoomConverter.class);
- registry.bind(PollType.class, PollTypeConverter.class);
+ registry.bind(RoomPoll.Type.class, PollTypeConverter.class);
if (list != null && list.size() > 0) {
registry.bind(list.get(0).getCreated().getClass(), DateConverter.class);
}
@@ -460,7 +458,7 @@ public class BackupExport {
registry.bind(State.class, StateConverter.class);
registry.bind(Salutation.class, SalutationConverter.class);
if (list != null && list.size() > 0) {
- Class<?> dateClass = list.get(0).getRegdate() != null ? list.get(0).getRegdate().getClass() : list.get(0).getStarttime().getClass();
+ Class<?> dateClass = list.get(0).getRegdate() != null ? list.get(0).getRegdate().getClass() : list.get(0).getInserted().getClass();
registry.bind(dateClass, DateConverter.class);
}
Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Tue Nov 10 02:59:26 2015
@@ -81,10 +81,9 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.record.Recording;
import org.apache.openmeetings.db.entity.record.RecordingMetaData;
-import org.apache.openmeetings.db.entity.room.PollType;
import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.db.entity.room.RoomModerator;
import org.apache.openmeetings.db.entity.room.RoomGroup;
+import org.apache.openmeetings.db.entity.room.RoomModerator;
import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.apache.openmeetings.db.entity.room.RoomPollAnswer;
import org.apache.openmeetings.db.entity.server.LdapConfig;
@@ -148,7 +147,7 @@ public class BackupImport {
@Autowired
private UserContactDao userContactDao;
@Autowired
- private PollDao pollManager;
+ private PollDao pollDao;
@Autowired
private ConfigurationDao configurationDao;
@Autowired
@@ -160,7 +159,7 @@ public class BackupImport {
@Autowired
private OAuth2Dao auth2Dao;
@Autowired
- private RoomGroupDao roomOrganisationDao;
+ private RoomGroupDao roomGroupDao;
private final Map<Long, Long> usersMap = new HashMap<Long, Long>();
private final Map<Long, Long> organisationsMap = new HashMap<Long, Long>();
@@ -253,9 +252,9 @@ public class BackupImport {
}
}
- log.info("Configs import complete, starting organization import");
+ log.info("Configs import complete, starting group import");
/*
- * ##################### Import Organizations
+ * ##################### Import Groups
*/
Serializer simpleSerializer = new Persister();
{
@@ -268,7 +267,7 @@ public class BackupImport {
}
}
- log.info("Organizations import complete, starting user import");
+ log.info("Groups import complete, starting user import");
/*
* ##################### Import Users
*/
@@ -294,7 +293,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) {
@@ -321,7 +320,7 @@ public class BackupImport {
matcher.bind(Long.class, LongTransform.class);
matcher.bind(Integer.class, IntegerTransform.class);
registry.bind(User.class, new UserConverter(userDao, usersMap));
- registry.bind(Room.Type.class, new RoomTypeConverter());
+ registry.bind(Room.Type.class, RoomTypeConverter.class);
List<Room> list = readList(serializer, f, "rooms.xml", "rooms", Room.class);
for (Room r : list) {
@@ -342,9 +341,9 @@ public class BackupImport {
}
}
- log.info("Room import complete, starting room organizations import");
+ log.info("Room import complete, starting room groups import");
/*
- * ##################### Import Room Organisations
+ * ##################### Import Room Groups
*/
{
Registry registry = new Registry();
@@ -359,12 +358,12 @@ public class BackupImport {
if (!ro.isDeleted() && ro.getRoom() != null && ro.getRoom().getId() != null && ro.getOrganisation() != null && ro.getOrganisation().getId() != null) {
// We need to reset this as openJPA reject to store them otherwise
ro.setId(null);
- roomOrganisationDao.update(ro, null);
+ roomGroupDao.update(ro, null);
}
}
}
- log.info("Room organizations import complete, starting chat messages import");
+ log.info("Room groups import complete, starting chat messages import");
/*
* ##################### Import Chat messages
*/
@@ -393,7 +392,7 @@ public class BackupImport {
Serializer serializer = new Persister(strategy);
registry.bind(User.class, new UserConverter(userDao, usersMap));
- registry.bind(Appointment.Reminder.class, new AppointmentReminderTypeConverter());
+ registry.bind(Appointment.Reminder.class, AppointmentReminderTypeConverter.class);
registry.bind(Room.class, new RoomConverter(roomDao, roomsMap));
registry.bind(Date.class, DateConverter.class);
@@ -613,24 +612,25 @@ public class BackupImport {
matcher.bind(Integer.class, IntegerTransform.class);
registry.bind(User.class, new UserConverter(userDao, usersMap));
registry.bind(Room.class, new RoomConverter(roomDao, roomsMap));
- registry.bind(PollType.class, new PollTypeConverter(pollManager));
+ registry.bind(RoomPoll.Type.class, PollTypeConverter.class);
registry.bind(Date.class, DateConverter.class);
List<RoomPoll> list = readList(serializer, f, "roompolls.xml", "roompolls", RoomPoll.class, true);
for (RoomPoll rp : list) {
+ rp.setId(null);
if (rp.getRoom() == null || rp.getRoom().getId() == null) {
//room was deleted
continue;
}
- if (rp.getCreatedBy() == null || rp.getCreatedBy().getId() == null) {
- rp.setCreatedBy(null);
+ if (rp.getCreator() == null || rp.getCreator().getId() == null) {
+ rp.setCreator(null);
}
- for (RoomPollAnswer rpa : rp.getRoomPollAnswerList()) {
+ for (RoomPollAnswer rpa : rp.getAnswers()) {
if (rpa.getVotedUser() == null || rpa.getVotedUser().getId() == null) {
rpa.setVotedUser(null);
}
}
- pollManager.savePollBackup(rp);
+ pollDao.update(rp);
}
}
Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java Tue Nov 10 02:59:26 2015
@@ -18,28 +18,19 @@
*/
package org.apache.openmeetings.backup;
-import org.apache.openmeetings.db.dao.room.PollDao;
-import org.apache.openmeetings.db.entity.room.PollType;
+import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.simpleframework.xml.stream.InputNode;
import org.simpleframework.xml.stream.OutputNode;
-public class PollTypeConverter extends OmConverter<PollType> {
- private PollDao pollManager;
+public class PollTypeConverter extends OmConverter<RoomPoll.Type> {
+ public PollTypeConverter() {}
- public PollTypeConverter() {
- //default constructor is for export
- }
-
- public PollTypeConverter(PollDao pollManagement) {
- this.pollManager = pollManagement;
- }
-
- public PollType read(InputNode node) throws Exception {
- return pollManager.getPollType(getLong(node));
+ public RoomPoll.Type read(InputNode node) throws Exception {
+ return RoomPoll.Type.get(getLong(node));
}
- public void write(OutputNode node, PollType value) throws Exception {
+ public void write(OutputNode node, RoomPoll.Type value) throws Exception {
node.setData(true);
- node.setValue(value == null ? "0" : "" + value.getPollTypesId());
+ node.setValue(value == null ? "0" : "" + value.getId());
}
}
\ No newline at end of file
Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java Tue Nov 10 02:59:26 2015
@@ -334,7 +334,7 @@ public class Admin {
} else {
invalid += pSize;
}
- } else if (u.getDeleted()) {
+ } else if (u.isDeleted()) {
if (cleanup) {
FileHelper.removeRec(profile);
} else {
@@ -344,7 +344,7 @@ public class Admin {
}
long missing = 0;
for (User u : udao.getAllBackupUsers()) {
- if (!u.getDeleted() && u.getPictureuri() != null && !new File(OmFileHelper.getUploadProfilesUserDir(u.getId()), u.getPictureuri()).exists()) {
+ if (!u.isDeleted() && u.getPictureuri() != null && !new File(OmFileHelper.getUploadProfilesUserDir(u.getId()), u.getPictureuri()).exists()) {
missing++;
}
}
Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Tue Nov 10 02:59:26 2015
@@ -56,7 +56,6 @@ import java.util.Iterator;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.basic.ErrorDao;
import org.apache.openmeetings.db.dao.basic.NavigationDao;
-import org.apache.openmeetings.db.dao.room.PollDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.room.SipDao;
import org.apache.openmeetings.db.dao.server.OAuth2Dao;
@@ -95,8 +94,6 @@ public class ImportInitvalues {
@Autowired
private ErrorDao errorDao;
@Autowired
- private PollDao pollManager;
- @Autowired
private SipDao sipDao;
@Autowired
private OAuth2Dao oauthDao;
@@ -600,36 +597,22 @@ public class ImportInitvalues {
// ------------------------------------------------------------------------------
- /**
- * Create poll types
- */
- // ------------------------------------------------------------------------------
- public void loadPollTypes() {
- pollManager.addPollType(26L, false);
- pollManager.addPollType(27L, true);
- }
-
- // ------------------------------------------------------------------------------
-
public void loadSystem(InstallationConfig cfg, boolean force) throws Exception {
// FIXME dummy check if installation was performed before
if (!force && userDao.count() > 0) {
log.debug("System contains users, no need to install data one more time.");
}
sipDao.delete();
- progress = 14;
+ progress = 16;
loadMainMenu();
- progress = 28;
+ progress = 32;
loadErrorMappingsFromXML();
- progress = 42;
+ progress = 48;
loadCountriesFiles();
- progress = 56;
- // Appointment poll types
- loadPollTypes();
- progress = 70;
+ progress = 64;
loadConfiguration(cfg);
- progress = 84;
+ progress = 80;
loadInitialOAuthServers();
progress = 99;
}
Modified: openmeetings/branches/3.1.x/openmeetings-server/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/pom.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-server/pom.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-server/pom.xml Tue Nov 10 02:59:26 2015
@@ -127,7 +127,7 @@
<id>prepare-red5-server</id>
<activation>
<file>
- <missing>red5-server/red5-server-1.0.7-SNAPSHOT-server.zip</missing> <!-- TODO should be in-sync with global property -->
+ <missing>red5-server/red5-server-1.0.6-RELEASE-server.zip</missing> <!-- TODO should be in-sync with global property -->
</file>
</activation>
<build>
Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java Tue Nov 10 02:59:26 2015
@@ -246,12 +246,12 @@ public class UserManager implements IUse
String Comment) {
String ret = "Fehler beim speichern der Userdata";
Userdata userdata = new Userdata();
- userdata.setData_key(DATA_KEY);
+ userdata.setKey(DATA_KEY);
userdata.setData(DATA);
- userdata.setStarttime(new Date());
- userdata.setUpdatetime(null);
+ userdata.setInserted(new Date());
+ userdata.setUpdated(null);
userdata.setComment(Comment);
- userdata.setUser_id(USER_ID);
+ userdata.setUserId(USER_ID);
userdata.setDeleted(false);
try {
em.merge(userdata);
@@ -466,8 +466,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);
@@ -502,8 +502,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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Tue Nov 10 02:59:26 2015
@@ -60,8 +60,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
*
@@ -78,9 +77,9 @@ public class LangPanel extends AdminPane
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
@Override
- public void onMenuPanelLoad(IPartialPageRequestHandler target) {
- super.onMenuPanelLoad(target);
- target.appendJavaScript("labelsInit();");
+ public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ super.onMenuPanelLoad(handler);
+ handler.appendJavaScript("labelsInit();");
}
public LangPanel(String id) {
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java Tue Nov 10 02:59:26 2015
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.admi
import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
+import static org.apache.openmeetings.web.app.Application.getBean;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
import org.apache.openmeetings.db.entity.server.LdapConfig;
@@ -49,14 +50,13 @@ public class LdapForm extends AdminBaseF
private static final long serialVersionUID = 1L;
private final WebMarkupContainer listContainer;
- public LdapForm(String id, WebMarkupContainer listContainer,
- final LdapConfig ldapConfig) {
+ public LdapForm(String id, WebMarkupContainer listContainer, final LdapConfig ldapConfig) {
super(id, new CompoundPropertyModel<LdapConfig>(ldapConfig));
setOutputMarkupId(true);
this.listContainer = listContainer;
add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1108))));
- add(new CheckBox("isActive"));
+ add(new CheckBox("active"));
add(forDatePattern("inserted", WEB_DATE_PATTERN));
add(new Label("insertedby.login"));
add(forDatePattern("updated", WEB_DATE_PATTERN));
@@ -73,8 +73,8 @@ public class LdapForm extends AdminBaseF
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- Application.getBean(LdapConfigDao.class).update(getModelObject(), WebSession.getUserId());
- LdapConfig ldapConfig = Application.getBean(LdapConfigDao.class).get(getModelObject().getId());
+ getBean(LdapConfigDao.class).update(getModelObject(), WebSession.getUserId());
+ LdapConfig ldapConfig = getBean(LdapConfigDao.class).get(getModelObject().getId());
this.setModelObject(ldapConfig);
hideNewRecord();
target.add(this);
@@ -93,8 +93,7 @@ public class LdapForm extends AdminBaseF
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
LdapConfig ldapConfig = this.getModelObject();
if (ldapConfig.getId() <= 0) {
- ldapConfig = Application.getBean(LdapConfigDao.class).get(
- ldapConfig.getId());
+ ldapConfig = getBean(LdapConfigDao.class).get(ldapConfig.getId());
} else {
ldapConfig = new LdapConfig();
}
@@ -105,8 +104,7 @@ public class LdapForm extends AdminBaseF
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
- Application.getBean(LdapConfigDao.class).delete(
- this.getModelObject(), WebSession.getUserId());
+ getBean(LdapConfigDao.class).delete(getModelObject(), WebSession.getUserId());
this.setModelObject(new LdapConfig());
target.add(listContainer);
target.add(this);
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html Tue Nov 10 02:59:26 2015
@@ -45,7 +45,7 @@
<table class="adminListTable">
<tbody wicket:id="listContainer">
<tr wicket:id="ldapList">
- <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="ldapConfigId"></span></div></td>
+ <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="name"></span></div></td>
<td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="configFileName"></span></div></td>
</tr>
@@ -63,7 +63,7 @@
<label><wicket:message key="1108" /></label><input type="text" wicket:id="name"/>
</div>
<div class="formelement">
- <label><wicket:message key="1109" /></label><input type="checkbox" class="formcheckbox" wicket:id="isActive"/>
+ <label><wicket:message key="1109" /></label><input type="checkbox" class="formcheckbox" wicket:id="active"/>
</div>
<div class="formelement">
<label><wicket:message key="1110" /></label><span wicket:id="inserted"/>
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Tue Nov 10 02:59:26 2015
@@ -46,9 +46,9 @@ public class LdapsPanel extends AdminPan
private LdapForm form;
@Override
- public void onMenuPanelLoad(IPartialPageRequestHandler target) {
- super.onMenuPanelLoad(target);
- target.appendJavaScript("omLdapPanelInit();");
+ public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ super.onMenuPanelLoad(handler);
+ handler.appendJavaScript("omLdapPanelInit();");
}
public LdapsPanel(String id) {
@@ -60,7 +60,7 @@ public class LdapsPanel extends AdminPan
@Override
protected void populateItem(final Item<LdapConfig> item) {
final LdapConfig lc = item.getModelObject();
- item.add(new Label("ldapConfigId", "" + lc.getId()));
+ item.add(new Label("id", "" + lc.getId()));
item.add(new Label("name", "" + lc.getName()));
item.add(new Label("configFileName", "" + lc.getConfigFileName()));
item.add(new AjaxEventBehavior("click") {
@@ -74,12 +74,12 @@ public class LdapsPanel extends AdminPan
}
});
item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
- + (lc.getId() == form.getModelObject().getId() ? " ui-state-active" : "")));
+ + (lc.getId().equals(form.getModelObject().getId()) ? " ui-state-active" : "")));
}
};
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
- private static final long serialVersionUID = -1L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
@@ -87,7 +87,7 @@ public class LdapsPanel extends AdminPan
}
};
DataViewContainer<LdapConfig> container = new DataViewContainer<LdapConfig>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<LdapConfig>("orderById", "ldapConfigId", container))
+ container.addLink(new OmOrderByBorder<LdapConfig>("orderById", "id", container))
.addLink(new OmOrderByBorder<LdapConfig>("orderByName", "name", container))
.addLink(new OmOrderByBorder<LdapConfig>("orderByFile", "configFileName", container));
add(container.getLinks());
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java Tue Nov 10 02:59:26 2015
@@ -51,7 +51,6 @@ public class OAuthPanel extends AdminPan
item.add(new Label("oauthServerId", String.valueOf(server.getId())));
item.add(new Label("name", server.getName()));
item.add(new AjaxEventBehavior("click") {
-
private static final long serialVersionUID = 1L;
@Override
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
<entry key="23">Each connected user receives a message with the new poll</entry>
<entry key="24">Create a poll</entry>
<entry key="25">Cancel</entry>
- <entry key="26">Yes/No</entry>
- <entry key="27">Numeric 1-10</entry>
<entry key="28">Poll</entry>
<entry key="29">You must be a moderator to create a question</entry>
<entry key="30">Your vote has been registered</entry>
@@ -339,8 +337,6 @@
<entry key="319">Please enter either an email address or a user name</entry>
<entry key="320">There is no user connected to this username</entry>
<entry key="321">The email containing a special link has been sent to your email address</entry>
- <entry key="322">Error</entry>
- <entry key="323">Message</entry>
<entry key="324">No user found</entry>
<entry key="325">Reset your password</entry>
<entry key="326">Login</entry>
@@ -1555,9 +1551,6 @@
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
<entry key="1540">Please specify your timezone</entry>
- <entry key="1541">conference (1-25 users)</entry>
- <entry key="1542">restricted (1-150 users)</entry>
- <entry key="1543">interview (1:1 meeting with recording)</entry>
<entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
@@ -1582,9 +1575,6 @@
<entry key="1565">Oct</entry>
<entry key="1566">Nov</entry>
<entry key="1567">Dec</entry>
- <entry key="1568">do not send notification</entry>
- <entry key="1569">simple email</entry>
- <entry key="1570">iCal email</entry>
<entry key="1571">OAuth2</entry>
<entry key="1572">Manage OAuth2 configurations</entry>
<entry key="1573">Name</entry>
@@ -1871,9 +1861,19 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.restricted">restricted (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
<entry key="user.salutation.mr">Mr</entry>
<entry key="user.salutation.ms">Ms</entry>
<entry key="user.salutation.mrs">Mrs</entry>
<entry key="user.salutation.dr">Dr</entry>
<entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Error</entry>
+ <entry key="error.type.info">Message</entry>
+ <entry key="poll.type.yesNo">Yes/No</entry>
+ <entry key="poll.type.numeric">Numeric 1-10</entry>
</properties>
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
<entry key="23">Ù
عÙÙÙ
ات : Ù٠صÙØ© ÙتÙÙ٠اÙÙ
ستخدÙ
رساÙØ© Ù
ع استطÙاع جدÙد.</entry>
<entry key="24">اÙشاء استطÙاع</entry>
<entry key="25">اÙغاء</entry>
- <entry key="26">ÙعÙ
/ Ùا</entry>
- <entry key="27">عدد٠1-10</entry>
<entry key="28">استطÙاع اÙرأÙ</entry>
<entry key="29">Ùا بد Ù
Ù ÙسÙØ· ÙتÙÙئة اÙسؤاÙ</entry>
<entry key="30">تصÙÙت٠Ù
سجÙØ©.</entry>
@@ -280,8 +278,6 @@
<entry key="258">اذÙب اÙ٠اÙصÙØ٠اÙاخÙرة</entry>
<entry key="259">تÙبÙر --</entry>
<entry key="260">تÙبÙر</entry>
- <entry key="261">اÙسÙد</entry>
- <entry key="262">اÙسÙدة</entry>
<entry key="263">اÙتشÙÙÙ</entry>
<entry key="264">اÙÙÙÙØ©</entry>
<entry key="265">Ù
ÙتاØ</entry>
@@ -341,8 +337,6 @@
<entry key="319">إستطÙاعات</entry>
<entry key="320">Ùذا اÙإسÙ
Ùا ÙعÙد Ø¥Ù٠أ٠Ù
ستخدÙ
</entry>
<entry key="321">ÙÙد تÙ
إرسا٠برÙد ÙتضÙ
٠رابط خاص Ø¥Ù٠برÙد٠اÙØ¥ÙÙترÙÙÙØ Ø§Ùرجاء تÙØص صÙدÙ٠اÙبرÙد. إذا ÙÙ
تØص٠بعد عÙ٠برÙد Ø¥ÙÙترÙÙÙØ Ø§Ùرجاء تعدÙ٠إعدادات اÙبرÙد اÙÙ
زعج Ù ÙÙ
بإعادة إرسا٠اÙبرÙد اÙØ¥ÙÙترÙÙ٠اÙخاص باÙتأÙÙد.</entry>
- <entry key="322">خطأ</entry>
- <entry key="323">رساÙØ©</entry>
<entry key="324">Ù
زÙج غÙر صاÙØ. ÙÙس ÙÙا٠أ٠Ù
ستخدÙ
.</entry>
<entry key="325">إستعادة ÙÙÙ
Ø© اÙÙ
رÙر</entry>
<entry key="326">تسجÙ٠اÙدخÙÙ</entry>
@@ -860,8 +854,6 @@
<entry key="838">This User is a Super-Moderator. You cannot remove the Moderation flag from a Super-Moderator!</entry>
<entry key="839">Do you really want to delete this File/Folder?</entry>
<entry key="840">Delete File/Folder?</entry>
- <entry key="841">Mrs.</entry>
- <entry key="842">Dr.</entry>
<entry key="843">Properties</entry>
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
@@ -1483,7 +1475,6 @@
<entry key="1461">Export/Import System Backups</entry>
<entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
<entry key="1463">Edit text</entry>
- <entry key="1464">Prof</entry>
<entry key="1465">Publish</entry>
<entry key="1466">Start Publish</entry>
<entry key="1467">Stop Publish</entry>
@@ -1560,9 +1551,6 @@
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
<entry key="1540">Please specify your timezone</entry>
- <entry key="1541">conference (1-25 users)</entry>
- <entry key="1542">restricted (1-150 users)</entry>
- <entry key="1543">interview (1:1 meeting with recording)</entry>
<entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
@@ -1587,9 +1575,6 @@
<entry key="1565">Oct</entry>
<entry key="1566">Nov</entry>
<entry key="1567">Dec</entry>
- <entry key="1568">do not send notification</entry>
- <entry key="1569">simple email</entry>
- <entry key="1570">iCal email</entry>
<entry key="1571">OAuth2</entry>
<entry key="1572">Manage OAuth2 configurations</entry>
<entry key="1573">Name</entry>
@@ -1869,4 +1854,19 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.restricted">restricted (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">اÙسÙد</entry>
+ <entry key="user.salutation.ms">اÙسÙدة</entry>
+ <entry key="user.salutation.mrs">Mrs.</entry>
+ <entry key="user.salutation.dr">Dr.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">خطأ</entry>
+ <entry key="error.type.info">رساÙØ©</entry>
+ <entry key="poll.type.yesNo">ÙعÙ
/ Ùا</entry>
+ <entry key="poll.type.numeric">عدد٠1-10</entry>
</properties>
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
<entry key="23">ÐнÑо: ÐÑеки ÑвÑÑзан поÑÑебиÑел полÑÑава ÑÑобÑение за новаÑа анкеÑа.</entry>
<entry key="24">СÑздаване на анкеÑа</entry>
<entry key="25">ÐÑказ</entry>
- <entry key="26">Ðа/Ðе</entry>
- <entry key="27">ЧиÑлов 1-10</entry>
<entry key="28">ÐнкеÑа</entry>
<entry key="29">ТÑÑбва да ÑÑе модеÑаÑоÑ, за да добавиÑе нов вÑпÑоÑ</entry>
<entry key="30">ÐлаÑÑÑ Ðи е оÑÑеÑен.</entry>
@@ -280,8 +278,6 @@
<entry key="258">ÐÑм поÑледна ÑÑÑаниÑа</entry>
<entry key="259">ÐаÑаб --</entry>
<entry key="260">ÐаÑаб ++</entry>
- <entry key="261">Ð-н</entry>
- <entry key="262">Ð-жа</entry>
<entry key="263">ÐонÑигÑÑаÑиÑ</entry>
<entry key="264">ID</entry>
<entry key="265">ÐлÑÑ</entry>
@@ -341,8 +337,6 @@
<entry key="319">ÐолÑ, вÑведеÑе E-mail или поÑÑебиÑелÑко име.</entry>
<entry key="320">Ðе е намеÑено Ñакова поÑÑебиÑелÑко име.</entry>
<entry key="321">ÐзпÑаÑен е e-mail, ÑÑдÑÑÐ¶Ð°Ñ Ð»Ð¸Ð½Ðº за нова паÑола.</entry>
- <entry key="322">ÐÑеÑка</entry>
- <entry key="323">СÑобÑение</entry>
<entry key="324">Ðе е намеÑен ÑакÑв поÑÑебиÑел.</entry>
<entry key="325">Ðова паÑола</entry>
<entry key="326">ÐоÑÑебиÑелÑко име</entry>
@@ -860,8 +854,6 @@
<entry key="838">ÐоÑÑебиÑелÑÑ Ðµ СÑÐ¿ÐµÑ ÐодеÑаÑÐ¾Ñ Ð¸ никой не може да пÑемаÑ
не Ñези негови пÑава!</entry>
<entry key="839">ÐаиÑÑина ли иÑкаÑе да изÑÑиеÑе Ñози Ñайл/папка?</entry>
<entry key="840">ÐзÑÑиване на Ñайл/папка?</entry>
- <entry key="841">Ð-жа</entry>
- <entry key="842">Ð-Ñ</entry>
<entry key="843">СвойÑÑва</entry>
<entry key="844">Ðоказване позиÑиÑÑа на миÑкаÑа на гледаÑиÑе</entry>
<entry key="845">Share Audio with SIP Applet</entry>
@@ -1483,7 +1475,6 @@
<entry key="1461">Export/Import System Backups</entry>
<entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
<entry key="1463">Edit text</entry>
- <entry key="1464">Prof</entry>
<entry key="1465">Publish</entry>
<entry key="1466">Start Publish</entry>
<entry key="1467">Stop Publish</entry>
@@ -1560,9 +1551,6 @@
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
<entry key="1540">Please specify your timezone</entry>
- <entry key="1541">conference (1-25 users)</entry>
- <entry key="1542">restricted (1-150 users)</entry>
- <entry key="1543">interview (1:1 meeting with recording)</entry>
<entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
@@ -1587,9 +1575,6 @@
<entry key="1565">Oct</entry>
<entry key="1566">Nov</entry>
<entry key="1567">Dec</entry>
- <entry key="1568">do not send notification</entry>
- <entry key="1569">simple email</entry>
- <entry key="1570">iCal email</entry>
<entry key="1571">OAuth2</entry>
<entry key="1572">Manage OAuth2 configurations</entry>
<entry key="1573">Name</entry>
@@ -1869,4 +1854,19 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.restricted">restricted (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Ð-н</entry>
+ <entry key="user.salutation.ms">Ð-жа</entry>
+ <entry key="user.salutation.mrs">Ð-жа</entry>
+ <entry key="user.salutation.dr">Ð-Ñ</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">ÐÑеÑка</entry>
+ <entry key="error.type.info">СÑобÑение</entry>
+ <entry key="poll.type.yesNo">Ðа/Ðе</entry>
+ <entry key="poll.type.numeric">ЧиÑлов 1-10</entry>
</properties>