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 [6/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-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java Tue Nov 10 02:59:26 2015
@@ -26,6 +26,7 @@ import org.apache.wicket.markup.head.Jav
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
+
import org.wicketstuff.select2.Select2MultiChoice;
public class UserMultiChoice extends Select2MultiChoice<User> {
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml Tue Nov 10 02:59:26 2015
@@ -44,7 +44,6 @@
<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
<class>org.apache.openmeetings.db.entity.room.Invitation</class>
<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
- <class>org.apache.openmeetings.db.entity.room.PollType</class>
<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
<class>org.apache.openmeetings.db.entity.room.Client</class>
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml Tue Nov 10 02:59:26 2015
@@ -44,7 +44,6 @@
<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
<class>org.apache.openmeetings.db.entity.room.Invitation</class>
<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
- <class>org.apache.openmeetings.db.entity.room.PollType</class>
<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
<class>org.apache.openmeetings.db.entity.room.Client</class>
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml Tue Nov 10 02:59:26 2015
@@ -43,7 +43,6 @@
<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
<class>org.apache.openmeetings.db.entity.room.Invitation</class>
<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
- <class>org.apache.openmeetings.db.entity.room.PollType</class>
<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
<class>org.apache.openmeetings.db.entity.room.Client</class>
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml Tue Nov 10 02:59:26 2015
@@ -44,7 +44,6 @@
<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
<class>org.apache.openmeetings.db.entity.room.Invitation</class>
<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
- <class>org.apache.openmeetings.db.entity.room.PollType</class>
<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
<class>org.apache.openmeetings.db.entity.room.Client</class>
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml Tue Nov 10 02:59:26 2015
@@ -44,7 +44,6 @@
<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
<class>org.apache.openmeetings.db.entity.room.Invitation</class>
<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
- <class>org.apache.openmeetings.db.entity.room.PollType</class>
<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
<class>org.apache.openmeetings.db.entity.room.Client</class>
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml Tue Nov 10 02:59:26 2015
@@ -44,7 +44,6 @@
<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
<class>org.apache.openmeetings.db.entity.room.Invitation</class>
<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
- <class>org.apache.openmeetings.db.entity.room.PollType</class>
<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
<class>org.apache.openmeetings.db.entity.room.Client</class>
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java Tue Nov 10 02:59:26 2015
@@ -38,19 +38,19 @@ public class TestNavi extends AbstractJU
@Test
public void testGetNavi(){
- List<Naviglobal> ll = navimanagement.getMainMenu(true, 1L);
+ List<Naviglobal> ll = navimanagement.getMainMenu(true);
assertTrue("GlobalNavi size should be greater than zero: " + ll.size(), ll.size() > 0);
System.out.println("NaviGlobal size: " + ll.size());
for (Naviglobal navigl : ll) {
assertNotNull("Naviglobal retrieved should not be null", navigl);
- System.out.println("Naviglobal label: " + navigl.getLevel_id());
+ System.out.println("Naviglobal label: " + navigl.getLevelId());
assertNotNull("Naviglobal retrieved should have Navimain entries", navigl.getMainnavi());
for (Navimain navim : navigl.getMainnavi()) {
assertNotNull("Navimain retrieved should not be null", navim);
- System.out.println("-->" + navim.getFieldvalues_id());
+ System.out.println("-->" + navim.getLabelId());
}
}
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java Tue Nov 10 02:59:26 2015
@@ -64,24 +64,24 @@ public class TestDbSession extends Abstr
Client cl1 = new Client();
cl1.setStreamid("1");
cl1.setServer(null);
- cl1.setUser_id(1L);
- cl1.setRoom_id(1L);
+ cl1.setUserId(1L);
+ cl1.setRoomId(1L);
cl1.setPublicSID("public1");
clientDao.add(cl1);
Client cl2 = new Client();
cl2.setStreamid("2");
cl2.setServer(null);
- cl2.setRoom_id(1L);
- cl2.setUser_id(2L);
+ cl2.setRoomId(1L);
+ cl2.setUserId(2L);
cl2.setPublicSID("public2");
clientDao.add(cl2);
Client cl3 = new Client();
cl3.setStreamid("3");
cl3.setServer(server);
- cl3.setRoom_id(3L);
- cl3.setUser_id(3L);
+ cl3.setRoomId(3L);
+ cl3.setUserId(3L);
cl3.setPublicSID("public3");
clientDao.add(cl3);
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java Tue Nov 10 02:59:26 2015
@@ -64,24 +64,24 @@ public class TestDbSessionGetRoomIds ext
Client cl1 = new Client();
cl1.setStreamid("1");
cl1.setServer(server);
- cl1.setUser_id(1L);
- cl1.setRoom_id(1L);
+ cl1.setUserId(1L);
+ cl1.setRoomId(1L);
cl1.setPublicSID("public1");
clientDao.add(cl1);
Client cl2 = new Client();
cl2.setStreamid("2");
cl2.setServer(server);
- cl2.setRoom_id(1L);
- cl2.setUser_id(2L);
+ cl2.setRoomId(1L);
+ cl2.setUserId(2L);
cl2.setPublicSID("public2");
clientDao.add(cl2);
Client cl3 = new Client();
cl3.setStreamid("3");
cl3.setServer(server);
- cl3.setRoom_id(3L);
- cl3.setUser_id(3L);
+ cl3.setRoomId(3L);
+ cl3.setUserId(3L);
cl3.setPublicSID("public3");
clientDao.add(cl3);
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java Tue Nov 10 02:59:26 2015
@@ -47,7 +47,7 @@ public class TestUserOrganisation extend
private User getValidUser() {
for (User u : usersDao.getAllBackupUsers()) {
- if (!u.getDeleted() && u.getOrganisation_users().size() > 0) {
+ if (!u.isDeleted() && u.getOrganisation_users().size() > 0) {
return u;
}
}
Modified: openmeetings/branches/3.1.x/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/pom.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/pom.xml (original)
+++ openmeetings/branches/3.1.x/pom.xml Tue Nov 10 02:59:26 2015
@@ -44,7 +44,7 @@
<wicket.version>7.1.0</wicket.version>
<wicketju.version>7.1.0</wicketju.version>
<wickets.version>7.0.0</wickets.version>
- <red5-server.version>1.0.7-SNAPSHOT</red5-server.version>
+ <red5-server.version>1.0.6-RELEASE</red5-server.version>
<red5-client.version>1.0.6-RELEASE</red5-client.version>
<batik.version>1.7</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java Tue Nov 10 02:59:26 2015
@@ -21,12 +21,10 @@ package org.apache.openmeetings.core.rem
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
-import java.util.Arrays;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Set;
-import java.util.TimeZone;
import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.core.remote.util.SessionVariablesUtil;
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java Tue Nov 10 02:59:26 2015
@@ -47,18 +47,18 @@ public class FileExplorerItemDao {
private EntityManager em;
public Long add(String fileName, String fileHash,
- Long parentFileExplorerItemId, Long ownerId, Long roomId,
+ Long parentItemId, Long ownerId, Long roomId,
Long insertedBy, Boolean isFolder, Boolean isImage,
Boolean isPresentation, String wmlFilePath,
Boolean isStoredWmlFile, Boolean isChart,
- Long externalFileId, String externalType) {
+ Long externalId, String externalType) {
log.debug(".add(): adding file " + fileName+ " roomID: "+roomId);
try {
FileExplorerItem fileItem = new FileExplorerItem();
fileItem.setFileName(fileName);
fileItem.setFileHash(fileHash);
fileItem.setDeleted(false);
- fileItem.setParentItemId(parentFileExplorerItemId);
+ fileItem.setParentItemId(parentItemId);
fileItem.setOwnerId(ownerId);
fileItem.setRoomId(roomId);
fileItem.setInserted(new Date());
@@ -82,7 +82,7 @@ public class FileExplorerItemDao {
fileItem.setType(t);
fileItem.setUpdated(new Date());
fileItem.setWmlFilePath(wmlFilePath);
- fileItem.setExternalFileId(externalFileId);
+ fileItem.setExternalId(externalId);
fileItem.setExternalType(externalType);
fileItem = em.merge(fileItem);
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java Tue Nov 10 02:59:26 2015
@@ -65,10 +65,10 @@ public class RecordingMetaDeltaDao {
try {
if (metaDelta.getMetaDataId() == 0) {
em.persist(metaDelta);
- } else {
- if (!em.contains(metaDelta)) {
- em.merge(metaDelta);
- }
+ } else {
+ if (!em.contains(metaDelta)) {
+ em.merge(metaDelta);
+ }
}
return metaDelta.getMetaDataId();
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java Tue Nov 10 02:59:26 2015
@@ -29,7 +29,6 @@ import javax.persistence.PersistenceCont
import javax.persistence.Query;
import javax.persistence.TypedQuery;
-import org.apache.openmeetings.db.entity.room.PollType;
import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.apache.openmeetings.db.entity.room.RoomPollAnswer;
import org.red5.logging.Red5LoggerFactory;
@@ -43,27 +42,6 @@ public class PollDao {
@PersistenceContext
private EntityManager em;
- public Long addPollType(Long labelId, Boolean isNumeric) {
- log.debug("Adding poll type: " + labelId + ", " + isNumeric);
- PollType pt = new PollType();
- pt.setLabelId(labelId);
- pt.setNumeric(isNumeric);
-
- em.persist(pt);
-
- return pt.getId();
- }
-
- public List<PollType> getTypes() {
- return em.createNamedQuery("getPollTypes", PollType.class).getResultList();
- }
-
- public PollType getType(Long typeId) {
- TypedQuery<PollType> q = em.createNamedQuery("getPollType", PollType.class);
- q.setParameter("typeId", typeId);
- return q.getSingleResult();
- }
-
public RoomPoll update(RoomPoll p) {
if (p.getId() == null) {
p.setCreated(new Date());
@@ -74,7 +52,7 @@ public class PollDao {
return p;
}
- public boolean close(Long roomId){
+ public boolean close(Long roomId) {
try {
log.debug(" :: close :: ");
Query q = em.createNamedQuery("closePoll");
@@ -87,7 +65,7 @@ public class PollDao {
return false;
}
- public boolean delete(RoomPoll p){
+ public boolean delete(RoomPoll p) {
try {
log.debug(" :: delete :: ");
Query q = em.createNamedQuery("deletePoll");
@@ -104,12 +82,11 @@ public class PollDao {
return list.isEmpty() ? null : list.get(0);
}
- public RoomPoll getPoll(Long roomId) {
+ public RoomPoll getByRoom(Long roomId) {
try {
log.debug(" :: getPoll :: " + roomId);
TypedQuery<RoomPoll> q = em.createNamedQuery("getPoll", RoomPoll.class);
q.setParameter("roomId", roomId);
- q.setParameter("archived", false);
return q.getSingleResult();
} catch (NoResultException nre) {
//expected
@@ -136,7 +113,6 @@ public class PollDao {
log.debug(" :: getArchived :: " + roomId);
TypedQuery<RoomPoll> q = em.createNamedQuery("getArchivedPollList",RoomPoll.class);
q.setParameter("roomId", roomId);
- q.setParameter("archived", true);
return q.getResultList();
} catch (NoResultException nre) {
//expected
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java Tue Nov 10 02:59:26 2015
@@ -96,8 +96,8 @@ public class PrivateMessageDao implement
if (entity.getId() == null) {
entity.setInserted(new Date());
em.persist(entity);
- } else {
- entity = em.merge(entity);
+ } else {
+ entity = em.merge(entity);
}
return entity;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java Tue Nov 10 02:59:26 2015
@@ -75,8 +75,8 @@ public class PrivateMessageFolderDao imp
PrivateMessageFolder folder = null;
try {
folder = query.getSingleResult();
- } catch (NoResultException ex) {
- }
+ } catch (NoResultException ex) {
+ }
return folder;
}
@@ -90,10 +90,10 @@ public class PrivateMessageFolderDao imp
public PrivateMessageFolder update(PrivateMessageFolder folder, Long userId) {
if (folder.getId() == 0) {
em.persist(folder);
- } else {
- if (!em.contains(folder)) {
- folder = em.merge(folder);
- }
+ } else {
+ if (!em.contains(folder)) {
+ folder = em.merge(folder);
+ }
}
return folder;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java Tue Nov 10 02:59:26 2015
@@ -46,7 +46,7 @@ public class StateDao {
private EntityManager em;
/**
- * adds a new State to the states table with no short name and code
+ * adds a new State to the state table with no short name and code
*
* @param name
* @return the id of the new state or null if an error occurred
@@ -56,7 +56,7 @@ public class StateDao {
}
/**
- * adds a new State to the states table
+ * adds a new State to the state table
*
* @param name the name of the country
* @param shortName the short name of the country
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java Tue Nov 10 02:59:26 2015
@@ -58,7 +58,7 @@ public class RoomDTO implements Serializ
private boolean actionsMenuHidden;
private boolean screenSharingHidden;
private boolean whiteboardHidden;
-
+
public RoomDTO() {}
public RoomDTO(Room r) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java Tue Nov 10 02:59:26 2015
@@ -60,7 +60,7 @@ public class ChatMessage implements IDat
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@Element(name = "id", data = true)
- private long id;
+ private Long id;
@ManyToOne
@JoinColumn(name = "from_user_id")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java Tue Nov 10 02:59:26 2015
@@ -74,7 +74,7 @@ public class Naviglobal implements IData
@Column(name = "inserted")
private Date inserted;
- @Column(name = "comment_field")
+ @Column(name = "comment")
private String comment;
@Column(name = "naviorder")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java Tue Nov 10 02:59:26 2015
@@ -66,7 +66,7 @@ public class Navimain implements IDataPr
@Column(name = "inserted")
private Date inserted;
- @Column(name = "comment_field")
+ @Column(name = "comment")
private String comment;
@Column(name = "naviorder")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java Tue Nov 10 02:59:26 2015
@@ -65,7 +65,7 @@ public class FileExplorerItem extends Fi
private String wmlFilePath;
@Column(name = "external_file_id")
- private Long externalFileId;
+ private Long externalId;
@Column(name = "external_type")
private String externalType;
@@ -94,12 +94,12 @@ public class FileExplorerItem extends Fi
this.wmlFilePath = wmlFilePath;
}
- public Long getExternalFileId() {
- return externalFileId;
+ public Long getExternalId() {
+ return externalId;
}
- public void setExternalFileId(Long externalFileId) {
- this.externalFileId = externalFileId;
+ public void setExternalId(Long externalId) {
+ this.externalId = externalId;
}
public String getExternalType() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java Tue Nov 10 02:59:26 2015
@@ -88,7 +88,7 @@ import org.simpleframework.xml.Root;
, @NamedQuery(name = "getRecordingsByRoom", query = "SELECT c FROM Recording c WHERE c.deleted = false AND c.roomId = :roomId "
+ "ORDER BY c.type ASC, c.inserted")
, @NamedQuery(name = "getRecordingsByParent", query = "SELECT f FROM Recording f WHERE f.deleted = false AND f.parentItemId = :parentId "
- + "ORDER BY f.type ASC, f.inserted")
+ + "ORDER BY f.type ASC, f.inserted")
, @NamedQuery(name = "getRecordingsByExternalType", query = "SELECT rec FROM Recording rec, Room r, User u "
+ "WHERE rec.deleted = false AND rec.roomId = r.id AND rec.insertedBy = u.id "
+ "AND (r.externalType = :externalType OR u.externalType = :externalType)")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java Tue Nov 10 02:59:26 2015
@@ -132,7 +132,7 @@ public class Client implements IDataProv
* @see Client#getIsMod()
*/
@Column(name = "is_mod")
- private Boolean isMod = false;
+ private boolean isMod = false;
/**
* @see Client#getIsSuperModerator()
@@ -163,9 +163,10 @@ public class Client implements IDataProv
*/
@Column(name = "can_giveaudio")
private Boolean canGiveAudio = false;
-
+
@Column(name = "can_video")
private boolean canVideo = false;
+
/**
* @see Client#getConnectedSince()
*/
@@ -182,13 +183,13 @@ public class Client implements IDataProv
* @see Client#getIsScreenClient()
*/
@Column(name = "is_screenclient")
- private boolean screenClient = false;
+ private boolean screenClient;
/**
* @see Client#getIsAVClient()
*/
@Column(name = "is_avclient")
- private boolean avClient = false;
+ private boolean avClient;
/**
* @see Client#getUsercolor()
@@ -399,7 +400,7 @@ public class Client implements IDataProv
public Client() {}
public Client(String streamid, String publicSID, Long roomId,
- Long userId, String firstname, String lastname, boolean isAVClient,
+ Long userId, String firstname, String lastname, boolean avClient,
String username, String connectedSince, String scope) {
super();
this.streamid = streamid;
@@ -408,7 +409,7 @@ public class Client implements IDataProv
this.userId = userId;
this.firstname = firstname;
this.lastname = lastname;
- this.avClient = isAVClient;
+ this.avClient = avClient;
this.username = username;
this.connectedSince = CalendarPatterns.parseDateWithHour(connectedSince);
this.scope = scope;
@@ -443,11 +444,11 @@ public class Client implements IDataProv
this.connectedSince = connectedSince;
}
- public Boolean getIsMod() {
+ public boolean getIsMod() {
return isMod;
}
- public void setIsMod(Boolean isMod) {
+ public void setIsMod(boolean isMod) {
this.isMod = isMod;
}
@@ -826,6 +827,7 @@ public class Client implements IDataProv
public void setCanVideo(boolean canVideo) {
this.canVideo = canVideo;
}
+
public boolean isAllowRecording() {
return allowRecording;
}
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=1713575&r1=1713574&r2=1713575&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 Tue Nov 10 02:59:26 2015
@@ -25,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;
@@ -35,6 +37,7 @@ 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;
@@ -45,32 +48,70 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name = "closePoll", query = "UPDATE RoomPoll rp SET rp.archived = :archived "
- + "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 = :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 = :roomId AND rp.archived = :archived ORDER BY rp.created DESC"),
- @NamedQuery(name = "hasPoll", query = "SELECT COUNT(rp) FROM RoomPoll rp "
- + "WHERE rp.room.id = :roomId AND rp.archived = :archived") })
+ @NamedQuery(name = "closePoll", query = "UPDATE RoomPoll rp SET rp.archived = :archived "
+ + "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 = :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.id = :roomId AND rp.archived = true ORDER BY rp.created DESC"),
+ @NamedQuery(name = "hasPoll", query = "SELECT COUNT(rp) FROM RoomPoll rp "
+ + "WHERE rp.room.id = :roomId AND rp.archived = :archived") })
@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 id;
-
- @Column(name = "poll_name")
+
+ @Column(name = "name")
@Element(name = "pollname", data = true, required = false)
private String name;
-
- @Column(name = "poll_question")
+
+ @Column(name = "question")
@Element(name = "pollquestion", data = true, required = false)
private String question;
@@ -81,15 +122,14 @@ public class RoomPoll implements IDataPr
@Column(name = "archived")
@Element(data = true, required = false)
private boolean archived;
-
- @OneToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "poll_type_id")
- @ForeignKey(enabled = true)
+
+ @Column(name = "type")
@Element(name = "polltypeid", data = true, required = false)
- private PollType type;
-
+ @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 creator;
@@ -101,7 +141,7 @@ public class RoomPoll implements IDataPr
private Room room;
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
- @JoinColumn(name = "room_poll_id")
+ @JoinColumn(name = "poll_id")
@ElementList(name = "roompollanswers", required = false)
private List<RoomPollAnswer> answers;
@@ -186,11 +226,11 @@ public class RoomPoll implements IDataPr
/**
* @return the type
*/
- public PollType getType() {
+ public Type getType() {
return type;
}
- public void setType(PollType type) {
+ public void setType(Type type) {
this.type = type;
}
@@ -210,23 +250,21 @@ public class RoomPoll implements IDataPr
}
/**
- * @param archived
- * the archived to set
+ * @param archived the archived to set
*/
public void setArchived(boolean archived) {
this.archived = archived;
}
/**
- * @return the pollName
+ * @return the name
*/
public String getName() {
return name;
}
/**
- * @param name
- * the name to set
+ * @param name the name to set
*/
public void setName(String name) {
this.name = name;
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=1713575&r1=1713574&r2=1713575&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 Tue Nov 10 02:59:26 2015
@@ -40,8 +40,8 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @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")
+ @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")
@Root(name="roompollanswer")
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=1713575&r1=1713574&r2=1713575&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 Tue Nov 10 02:59:26 2015
@@ -37,7 +37,7 @@ import javax.xml.bind.annotation.XmlRoot
@NamedQuery(name = "getSessionById", query = "select c from Sessiondata as c "
+ "where c.sessionId LIKE :sessionId"),
@NamedQuery(name = "getSessionToDelete", query = "Select c from Sessiondata c "
- + "WHERE c.refreshed < :refreshed AND (c.permanent = false)")
+ + "WHERE c.refreshed < :refreshed AND c.permanent = false")
})
@Table(name = "sessiondata")
@XmlRootElement
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=1713575&r1=1713574&r2=1713575&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 Tue Nov 10 02:59:26 2015
@@ -35,34 +35,35 @@ public class Userdata implements Seriali
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="id")
- private Long id;
-
- @Column(name="user_id")
- private Long userId;
-
- @Column(name="data_key")
- private String key;
-
- @Column(name="data")
- private String data;
-
+ @Column(name = "id")
+ private Long id;
+
+ @Column(name = "user_id")
+ private Long userId;
+
+ @Column(name = "data_key")
+ private String key;
+
+ @Column(name = "data")
+ private String data;
+
@Column(name = "inserted")
private Date inserted;
-
+
@Column(name = "updated")
private Date updated;
-
+
@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,6 +71,7 @@ public class Userdata implements Seriali
public String getData() {
return data;
}
+
public void setData(String data) {
this.data = data;
}
@@ -77,35 +79,39 @@ public class Userdata implements Seriali
public String getKey() {
return key;
}
+
public void setKey(String key) {
this.key = key;
}
-
+
public Long getId() {
return id;
}
+
public void setId(Long id) {
this.id = id;
}
-
public Date getInserted() {
return inserted;
}
+
public void setInserted(Date inserted) {
this.inserted = inserted;
}
-
+
public Date getUpdated() {
return updated;
}
+
public void setUpdated(Date updated) {
this.updated = updated;
}
-
+
public boolean isDeleted() {
return deleted;
}
+
public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
@@ -113,10 +119,8 @@ public class Userdata implements Seriali
public Long getUserId() {
return userId;
}
+
public void setUserId(Long userId) {
this.userId = userId;
}
-
-
-
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java Tue Nov 10 02:59:26 2015
@@ -34,4 +34,4 @@ public class AppointmentReminderTypeConv
node.setData(true);
node.setValue(value == null ? "0" : "" + value.getId());
}
-}
\ No newline at end of file
+}
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=1713575&r1=1713574&r2=1713575&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 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;
@@ -331,7 +330,7 @@ public class BackupExport {
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);
}
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=1713575&r1=1713574&r2=1713575&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 Tue Nov 10 02:59:26 2015
@@ -68,8 +68,8 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.server.OAuth2Dao;
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.dao.user.GroupDao;
-import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao;
import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
+import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao;
import org.apache.openmeetings.db.dao.user.StateDao;
import org.apache.openmeetings.db.dao.user.UserContactDao;
import org.apache.openmeetings.db.dao.user.UserDao;
@@ -79,13 +79,11 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
import org.apache.openmeetings.db.entity.file.FileItem;
-import org.apache.openmeetings.db.entity.file.FileItem.Type;
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;
@@ -147,7 +145,7 @@ public class BackupImport {
@Autowired
private UserContactDao userContactDao;
@Autowired
- private PollDao pollManager;
+ private PollDao pollDao;
@Autowired
private ConfigurationDao configurationDao;
@Autowired
@@ -322,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) {
@@ -394,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);
@@ -614,11 +612,12 @@ 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;
@@ -631,7 +630,7 @@ public class BackupImport {
rpa.setVotedUser(null);
}
}
- pollManager.update(rp);
+ pollDao.update(rp);
}
}
@@ -741,22 +740,22 @@ public class BackupImport {
if (f.getType() == null) {
if (isChart) {
- f.setType(Type.PollChart);
+ f.setType(FileItem.Type.PollChart);
}
if (isImage) {
- f.setType(Type.Image);
+ f.setType(FileItem.Type.Image);
}
if (isVideo) {
- f.setType(Type.Video);
+ f.setType(FileItem.Type.Video);
}
if (isPresentation) {
- f.setType(Type.Presentation);
+ f.setType(FileItem.Type.Presentation);
}
if (isStoredWmlFile) {
- f.setType(Type.WmlFile);
+ f.setType(FileItem.Type.WmlFile);
}
if (isFolder) {
- f.setType(Type.Folder);
+ f.setType(FileItem.Type.Folder);
}
}
list.add(f);
@@ -944,7 +943,7 @@ public class BackupImport {
StringWriter sw = new StringWriter();
Transformer xformer = TransformerFactory.newInstance().newTransformer();
xformer.transform(new DOMSource(doc), new StreamResult(sw));
-
+
List<User> list = new ArrayList<User>();
InputNode root = NodeBuilder.read(new StringReader(sw.toString()));
InputNode root1 = NodeBuilder.read(new StringReader(sw.toString())); //HACK to handle Address inside user
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java Tue Nov 10 02:59:26 2015
@@ -18,27 +18,18 @@
*/
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 pollDao;
+public class PollTypeConverter extends OmConverter<RoomPoll.Type> {
+ public PollTypeConverter() {}
- public PollTypeConverter() {
- //default constructor is for export
- }
-
- public PollTypeConverter(PollDao pollDao) {
- this.pollDao = pollDao;
- }
-
- public PollType read(InputNode node) throws Exception {
- return pollDao.getType(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.getId());
}
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=1713575&r1=1713574&r2=1713575&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 Tue Nov 10 02:59:26 2015
@@ -24,18 +24,18 @@ import org.simpleframework.xml.stream.In
import org.simpleframework.xml.stream.OutputNode;
public class StateConverter extends OmConverter<State> {
- private StateDao statemanagement;
+ private StateDao stateDao;
public StateConverter() {
//default constructor is for export
}
- public StateConverter(StateDao statemanagement) {
- this.statemanagement = statemanagement;
+ public StateConverter(StateDao stateDao) {
+ this.stateDao = stateDao;
}
public State read(InputNode node) throws Exception {
- return statemanagement.get(getLong(node));
+ return stateDao.get(getLong(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=1713575&r1=1713574&r2=1713575&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 Tue Nov 10 02:59:26 2015
@@ -58,7 +58,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;
@@ -97,8 +96,6 @@ public class ImportInitvalues {
@Autowired
private ErrorDao errorDao;
@Autowired
- private PollDao pollManager;
- @Autowired
private SipDao sipDao;
@Autowired
private OAuth2Dao oauthDao;
@@ -405,7 +402,7 @@ public class ImportInitvalues {
cfgDao.add("inviter.email.as.replyto", cfg.replyToOrganizer, null,
"Set inviter's email address as ReplyTo in email invitations (1 == set, 0 == NOT set)");
- cfgDao.add(CONFIG_DEFAULT_LANDING_ZONE, "user/dashboard" , null
+ cfgDao.add(CONFIG_DEFAULT_LANDING_ZONE, "user/dashboard", null
, "Area to be shown to the user after login. Possible values are: "
+ "user/dashboard, user/calendar, user/record, rooms/my, rooms/group, rooms/public, admin/user, admin/connection"
+ ", admin/group, admin/room, admin/config, admin/lang, admin/ldap, admin/backup, admin/server, admin/oauth2");
@@ -606,36 +603,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/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=1713575&r1=1713574&r2=1713575&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 Tue Nov 10 02:59:26 2015
@@ -190,7 +190,7 @@ public class AppointmentLogic {
String appointmentLocation, String appointmentDescription,
Calendar appointmentstart, Calendar appointmentend,
Boolean isDaily, Boolean isWeekly, Boolean isMonthly,
- Boolean isYearly, Long categoryId, Long remind, String[] mmClient,
+ Boolean isYearly, Long categoryId, String remind, String[] mmClient,
Long roomType, Long languageId,
Boolean isPasswordProtected, String password, long roomId, Long userId) {
Appointment a = new Appointment();
@@ -203,7 +203,7 @@ public class AppointmentLogic {
a.setIsWeekly(isWeekly);
a.setIsMonthly(isMonthly);
a.setIsYearly(isYearly);
- a.setReminder(Reminder.get(remind));
+ a.setReminder(Reminder.valueOf(remind));
if (roomId > 0) {
a.setRoom(roomDao.get(roomId));
} else {
Modified: openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java Tue Nov 10 02:59:26 2015
@@ -203,15 +203,9 @@ public class IcalHandler {
filerPath = filerPath + ".ics";
}
- FileOutputStream fout = null;
- try {
- fout = new FileOutputStream(filerPath);
+ try (FileOutputStream fout = new FileOutputStream(filerPath)) {
CalendarOutputter outputter = new CalendarOutputter();
outputter.output(icsCalendar, fout);
- } finally {
- if (fout != null) {
- fout.close();
- }
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Tue Nov 10 02:59:26 2015
@@ -226,15 +226,15 @@ public class Application extends Authent
}
public static boolean isUserOnline(Long userId) {
- MapIterator it = ONLINE_USERS.mapIterator();
- boolean isUserOnline = false;
- while (it.hasNext()) {
- MultiKey multi = (MultiKey) it.next();
- if (multi.size() > 0 && userId.equals(multi.getKey(0))){
- isUserOnline = true;
- break;
- }
- }
+ MapIterator it = ONLINE_USERS.mapIterator();
+ boolean isUserOnline = false;
+ while (it.hasNext()) {
+ MultiKey multi = (MultiKey) it.next();
+ if (multi.size() > 0 && userId.equals(multi.getKey(0))) {
+ isUserOnline = true;
+ break;
+ }
+ }
return isUserOnline;
}
@@ -245,15 +245,15 @@ public class Application extends Authent
public static List<org.apache.openmeetings.web.app.Client> getClients(Long userId) {
List<org.apache.openmeetings.web.app.Client> result = new ArrayList<org.apache.openmeetings.web.app.Client>();
- MapIterator it = ONLINE_USERS.mapIterator();
- while (it.hasNext()) {
- MultiKey multi = (MultiKey) it.next();
- if (multi.size() > 1 && userId.equals(multi.getKey(0))){
- result.add(getClientByKeys(userId, (String)(multi.getKey(1))));
- break;
- }
- }
- return result;
+ MapIterator it = ONLINE_USERS.mapIterator();
+ while (it.hasNext()) {
+ MultiKey multi = (MultiKey) it.next();
+ if (multi.size() > 1 && userId.equals(multi.getKey(0))) {
+ result.add(getClientByKeys(userId, (String)(multi.getKey(1))));
+ break;
+ }
+ }
+ return result;
}
public static int getClientsSize() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/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>
@@ -1876,4 +1874,6 @@
<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/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/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>
@@ -1869,4 +1867,6 @@
<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/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/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>
@@ -1869,4 +1867,6 @@
<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/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
<entry key="23">Informació: descripció d'enquesta.</entry>
<entry key="24">Crear enquesta</entry>
<entry key="25">Cancel·lar</entry>
- <entry key="26">SÃ/No</entry>
- <entry key="27">Valor numèric [1-10]</entry>
<entry key="28">Enquesta</entry>
<entry key="29">Ãs necessita ser moderador per crear una enquesta.</entry>
<entry key="30">El seu vot ha sigut registrat</entry>
@@ -1869,4 +1867,6 @@
<entry key="user.salutation.prof">Prof</entry>
<entry key="error.type.error">Error</entry>
<entry key="error.type.info">Missatge</entry>
+ <entry key="poll.type.yesNo">SÃ/No</entry>
+ <entry key="poll.type.numeric">Valor numèric [1-10]</entry>
</properties>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
<entry key="23">Info: VÅ¡ichni pÅipojenà uživatelé obdrželi zprávu o nové anketÄ.</entry>
<entry key="24">VytvoÅ anketu</entry>
<entry key="25">Zrušit</entry>
- <entry key="26">Ano/Ne</entry>
- <entry key="27">ÄÃsla 1-10</entry>
<entry key="28">Anketa</entry>
<entry key="29">Pro vytvoÅenà otázky musÃte být moderátor</entry>
<entry key="30">Vaše hlasovánà bylo uloženo.</entry>
@@ -1869,4 +1867,6 @@
<entry key="user.salutation.prof">Prof</entry>
<entry key="error.type.error">Chyba</entry>
<entry key="error.type.info">Zpráva</entry>
+ <entry key="poll.type.yesNo">Ano/Ne</entry>
+ <entry key="poll.type.numeric">ÄÃsla 1-10</entry>
</properties>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
<entry key="23">INFO: Alle tilsluttede brugere får tilsendt en meddelelse med den nye afstemning.</entry>
<entry key="24">Opret afstemning</entry>
<entry key="25">Annuller</entry>
- <entry key="26">Ja/Nej</entry>
- <entry key="27">Numerisk 1-10</entry>
<entry key="28">Stem</entry>
<entry key="29">Du skal vare moderator for at kunne oprette en afstemning</entry>
<entry key="30">Din afstemning er accepteret</entry>
@@ -1869,4 +1867,6 @@
<entry key="user.salutation.prof">Prof</entry>
<entry key="error.type.error">Fejl</entry>
<entry key="error.type.info">Meddelelse</entry>
+ <entry key="poll.type.yesNo">Ja/Nej</entry>
+ <entry key="poll.type.numeric">Numerisk 1-10</entry>
</properties>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
<entry key="23">Info: Jeder verbundene Benutzer erhält eine Nachricht mit der neuen Umfrage.</entry>
<entry key="24">Umfrage anlegen</entry>
<entry key="25">Abbrechen</entry>
- <entry key="26">Ja/Nein</entry>
- <entry key="27">Numerisch 1-10</entry>
<entry key="28">Umfrage</entry>
<entry key="29">Sie müssen Moderator/Lehrer in diesem Raum sein, um eine Umfrage anzulegen.</entry>
<entry key="30">Ihr Stimme wurde abgegeben.</entry>
@@ -1879,4 +1877,6 @@
<entry key="user.salutation.prof">Prof</entry>
<entry key="error.type.error">Fehler!</entry>
<entry key="error.type.info">Nachricht</entry>
+ <entry key="poll.type.yesNo">Ja/Nein</entry>
+ <entry key="poll.type.numeric">Numerisch 1-10</entry>
</properties>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.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>
@@ -1869,4 +1867,6 @@
<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/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
<entry key="23">Información: cada usuario conectado recibe un mensaje con la nueva encuesta.</entry>
<entry key="24">Crear encuesta</entry>
<entry key="25">Cancelar</entry>
- <entry key="26">SÃ/No</entry>
- <entry key="27">Valor numérico [1-10]</entry>
<entry key="28">Encuesta</entry>
<entry key="29">Se necesita ser moderador para crear una encuesta.</entry>
<entry key="30">Su voto ha sido registrado</entry>
@@ -1865,4 +1863,6 @@
<entry key="user.salutation.prof">Prof</entry>
<entry key="error.type.error">Error</entry>
<entry key="error.type.info">Mensaje</entry>
+ <entry key="poll.type.yesNo">SÃ/No</entry>
+ <entry key="poll.type.numeric">Valor numérico [1-10]</entry>
</properties>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.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>
@@ -1869,4 +1867,6 @@
<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/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
<entry key="23">Tiedoksi: Jokainen paikalla oleva käyttäjä vastaanottaa viestin kyselystä.</entry>
<entry key="24">Luo kysely</entry>
<entry key="25">Peruuta</entry>
- <entry key="26">Kyllä/Ei</entry>
- <entry key="27">Numeerinen 1-10</entry>
<entry key="28">Kysely</entry>
<entry key="29">Sinun täytyy olla moderaattori luodaksesi kysymyksen.</entry>
<entry key="30">Ãänesi on rekisteröity.</entry>
@@ -1869,4 +1867,6 @@
<entry key="prof">Prof</entry>
<entry key="error.type.error">Virhe</entry>
<entry key="error.type.info">Viesti</entry>
+ <entry key="poll.type.yesNo">Kyllä/Ei</entry>
+ <entry key="poll.type.numeric">Numeerinen 1-10</entry>
</properties>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
<entry key="23">Info : Chaque utilisateur reçoit le nouveau sondage.</entry>
<entry key="24">Créer un sondage</entry>
<entry key="25">Annuler</entry>
- <entry key="26">Oui/Non</entry>
- <entry key="27">Numérique 1-10</entry>
<entry key="28">Sondage</entry>
<entry key="29">Vous devez être modérateur pour créer un sondage.</entry>
<entry key="30">Votre vote est enregistré.</entry>
@@ -1835,4 +1833,6 @@
<entry key="user.salutation.prof">Prof</entry>
<entry key="error.type.error">Quitter</entry>
<entry key="error.type.info">Message</entry>
+ <entry key="poll.type.yesNo">Oui/Non</entry>
+ <entry key="poll.type.numeric">Numérique 1-10</entry>
</properties>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
<entry key="23">Información: Cada usuario conectado recibe unha mensaxe coa nova enquisa.</entry>
<entry key="24">Crear unha enquisa</entry>
<entry key="25">Cancelar</entry>
- <entry key="26">SÃ/Non</entry>
- <entry key="27">Valor numérico 1-10</entry>
<entry key="28">Enquisa</entry>
<entry key="29">Precisase ser moderador para crear unha enquisa.</entry>
<entry key="30">O seu voto foi rexistrado</entry>
@@ -1869,4 +1867,6 @@
<entry key="user.salutation.prof">Prof</entry>
<entry key="error.type.error">Erro</entry>
<entry key="error.type.info">Mensaxe</entry>
+ <entry key="poll.type.yesNo">SÃ/Non</entry>
+ <entry key="poll.type.numeric">Valor numérico 1-10</entry>
</properties>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
<entry key="23">Infó: Minden bejelentkezett felhasználó értesül az új szavazásról.</entry>
<entry key="24">Szavazás létrehozása</entry>
<entry key="25">Mégse</entry>
- <entry key="26">Igen/Nem</entry>
- <entry key="27">Szám 1-10</entry>
<entry key="28">Szavazás</entry>
<entry key="29">ElÅadónak kell lenned, hogy feltehess kérdést</entry>
<entry key="30">A szavazatot elfogadtuk.</entry>
@@ -1857,4 +1855,6 @@
<entry key="user.salutation.prof">Prof</entry>
<entry key="error.type.error">Hiba</entry>
<entry key="error.type.info">Ãzenet</entry>
+ <entry key="poll.type.yesNo">Igen/Nem</entry>
+ <entry key="poll.type.numeric">Szám 1-10</entry>
</properties>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
<entry key="23">Catatan: Setiap user terkoneksi akan menerima pesan dangan poling baru.</entry>
<entry key="24">Buat Poling</entry>
<entry key="25">Batal</entry>
- <entry key="26">Ya/Tidak</entry>
- <entry key="27">Angka dari 1-10</entry>
<entry key="28">Poling</entry>
<entry key="29">Hanya moderator yang bisa membuat pertanyaan</entry>
<entry key="30">Pilihan anda udah tercatat.</entry>
@@ -1869,4 +1867,6 @@
<entry key="user.salutation.prof">Prof</entry>
<entry key="error.type.error">Salah</entry>
<entry key="error.type.info">Pesan</entry>
+ <entry key="poll.type.yesNo">Ya/Tidak</entry>
+ <entry key="poll.type.numeric">Angka dari 1-10</entry>
</properties>