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/09 17:25:30 UTC
svn commit: r1713473 - in /openmeetings/branches/3.1.x:
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/
openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
openmeetings-db/src/main/java/org/apache/openmeet...
Author: solomax
Date: Mon Nov 9 16:25:30 2015
New Revision: 1713473
URL: http://svn.apache.org/viewvc?rev=1713473&view=rev
Log:
[OPENMEETINGS-1276] another round of renaming
Added:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java
- copied, changed from r1713274, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java
- copied, changed from r1713274, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java
Removed:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java Mon Nov 9 16:25:30 2015
@@ -36,7 +36,7 @@ import org.apache.openmeetings.db.dao.ro
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dto.basic.SearchResult;
import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.db.entity.room.RoomOrganisation;
+import org.apache.openmeetings.db.entity.room.RoomGroup;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -268,15 +268,15 @@ public class RoomManager {
return null;
}
- public List<RoomOrganisation> getOrganisationsByRoom(long rooms_id) {
+ public List<RoomGroup> getOrganisationsByRoom(long rooms_id) {
try {
String hql = "select c from RoomOrganisation as c "
+ "where c.room.rooms_id = :rooms_id "
+ "AND c.deleted = false";
- TypedQuery<RoomOrganisation> q = em.createQuery(hql, RoomOrganisation.class);
+ TypedQuery<RoomGroup> q = em.createQuery(hql, RoomGroup.class);
q.setParameter("rooms_id", rooms_id);
- List<RoomOrganisation> ll = q.getResultList();
+ List<RoomGroup> ll = q.getResultList();
return ll;
} catch (Exception ex2) {
log.error("[getOrganisationsByRoom] ", ex2);
@@ -336,9 +336,9 @@ public class RoomManager {
* @param typeId
* @return
*/
- public List<RoomOrganisation> getRoomGroupByGroupIdAndRoomType(long groupId, long typeId) {
+ public List<RoomGroup> getRoomGroupByGroupIdAndRoomType(long groupId, long typeId) {
try {
- TypedQuery<RoomOrganisation> q = em.createNamedQuery("getRoomGroupByGroupIdAndRoomType", RoomOrganisation.class);
+ TypedQuery<RoomGroup> q = em.createNamedQuery("getRoomGroupByGroupIdAndRoomType", RoomGroup.class);
q.setParameter("type", Room.Type.get(typeId));
q.setParameter("groupId", groupId);
return q.getResultList();
@@ -354,15 +354,15 @@ public class RoomManager {
* @param organisation_id
* @return list of Rooms_Organisation with Rooms as Sub-Objects or null
*/
- public List<RoomOrganisation> getRoomsOrganisationByOrganisationId(long organisation_id) {
+ public List<RoomGroup> getRoomsOrganisationByOrganisationId(long organisation_id) {
try {
- TypedQuery<RoomOrganisation> query = em.
- createNamedQuery("getRoomsOrganisationByOrganisationId", RoomOrganisation.class);
+ TypedQuery<RoomGroup> query = em.
+ createNamedQuery("getRoomsOrganisationByOrganisationId", RoomGroup.class);
query.setParameter("organisation_id", organisation_id);
query.setParameter("deleted", true);
- List<RoomOrganisation> ll = query.getResultList();
+ List<RoomGroup> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
@@ -371,11 +371,11 @@ public class RoomManager {
return null;
}
- public SearchResult<RoomOrganisation> getRoomsOrganisationsByOrganisationId(long organisation_id, int start, int max, String orderby,
+ public SearchResult<RoomGroup> getRoomsOrganisationsByOrganisationId(long organisation_id, int start, int max, String orderby,
boolean asc) {
try {
- SearchResult<RoomOrganisation> sResult = new SearchResult<RoomOrganisation>();
- sResult.setObjectName(RoomOrganisation.class.getName());
+ SearchResult<RoomGroup> sResult = new SearchResult<RoomGroup>();
+ sResult.setObjectName(RoomGroup.class.getName());
sResult.setRecords(this.selectMaxFromRoomsByOrganisation(
organisation_id).longValue());
sResult.setResult(getRoomsOrganisationByOrganisationId(organisation_id, start, max, orderby, asc));
@@ -389,11 +389,11 @@ public class RoomManager {
public Integer selectMaxFromRoomsByOrganisation(long organisation_id) {
try {
// get all users
- TypedQuery<RoomOrganisation> q = em.createNamedQuery("selectMaxFromRoomsByOrganisation", RoomOrganisation.class);
+ TypedQuery<RoomGroup> q = em.createNamedQuery("selectMaxFromRoomsByOrganisation", RoomGroup.class);
q.setParameter("organisation_id", organisation_id);
q.setParameter("deleted", true);
- List<RoomOrganisation> ll = q.getResultList();
+ List<RoomGroup> ll = q.getResultList();
return ll.size();
} catch (Exception ex2) {
@@ -411,7 +411,7 @@ public class RoomManager {
* @param asc
* @return
*/
- private List<RoomOrganisation> getRoomsOrganisationByOrganisationId(
+ private List<RoomGroup> getRoomsOrganisationByOrganisationId(
long organisation_id, int start, int max, String orderby,
boolean asc) {
try {
@@ -429,12 +429,12 @@ public class RoomManager {
hql += " DESC";
}
- TypedQuery<RoomOrganisation> q = em.createQuery(hql, RoomOrganisation.class);
+ TypedQuery<RoomGroup> q = em.createQuery(hql, RoomGroup.class);
q.setParameter("organisation_id", organisation_id);
q.setFirstResult(start);
q.setMaxResults(max);
- List<RoomOrganisation> ll = q.getResultList();
+ List<RoomGroup> ll = q.getResultList();
return ll;
} catch (Exception ex2) {
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java Mon Nov 9 16:25:30 2015
@@ -38,7 +38,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Room.Type;
import org.apache.openmeetings.db.entity.room.RoomModerator;
-import org.apache.openmeetings.db.entity.room.RoomOrganisation;
+import org.apache.openmeetings.db.entity.room.RoomGroup;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -67,14 +67,14 @@ public class ConferenceService {
@Autowired
private ISessionManager sessionManager = null;
- public List<RoomOrganisation> getRoomsByOrganisationWithoutType(String SID, long organisation_id) {
+ public List<RoomGroup> getRoomsByOrganisationWithoutType(String SID, long organisation_id) {
try {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
log.debug("getRoomsByOrganisationAndType");
- List<RoomOrganisation> roomOrgsList = roomManager.getRoomsOrganisationByOrganisationId(organisation_id);
+ List<RoomGroup> roomOrgsList = roomManager.getRoomsOrganisationByOrganisationId(organisation_id);
- for (RoomOrganisation roomOrg : roomOrgsList) {
+ for (RoomGroup roomOrg : roomOrgsList) {
roomOrg.getRoom().setCurrentusers(sessionManager.getClientListByRoom(roomOrg.getRoom().getId()));
}
@@ -94,7 +94,7 @@ public class ConferenceService {
* @param organisation_id
* @return - all rooms of an organization
*/
- public SearchResult<RoomOrganisation> getRoomsByOrganisation(String SID,
+ public SearchResult<RoomGroup> getRoomsByOrganisation(String SID,
long organisation_id, int start, int max, String orderby,
boolean asc) {
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java Mon Nov 9 16:25:30 2015
@@ -46,7 +46,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.log.ConferenceLog;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.db.entity.room.RoomOrganisation;
+import org.apache.openmeetings.db.entity.room.RoomGroup;
import org.apache.openmeetings.db.entity.server.RemoteSessionObject;
import org.apache.openmeetings.db.entity.server.SOAPLogin;
import org.apache.openmeetings.db.entity.server.Sessiondata;
@@ -196,7 +196,7 @@ public class MainService implements IPen
allowed = r.getIspublic() || (r.getOwnerId() != null && r.getOwnerId().equals(userId));
log.debug("[loginWicket] public ? " + r.getIspublic() + ", ownedId ? " + r.getOwnerId() + " " + allowed);
if (!allowed) {
- for (RoomOrganisation ro : r.getRoomOrganisations()) {
+ for (RoomGroup ro : r.getRoomGroups()) {
for (Organisation_Users ou : u.getOrganisation_users()) {
if (ro.getOrganisation().getId().equals(ou.getOrganisation().getId())) {
allowed = true;
@@ -298,10 +298,10 @@ public class MainService implements IPen
SOAPLogin returnSoapLogin = new SOAPLogin();
- returnSoapLogin.setRoom_id(soapLogin.getRoom_id());
+ returnSoapLogin.setRoomId(soapLogin.getRoomId());
returnSoapLogin.setBecomemoderator(soapLogin.getBecomemoderator());
returnSoapLogin.setShowAudioVideoTest(soapLogin.getShowAudioVideoTest());
- returnSoapLogin.setRoomRecordingId(soapLogin.getRoomRecordingId());
+ returnSoapLogin.setRecordingId(soapLogin.getRecordingId());
returnSoapLogin.setShowNickNameDialog(soapLogin.getShowNickNameDialog());
returnSoapLogin.setLandingZone(soapLogin.getLandingZone());
Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java (from r1713274, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java&r1=1713274&r2=1713473&rev=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java Mon Nov 9 16:25:30 2015
@@ -24,19 +24,19 @@ import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import org.apache.openmeetings.db.entity.room.RoomOrganisation;
+import org.apache.openmeetings.db.entity.room.RoomGroup;
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class RoomOrganisationDao {
+public class RoomGroupDao {
@PersistenceContext
private EntityManager em;
- public List<RoomOrganisation> get() {
- return em.createNamedQuery("getAllRoomsOrganisations", RoomOrganisation.class).getResultList();
+ public List<RoomGroup> get() {
+ return em.createNamedQuery("getAllRoomGroups", RoomGroup.class).getResultList();
}
- public RoomOrganisation update(RoomOrganisation entity, Long userId) {
+ public RoomGroup update(RoomGroup entity, Long userId) {
if (entity.getId() == null) {
entity.setInserted(new Date());
em.persist(entity);
@@ -47,8 +47,8 @@ public class RoomOrganisationDao {
return entity;
}
- public RoomOrganisation get(long groupId, long roomId) {
- List<RoomOrganisation> ll = em.createNamedQuery("getRoomGroupByGroupIdAndRoomId", RoomOrganisation.class)
+ public RoomGroup get(long groupId, long roomId) {
+ List<RoomGroup> ll = em.createNamedQuery("getRoomGroupByGroupIdAndRoomId", RoomGroup.class)
.setParameter("roomId", roomId)
.setParameter("groupId", groupId)
.getResultList();
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java Mon Nov 9 16:25:30 2015
@@ -67,7 +67,7 @@ public class LdapConfigDao implements ID
ldapConfig.setConfigFileName(configFileName);
ldapConfig.setDeleted(false);
ldapConfig.setDomain(domain);
- ldapConfig.setIsActive(isActive);
+ ldapConfig.setActive(isActive);
ldapConfig.setName(name);
ldapConfig.setInserted(new Date());
if (insertedby != null) {
@@ -128,7 +128,7 @@ public class LdapConfigDao implements ID
ldapConfig.setConfigFileName(configFileName);
ldapConfig.setDeleted(false);
ldapConfig.setDomain(domain);
- ldapConfig.setIsActive(isActive);
+ ldapConfig.setActive(isActive);
ldapConfig.setName(name);
ldapConfig.setUpdated(new Date());
if (updatedby != null) {
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java Mon Nov 9 16:25:30 2015
@@ -53,10 +53,10 @@ public class SOAPLoginDao {
SOAPLogin soapLogin = new SOAPLogin();
soapLogin.setCreated(new Date());
soapLogin.setUsed(false);
- soapLogin.setRoom_id(room_id);
+ soapLogin.setRoomId(room_id);
soapLogin.setAllowSameURLMultipleTimes(allowSameURLMultipleTimes);
soapLogin.setHash(hash);
- soapLogin.setRoomRecordingId(recording_id);
+ soapLogin.setRecordingId(recording_id);
soapLogin.setSessionHash(sessionHash);
soapLogin.setBecomemoderator(becomemoderator);
soapLogin.setShowAudioVideoTest(showAudioVideoTest);
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java Mon Nov 9 16:25:30 2015
@@ -44,12 +44,12 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getChatMessageById", query = "SELECT c FROM ChatMessage c WHERE c.id = :id")
, @NamedQuery(name = "getChatMessages", query = "SELECT c FROM ChatMessage c ORDER BY c.id")
, @NamedQuery(name = "getGlobalChatMessages", query = "SELECT c FROM ChatMessage c WHERE c.toUser IS NULL AND c.toRoom IS NULL ORDER BY c.sent DESC")
- , @NamedQuery(name = "getChatMessagesByRoom", query = "SELECT c FROM ChatMessage c WHERE c.toUser.id IS NULL AND c.toRoom.id = :roomId"
+ , @NamedQuery(name = "getChatMessagesByRoom", query = "SELECT c FROM ChatMessage c WHERE c.toUser.user_id IS NULL AND c.toRoom.rooms_id = :roomId"
+ " AND (true = :all OR (false = :all AND c.needModeration = false)) ORDER BY c.sent DESC")
, @NamedQuery(name = "getChatMessagesByUser", query = "SELECT c FROM ChatMessage c WHERE c.toUser IS NOT NULL AND c.toRoom IS NULL AND "
- + "(c.fromUser.id = :userId OR c.toUser.id = :userId) ORDER BY c.sent DESC")
+ + "(c.fromUser.user_id = :userId OR c.toUser.user_id = :userId) ORDER BY c.sent DESC")
, @NamedQuery(name = "getChatMessagesByUserTime", query = "SELECT c FROM ChatMessage c WHERE c.toUser IS NOT NULL AND c.toRoom IS NULL AND "
- + "(c.fromUser.id = :userId OR c.toUser.id = :userId) AND c.sent > :date ORDER BY c.sent DESC")
+ + "(c.fromUser.user_id = :userId OR c.toUser.user_id = :userId) AND c.sent > :date ORDER BY c.sent DESC")
})
@Table(name = "chat")
@Root(name = "ChatMessage")
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java Mon Nov 9 16:25:30 2015
@@ -56,6 +56,7 @@ import org.simpleframework.xml.Root;
@Root(name = "config")
public class Configuration implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Mon Nov 9 16:25:30 2015
@@ -54,28 +54,27 @@ import org.simpleframework.xml.Root;
@Entity
@FetchGroups({
- @FetchGroup(name = "roomModerators", attributes = { @FetchAttribute(name = "moderators"), @FetchAttribute(name = "roomOrganisations") })
+ @FetchGroup(name = "roomModerators", attributes = { @FetchAttribute(name = "moderators"), @FetchAttribute(name = "roomGroups") })
})
@NamedQueries({
@NamedQuery(name = "getNondeletedRooms", query = "SELECT r FROM Room r WHERE r.deleted = false"),
- @NamedQuery(name = "getPublicRooms", query = "SELECT r from Room r WHERE r.ispublic = true and r.deleted = false and r.roomtype.roomtypes_id = :typeId"),
- @NamedQuery(name = "getRoomByOwnerAndTypeId", query = "select c from Room as c "
- + "where c.ownerId = :ownerId "
- + "AND c.roomtype.roomtypes_id = :roomtypesId "
- + "AND c.deleted = false"),
+ @NamedQuery(name = "getPublicRooms", query = "SELECT r from Room r WHERE r.ispublic = true and r.deleted = false and r.type = :type"),
+ @NamedQuery(name = "getRoomByOwnerAndTypeId", query = "select c from Room as c where c.ownerId = :ownerId "
+ + "AND c.type = :type AND c.deleted = false"),
@NamedQuery(name = "selectMaxFromRooms", query = "select count(c.rooms_id) from Room c "
+ "where c.deleted = false AND c.name LIKE :search "),
- @NamedQuery(name = "getRoomByExternalId", query = "select c from Room as c JOIN c.roomtype as rt "
- + "where c.externalRoomId = :externalRoomId AND c.externalRoomType = :externalRoomType "
- + "AND rt.roomtypes_id = :roomtypes_id AND c.deleted = false"),
+ @NamedQuery(name = "getRoomByExternalId", query = "select r from Room as r "
+ + "where r.externalRoomId = :externalId AND c.externalRoomType = :externalType "
+ + "AND r.type = :type AND c.deleted = false"),
@NamedQuery(name = "getPublicRoomsOrdered", query = "SELECT r from Room r WHERE r.ispublic= true AND r.deleted= false AND r.appointment = false ORDER BY r.name ASC"),
@NamedQuery(name = "getRoomById", query = "SELECT r FROM Room r WHERE r.deleted = false AND r.rooms_id = :id"),
+ @NamedQuery(name = "getRoomsByIds", query = "SELECT r FROM Room r WHERE r.deleted = false AND r.rooms_id IN :ids"),
@NamedQuery(name = "getSipRoomIdsByIds", query = "SELECT r.rooms_id FROM Room r WHERE r.deleted = false AND r.sipEnabled = true AND r.rooms_id IN :ids"),
@NamedQuery(name = "countRooms", query = "SELECT COUNT(r) FROM Room r WHERE r.deleted = false"),
@NamedQuery(name = "getBackupRooms", query = "SELECT r FROM Room r ORDER BY r.rooms_id"),
@NamedQuery(name = "getRoomsCapacityByIds", query = "SELECT SUM(r.numberOfPartizipants) FROM Room r WHERE r.deleted = false AND r.rooms_id IN :ids")
- , @NamedQuery(name = "getOrganisationRooms", query = "SELECT DISTINCT c.room FROM RoomOrganisation c LEFT JOIN FETCH c.room "
+ , @NamedQuery(name = "getGroupRooms", query = "SELECT DISTINCT c.room FROM RoomGroup c LEFT JOIN FETCH c.room "
+ "WHERE c.organisation.organisation_id = :orgId AND c.deleted = false AND c.room.deleted = false AND c.room.appointment = false "
+ "AND c.organisation.deleted = false ORDER BY c.room.name ASC")
})
@@ -299,7 +298,7 @@ public class Room implements IDataProvid
@JoinColumn(name = "room_id", insertable = true, updatable = true)
@ElementDependent
@org.simpleframework.xml.Transient
- private List<RoomOrganisation> roomOrganisations = new ArrayList<RoomOrganisation>();
+ private List<RoomGroup> roomGroups = new ArrayList<RoomGroup>();
@Transient
private List<Client> currentusers;
@@ -578,12 +577,12 @@ public class Room implements IDataProvid
this.chatModerated = chatModerated;
}
- public List<RoomOrganisation> getRoomOrganisations() {
- return roomOrganisations;
+ public List<RoomGroup> getRoomGroups() {
+ return roomGroups;
}
- public void setRoomOrganisations(List<RoomOrganisation> roomOrganisations) {
- this.roomOrganisations = roomOrganisations;
+ public void setRoomGroups(List<RoomGroup> roomGroups) {
+ this.roomGroups = roomGroups;
}
public boolean isChatOpened() {
Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java (from r1713274, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java)
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java&r1=1713274&r2=1713473&rev=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java Mon Nov 9 16:25:30 2015
@@ -40,50 +40,65 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name = "getAllRoomsOrganisations", query = "select ro from RoomOrganisation ro ORDER BY ro.rooms_organisation_id"),
- @NamedQuery(name = "getRoomGroupByGroupIdAndRoomId", query = "select c from RoomOrganisation as c "
+ @NamedQuery(name = "getAllRoomGroups", query = "select ro from RoomGroup ro ORDER BY ro.id"),
+ @NamedQuery(name = "getRoomGroupByGroupIdAndRoomType", query = "select c from RoomGroup as c "
+ + "where c.room.type = :type AND c.organisation.organisation_id = :groupId "
+ + "AND c.deleted = false"),
+ @NamedQuery(name = "getRoomGroupByGroupId", query = "SELECT c FROM RoomGroup c "
+ + "LEFT JOIN FETCH c.room "
+ + "WHERE c.organisation.organisation_id = :groupId "
+ + "AND c.deleted = false AND c.room.deleted = false AND c.room.appointment = false "
+ + "AND c.group.deleted = false "
+ + "ORDER BY c.room.name ASC"),
+ @NamedQuery(name = "selectMaxFromRoomsByGroup", query = "select c from RoomGroup as c "
+ + "where c.organisation.organisation_id = :groupId "
+ + "AND c.deleted = false"),
+ @NamedQuery(name = "getRoomGroupByGroupIdAndRoomId", query = "select c from RoomGroup as c "
+ "where c.room.rooms_id = :roomId "
+ "AND c.organisation.organisation_id = :groupId "
+ "AND c.deleted = false"),
+ @NamedQuery(name = "getRoomGroupByRoomsId", query = "select c from RoomGroup as c "
+ + "where c.room.rooms_id = :roomId "
+ + "AND c.deleted = false")
})
-@Table(name = "rooms_organisation")
+@Table(name = "room_group")
@Root(name="room_organisation")
-public class RoomOrganisation implements IDataProviderEntity {
- private static final long serialVersionUID = 4153935045968138984L;
+public class RoomGroup implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="id")
- @Element(data=true)
- private Long rooms_organisation_id;
+ @Column(name = "id")
+ @Element(data = true, name = "rooms_organisation_id")
+ private Long id;
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name="rooms_id", nullable=true)
+ @JoinColumn(name="room_id", nullable=true)
@ForeignKey(enabled = true)
@Element(name="rooms_id", data=true, required=false)
private Room room;
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name="organisation_id", nullable=true)
+ @JoinColumn(name="group_id", nullable=true)
@ForeignKey(enabled = true)
@Element(name="organisation_id", data=true, required=false)
private Organisation organisation;
- @Column(name = "starttime")
- private Date starttime;
+ @Column(name = "inserted")
+ private Date inserted;
- @Column(name = "updatetime")
- private Date updatetime;
+ @Column(name = "updated")
+ private Date updated;
@Column(name = "deleted")
@Element(data=true)
private boolean deleted;
- public RoomOrganisation(Organisation org, Room room) {
+ public RoomGroup(Organisation org, Room room) {
this.organisation = org;
this.room = room;
}
- public RoomOrganisation() {
+ public RoomGroup() {
}
public Organisation getOrganisation() {
@@ -101,24 +116,24 @@ public class RoomOrganisation implements
}
public Long getId() {
- return rooms_organisation_id;
+ return id;
}
public void setId(Long id) {
- this.rooms_organisation_id = id;
+ this.id = id;
}
public Date getInserted() {
- return starttime;
+ return inserted;
}
public void setInserted(Date inserted) {
- this.starttime = inserted;
+ this.inserted = inserted;
}
public Date getUpdated() {
- return updatetime;
+ return updated;
}
public void setUpdated(Date updated) {
- this.updatetime = updated;
+ this.updated = updated;
}
public boolean isDeleted() {
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java Mon Nov 9 16:25:30 2015
@@ -42,7 +42,9 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
@NamedQuery(name="getNondeletedLdapConfigs", query="SELECT u FROM LdapConfig u WHERE u.deleted = false")
- , @NamedQuery(name="getActiveLdapConfigs", query="SELECT c FROM LdapConfig c WHERE c.deleted = false AND c.isActive = :isActive ORDER BY c.ldapConfigId")
+ , @NamedQuery(name="getLdapConfigById", query="SELECT c FROM LdapConfig c WHERE c.id = :id AND c.deleted = false")
+ , @NamedQuery(name="countNondeletedLdapConfigs", query="SELECT COUNT(c.id) FROM LdapConfig c WHERE c.deleted = false")
+ , @NamedQuery(name="getActiveLdapConfigs", query="SELECT c FROM LdapConfig c WHERE c.deleted = false AND c.active = :isActive ORDER BY c.id")
})
@Table(name = "ldapconfig")
@Root(name="ldapconfig")
@@ -50,126 +52,137 @@ public class LdapConfig implements IData
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="id")
- private Long ldapConfigId;
-
- @Column(name="name")
- @Element(data=true)
+ @Column(name = "id")
+ private Long id;
+
+ @Column(name = "name")
+ @Element(data = true)
private String name;
-
- @Column(name="config_file_name")
- @Element(data=true, required = false)
+
+ @Column(name = "config_file_name")
+ @Element(data = true, required = false)
private String configFileName;
-
- @Column(name="add_domain_to_user_name")
- @Element(data=true)
+
+ @Column(name = "add_domain_to_user_name")
+ @Element(data = true)
private boolean addDomainToUserName;
-
- @Column(name="domain")
- @Element(data=true, required = false)
+
+ @Column(name = "domain")
+ @Element(data = true, required = false)
private String domain;
-
- @Column(name="is_active")
- @Element(data=true)
- private boolean isActive;
-
- @Column(name="inserted")
+
+ @Column(name = "is_active")
+ @Element(data = true, name = "isActive")
+ private boolean active;
+
+ @Column(name = "inserted")
private Date inserted;
-
- @Column(name="updated")
+
+ @Column(name = "updated")
private Date updated;
-
+
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name="insertedby_id", updatable=true, insertable=true)
+ @JoinColumn(name = "insertedby_id", updatable = true, insertable = true)
@ForeignKey(enabled = true)
private User insertedby;
-
+
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name="updatedby_id", updatable=true, insertable=true)
+ @JoinColumn(name = "updatedby_id", updatable = true, insertable = true)
@ForeignKey(enabled = true)
private User updatedby;
-
- @Column(name="deleted")
+
+ @Column(name = "deleted")
private boolean deleted;
-
+
@Lob
@Column(name = "comment_field", length = 2048)
@Element(data = true, required = false)
private String comment;
public Long getId() {
- return ldapConfigId;
+ return id;
}
+
public void setId(Long id) {
- this.ldapConfigId = id;
+ this.id = id;
}
-
+
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
-
+
public String getConfigFileName() {
return configFileName;
}
+
public void setConfigFileName(String configFileName) {
this.configFileName = configFileName;
}
-
+
public boolean getAddDomainToUserName() {
return addDomainToUserName;
}
+
public void setAddDomainToUserName(boolean addDomainToUserName) {
this.addDomainToUserName = addDomainToUserName;
}
-
+
public String getDomain() {
return domain;
}
+
public void setDomain(String domain) {
this.domain = domain;
}
-
- public boolean getIsActive() {
- return isActive;
+
+ public boolean isActive() {
+ return active;
}
- public void setIsActive(boolean isActive) {
- this.isActive = isActive;
+
+ public void setActive(boolean active) {
+ this.active = active;
}
-
+
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 User getInsertedby() {
return insertedby;
}
+
public void setInsertedby(User insertedby) {
this.insertedby = insertedby;
}
-
+
public User getUpdatedby() {
return updatedby;
}
+
public void setUpdatedby(User updatedby) {
this.updatedby = updatedby;
}
-
- public boolean getDeleted() {
+
+ public boolean isDeleted() {
return deleted;
}
+
public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java Mon Nov 9 16:25:30 2015
@@ -18,8 +18,6 @@
*/
package org.apache.openmeetings.db.entity.server;
-import java.io.Serializable;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
@@ -36,14 +34,14 @@ import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
-@Table(name = "oauth_servers")
+@Table(name = "oauth_server")
@NamedQueries({
@NamedQuery(name = "getEnabledOAuthServers", query = "select s from OAuthServer as s where s.enabled = true and s.deleted = false"),
@NamedQuery(name = "getOAuthServerById", query = "select s from OAuthServer as s where s.id = :id"),
@NamedQuery(name = "getAllOAuthServers", query = "SELECT s FROM OAuthServer s WHERE s.deleted = false ORDER BY s.id"),
@NamedQuery(name = "countOAuthServers", query = "select count(s) from OAuthServer s WHERE s.deleted = false") })
@Root
-public class OAuthServer implements Serializable, IDataProviderEntity {
+public class OAuthServer 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/server/SOAPLogin.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java Mon Nov 9 16:25:30 2015
@@ -70,7 +70,7 @@ public class SOAPLogin implements Serial
@Column(name="client_url")
private String clientURL;
- @Column(name="room_recording_id")
+ @Column(name="recording_id")
private Long roomRecordingId;
@Column(name="landing_zone")
@@ -93,11 +93,11 @@ public class SOAPLogin implements Serial
this.hash = hash;
}
- 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 String getSessionHash() {
@@ -163,11 +163,11 @@ public class SOAPLogin implements Serial
this.clientURL = clientURL;
}
- public Long getRoomRecordingId() {
+ public Long getRecordingId() {
return roomRecordingId;
}
- public void setRoomRecordingId(Long roomRecordingId) {
- this.roomRecordingId = roomRecordingId;
+ public void setRecordingId(Long recordingId) {
+ this.roomRecordingId = recordingId;
}
public String getLandingZone() {
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=1713473&r1=1713472&r2=1713473&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 Mon Nov 9 16:25:30 2015
@@ -46,7 +46,7 @@ import org.apache.openmeetings.db.dao.fi
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.dao.room.PollDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
-import org.apache.openmeetings.db.dao.room.RoomOrganisationDao;
+import org.apache.openmeetings.db.dao.room.RoomGroupDao;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
import org.apache.openmeetings.db.dao.server.OAuth2Dao;
import org.apache.openmeetings.db.dao.server.ServerDao;
@@ -135,7 +135,7 @@ public class BackupExport {
@Autowired
private RoomDao roomDao;
@Autowired
- private RoomOrganisationDao roomOrganisationDao;
+ private RoomGroupDao roomOrganisationDao;
public void performExport(File filePath, File backup_dir, boolean includeFiles, ProgressHolder progressHolder) throws Exception {
if (!backup_dir.exists()) {
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=1713473&r1=1713472&r2=1713473&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 Mon Nov 9 16:25:30 2015
@@ -63,7 +63,7 @@ import org.apache.openmeetings.db.dao.fi
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.dao.room.PollDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
-import org.apache.openmeetings.db.dao.room.RoomOrganisationDao;
+import org.apache.openmeetings.db.dao.room.RoomGroupDao;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
import org.apache.openmeetings.db.dao.server.OAuth2Dao;
import org.apache.openmeetings.db.dao.server.ServerDao;
@@ -84,7 +84,7 @@ import org.apache.openmeetings.db.entity
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.RoomOrganisation;
+import org.apache.openmeetings.db.entity.room.RoomGroup;
import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.apache.openmeetings.db.entity.room.RoomPollAnswer;
import org.apache.openmeetings.db.entity.server.LdapConfig;
@@ -160,7 +160,7 @@ public class BackupImport {
@Autowired
private OAuth2Dao auth2Dao;
@Autowired
- private RoomOrganisationDao roomOrganisationDao;
+ private RoomGroupDao roomOrganisationDao;
private final Map<Long, Long> usersMap = new HashMap<Long, Long>();
private final Map<Long, Long> organisationsMap = new HashMap<Long, Long>();
@@ -354,8 +354,8 @@ public class BackupImport {
registry.bind(Organisation.class, new OrganisationConverter(orgDao, organisationsMap));
registry.bind(Room.class, new RoomConverter(roomDao, roomsMap));
- List<RoomOrganisation> list = readList(serializer, f, "rooms_organisation.xml", "room_organisations", RoomOrganisation.class);
- for (RoomOrganisation ro : list) {
+ List<RoomGroup> list = readList(serializer, f, "rooms_organisation.xml", "room_organisations", RoomGroup.class);
+ for (RoomGroup ro : list) {
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);
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=1713473&r1=1713472&r2=1713473&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 Mon Nov 9 16:25:30 2015
@@ -66,7 +66,7 @@ import org.apache.openmeetings.db.dao.us
import org.apache.openmeetings.db.entity.basic.ErrorValue;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Room.Type;
-import org.apache.openmeetings.db.entity.room.RoomOrganisation;
+import org.apache.openmeetings.db.entity.room.RoomGroup;
import org.apache.openmeetings.db.entity.server.OAuthServer;
import org.apache.openmeetings.db.entity.server.OAuthServer.RequestMethod;
import org.apache.openmeetings.db.entity.user.Organisation;
@@ -456,7 +456,7 @@ public class ImportInitvalues {
r.setHideScreenSharing(false);
r.setHideWhiteboard(false);
if (groupId != null) {
- RoomOrganisation ro = new RoomOrganisation();
+ RoomGroup ro = new RoomGroup();
ro.setRoom(r);
ro.setOrganisation(groupDao.get(groupId));
ro.setInserted(new Date());
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Mon Nov 9 16:25:30 2015
@@ -35,7 +35,7 @@ import org.apache.openmeetings.db.dao.us
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomModerator;
-import org.apache.openmeetings.db.entity.room.RoomOrganisation;
+import org.apache.openmeetings.db.entity.room.RoomGroup;
import org.apache.openmeetings.db.entity.user.Address;
import org.apache.openmeetings.db.entity.user.Organisation;
import org.apache.openmeetings.db.entity.user.User;
@@ -111,27 +111,27 @@ public class RoomForm extends AdminBaseF
add(new CheckBox("ispublic"));
List<Organisation> orgList = Application.getBean(OrganisationDao.class).get(0, Integer.MAX_VALUE);
- final List<RoomOrganisation> orgRooms = new ArrayList<RoomOrganisation>(orgList.size());
+ final List<RoomGroup> orgRooms = new ArrayList<RoomGroup>(orgList.size());
for (Organisation org : orgList) {
- orgRooms.add(new RoomOrganisation(org, getModelObject()));
+ orgRooms.add(new RoomGroup(org, getModelObject()));
}
- add(new Select2MultiChoice<RoomOrganisation>("roomOrganisations", null, new TextChoiceProvider<RoomOrganisation>() {
+ add(new Select2MultiChoice<RoomGroup>("roomOrganisations", null, new TextChoiceProvider<RoomGroup>() {
private static final long serialVersionUID = 1L;
@Override
- protected String getDisplayText(RoomOrganisation choice) {
+ protected String getDisplayText(RoomGroup choice) {
String name = choice.getOrganisation().getName();
return name == null ? "" : name;
}
@Override
- protected Object getId(RoomOrganisation choice) {
+ protected Object getId(RoomGroup choice) {
return choice.getOrganisation().getId();
}
@Override
- public void query(String term, int page, Response<RoomOrganisation> response) {
- for (RoomOrganisation or : orgRooms) {
+ public void query(String term, int page, Response<RoomGroup> response) {
+ for (RoomGroup or : orgRooms) {
if (Strings.isEmpty(term) || (!Strings.isEmpty(term) && or.getOrganisation().getName().contains(term))) {
response.add(or);
}
@@ -139,14 +139,14 @@ public class RoomForm extends AdminBaseF
}
@Override
- public Collection<RoomOrganisation> toChoices(Collection<String> _ids) {
+ public Collection<RoomGroup> toChoices(Collection<String> _ids) {
List<Long> ids = new ArrayList<Long>();
for (String id : _ids) {
ids.add(Long.parseLong(id));
}
- List<RoomOrganisation> list = new ArrayList<RoomOrganisation>();
+ List<RoomGroup> list = new ArrayList<RoomGroup>();
for (Organisation o : getBean(OrganisationDao.class).get(ids)) {
- list.add(new RoomOrganisation(o, RoomForm.this.getModelObject()));
+ list.add(new RoomGroup(o, RoomForm.this.getModelObject()));
}
return list;
}
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java Mon Nov 9 16:25:30 2015
@@ -228,7 +228,7 @@ public class WebSession extends Abstract
sessionDao.updateUser(SID, user.getId());
setUser(user);
- recordingId = soapLogin.getRoomRecordingId();
+ recordingId = soapLogin.getRecordingId();
return true;
}
}
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java Mon Nov 9 16:25:30 2015
@@ -39,7 +39,7 @@ public class SwfPage extends BaseNotInit
StringValue shash = pp.get(SECURE_HASH);
if (!shash.isEmpty()) {
SOAPLogin soapLogin = getBean(SOAPLoginDao.class).get(shash.toString());
- Long roomId = soapLogin.getRoom_id();
+ Long roomId = soapLogin.getRoomId();
if (roomId != null) {
pp = pp.mergeWith(RoomPanel.addServer(roomId, false));
}
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Mon Nov 9 16:25:30 2015
@@ -148,7 +148,7 @@ public class RoomPanel extends BasePanel
if (!room.isEmpty()) {
roomId = room.toLong();
} else if (!secureHash.isEmpty()) {
- roomId = getBean(SOAPLoginDao.class).get(secureHash.toString()).getRoom_id();
+ roomId = getBean(SOAPLoginDao.class).get(secureHash.toString()).getRoomId();
} else if (!invitationHash.isEmpty()) {
roomId = getBean(InvitationDao.class).getInvitationByHashCode(invitationHash.toString(), true).getRoom().getId();
}
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=1713473&r1=1713472&r2=1713473&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 Mon Nov 9 16:25:30 2015
@@ -50,7 +50,7 @@
<class>org.apache.openmeetings.db.entity.room.Client</class>
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
- <class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
<class>org.apache.openmeetings.db.entity.user.Address</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=1713473&r1=1713472&r2=1713473&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 Mon Nov 9 16:25:30 2015
@@ -50,7 +50,7 @@
<class>org.apache.openmeetings.db.entity.room.Client</class>
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
- <class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
<class>org.apache.openmeetings.db.entity.user.Address</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=1713473&r1=1713472&r2=1713473&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 Mon Nov 9 16:25:30 2015
@@ -51,7 +51,7 @@
<class>org.apache.openmeetings.db.entity.room.Room</class>
<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
- <class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
<class>org.apache.openmeetings.db.entity.user.Address</class>
<class>org.apache.openmeetings.db.entity.user.State</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessage</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=1713473&r1=1713472&r2=1713473&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 Mon Nov 9 16:25:30 2015
@@ -50,7 +50,7 @@
<class>org.apache.openmeetings.db.entity.room.Client</class>
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
- <class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
<class>org.apache.openmeetings.db.entity.user.Address</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=1713473&r1=1713472&r2=1713473&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 Mon Nov 9 16:25:30 2015
@@ -50,7 +50,7 @@
<class>org.apache.openmeetings.db.entity.room.Client</class>
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
- <class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
<class>org.apache.openmeetings.db.entity.user.Address</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=1713473&r1=1713472&r2=1713473&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 Mon Nov 9 16:25:30 2015
@@ -50,7 +50,7 @@
<class>org.apache.openmeetings.db.entity.room.Client</class>
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
- <class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
<class>org.apache.openmeetings.db.entity.user.Address</class>
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Mon Nov 9 16:25:30 2015
@@ -224,7 +224,7 @@
<bean id="sessionManagement" class="org.apache.openmeetings.db.dao.server.SessiondataDao" />
<bean id="userManagement" class="org.apache.openmeetings.service.user.UserManager" />
<bean id="roomModeratorDao" class="org.apache.openmeetings.db.dao.room.RoomModeratorDao" />
- <bean id="roomOrganisationDao" class="org.apache.openmeetings.db.dao.room.RoomOrganisationDao"/>
+ <bean id="roomGroupDao" class="org.apache.openmeetings.db.dao.room.RoomGroupDao"/>
<bean id="conferenceLogDao" class="org.apache.openmeetings.db.dao.log.ConferenceLogDao" />
<bean id="emailManagement" class="org.apache.openmeetings.service.mail.EmailManager" />
<bean id="fileExplorerItemDao" class="org.apache.openmeetings.db.dao.file.FileExplorerItemDao" />
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java Mon Nov 9 16:25:30 2015
@@ -31,7 +31,7 @@ import org.apache.openmeetings.backup.Ba
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
-import org.apache.openmeetings.db.dao.room.RoomOrganisationDao;
+import org.apache.openmeetings.db.dao.room.RoomGroupDao;
import org.apache.openmeetings.db.dao.user.OrganisationDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
@@ -56,7 +56,7 @@ public class TestOldBackups extends Abst
@Autowired
private MeetingMemberDao meetingMemberDao;
@Autowired
- private RoomOrganisationDao roomOrganisationDao;
+ private RoomGroupDao roomOrganisationDao;
@Test
public void importOldVersions() {
Modified: openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java?rev=1713473&r1=1713472&r2=1713473&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java Mon Nov 9 16:25:30 2015
@@ -43,7 +43,7 @@ import org.apache.openmeetings.db.dto.ba
import org.apache.openmeetings.db.dto.basic.ServiceResult.Type;
import org.apache.openmeetings.db.dto.user.UserSearchResult;
import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.db.entity.room.RoomOrganisation;
+import org.apache.openmeetings.db.entity.room.RoomGroup;
import org.apache.openmeetings.db.entity.user.Organisation;
import org.apache.openmeetings.db.entity.user.Organisation_Users;
import org.apache.openmeetings.db.entity.user.User;
@@ -164,17 +164,17 @@ public class GroupWebService {
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
Room r = roomDao.get(roomid);
if (r != null) {
- if (r.getRoomOrganisations() == null) {
- r.setRoomOrganisations(new ArrayList<RoomOrganisation>());
+ if (r.getRoomGroups() == null) {
+ r.setRoomGroups(new ArrayList<RoomGroup>());
}
boolean found = false;
- for (RoomOrganisation ro : r.getRoomOrganisations()) {
+ for (RoomGroup ro : r.getRoomGroups()) {
if (ro.getOrganisation().getId().equals(id)) {
found = true;
}
}
if (!found) {
- r.getRoomOrganisations().add(new RoomOrganisation(groupDao.get(id), r));
+ r.getRoomGroups().add(new RoomGroup(groupDao.get(id), r));
roomDao.update(r, userId);
return new ServiceResult(1L, "Success", Type.SUCCESS);
}