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 2014/10/06 18:48:58 UTC
svn commit: r1629710 [1/2] - in /openmeetings/trunk/singlewebapp:
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/
openmeetings-core/src...
Author: solomax
Date: Mon Oct 6 16:48:57 2014
New Revision: 1629710
URL: http://svn.apache.org/r1629710
Log:
Code clean-up: classes, fields and db tables are better named
Added:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java
- copied, changed from r1629707, openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderTyps.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java
- copied, changed from r1629691, openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java
Removed:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderTyps.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomTypeDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java Mon Oct 6 16:48:57 2014
@@ -111,7 +111,7 @@ public class AppointmentLogic {
throw new Exception("Room does not exist in database!");
}
- if (!room.getAppointment()) {
+ if (!room.isAppointment()) {
throw new Exception("Room " + room.getName() + " isnt part of an appointed meeting");
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java Mon Oct 6 16:48:57 2014
@@ -85,16 +85,13 @@ public class RoomManager implements IRoo
* @param externalRoomId
* @return Rooms-Object or NULL
*/
- public Room getRoomByExternalId(Long externalRoomId,
- String externalRoomType, long roomtypes_id) {
- log.debug("getRoombyExternalId : " + externalRoomId + " - "
- + externalRoomType + " - " + roomtypes_id);
+ public Room getRoomByExternalId(Long externalRoomId, String externalRoomType, long roomtypesId) {
+ log.debug("getRoombyExternalId : " + externalRoomId + " - " + externalRoomType + " - " + roomtypesId);
try {
TypedQuery<Room> query = em.createNamedQuery("getRoomByExternalId", Room.class);
query.setParameter("externalRoomId", externalRoomId);
query.setParameter("externalRoomType", externalRoomType);
- query.setParameter("roomtypes_id", roomtypes_id);
- query.setParameter("deleted", true);
+ query.setParameter("roomtypesId", roomtypesId);
List<?> ll = query.getResultList();
if (ll.size() > 0) {
return (Room) ll.get(0);
@@ -203,8 +200,7 @@ public class RoomManager implements IRoo
* @param asc
* @return
*/
- public List<Room> getRoomsInternatl(int start, int max, String orderby,
- boolean asc) {
+ public List<Room> getRoomsInternatl(int start, int max, String orderby, boolean asc) {
try {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Room> cq = cb.createQuery(Room.class);
@@ -242,8 +238,7 @@ public class RoomManager implements IRoo
String orderby, boolean asc, String search) {
try {
- String hql = "select c from Room c "
- + "where c.deleted <> true AND c.name LIKE :search ";
+ String hql = "select c from Room c where c.deleted = false AND c.name LIKE :search ";
if (search.length() == 0) {
search = "%";
@@ -319,11 +314,10 @@ public class RoomManager implements IRoo
try {
String hql = "select c from RoomOrganisation as c "
+ "where c.room.id = :rooms_id "
- + "AND c.deleted <> :deleted";
+ + "AND c.deleted = false";
TypedQuery<RoomOrganisation> q = em.createQuery(hql, RoomOrganisation.class);
q.setParameter("rooms_id", rooms_id);
- q.setParameter("deleted", true);
List<RoomOrganisation> ll = q.getResultList();
return ll;
} catch (Exception ex2) {
@@ -399,7 +393,7 @@ public class RoomManager implements IRoo
/**
* adds a new Record to the table rooms
* @param name
- * @param roomtypes_id
+ * @param roomtypesId
* @param ispublic
* @param hideActivitiesAndActions TODO
* @param hideFilesExplorer TODO
@@ -408,7 +402,7 @@ public class RoomManager implements IRoo
* @param hideWhiteboard TODO
* @return id of the newly created room or NULL
*/
- public Long addRoom(String name, long roomtypes_id,
+ public Long addRoom(String name, long roomtypesId,
String comment, Long numberOfPartizipants, boolean ispublic,
List<Integer> organisations, Boolean appointment, Boolean isDemoRoom,
Integer demoTime, Boolean isModeratedRoom,
@@ -427,7 +421,7 @@ public class RoomManager implements IRoo
r.setComment(comment);
r.setStarttime(new Date());
r.setNumberOfPartizipants(numberOfPartizipants);
- r.setRoomtype(roomTypeDao.get(roomtypes_id));
+ r.setRoomtype(roomTypeDao.get(roomtypesId));
r.setIspublic(ispublic);
r.setAllowUserQuestions(allowUserQuestions);
r.setIsAudioOnly(isAudioOnly);
@@ -490,11 +484,29 @@ public class RoomManager implements IRoo
* adds/check a new Record to the table rooms with external fields
*
* @param name
- * @param roomtypes_id
+ * @param roomtypesId
+ * @param comment
+ * @param numberOfPartizipants
* @param ispublic
+ * @param organisations
+ * @param appointment
+ * @param isDemoRoom
+ * @param demoTime
+ * @param isModeratedRoom
+ * @param roomModerators
+ * @param externalRoomId
+ * @param externalRoomType
+ * @param allowUserQuestions
+ * @param isAudioOnly
+ * @param allowFontStyles
+ * @param isClosed
+ * @param redirectURL
+ * @param waitForRecording
+ * @param allowRecording
+ * @param hideTopBar
* @return id of (the newly created) room or NULL
*/
- public Long addExternalRoom(String name, long roomtypes_id, String comment,
+ public Long addExternalRoom(String name, long roomtypesId, String comment,
Long numberOfPartizipants, boolean ispublic, List<Integer> organisations,
Boolean appointment, Boolean isDemoRoom, Integer demoTime,
Boolean isModeratedRoom, List<Map<String, Object>> roomModerators,
@@ -511,7 +523,7 @@ public class RoomManager implements IRoo
r.setComment(comment);
r.setStarttime(new Date());
r.setNumberOfPartizipants(numberOfPartizipants);
- r.setRoomtype(roomTypeDao.get(roomtypes_id));
+ r.setRoomtype(roomTypeDao.get(roomtypesId));
r.setIspublic(ispublic);
r.setAllowUserQuestions(allowUserQuestions);
@@ -591,18 +603,15 @@ public class RoomManager implements IRoo
/**
* get List of Rooms_Organisation by organisation and roomtype
*
- * @param user_level
* @param organisation_id
- * @param roomtypes_id
+ * @param roomtypesId
* @return
*/
- public List<RoomOrganisation> getRoomsOrganisationByOrganisationIdAndRoomType(long organisation_id, long roomtypes_id) {
+ public List<RoomOrganisation> getRoomsOrganisationByOrganisationIdAndRoomType(long organisation_id, long roomtypesId) {
try {
- TypedQuery<RoomOrganisation> q = em.
- createNamedQuery("getRoomsOrganisationByOrganisationIdAndRoomType", RoomOrganisation.class);
- q.setParameter("roomtypes_id", roomtypes_id);
+ TypedQuery<RoomOrganisation> q = em.createNamedQuery("getRoomsOrganisationByOrganisationIdAndRoomType", RoomOrganisation.class);
+ q.setParameter("roomtypesId", roomtypesId);
q.setParameter("organisation_id", organisation_id);
- q.setParameter("deleted", true);
return q.getResultList();
} catch (Exception ex2) {
log.error("[getRoomsByOrganisation] ", ex2);
@@ -622,7 +631,6 @@ public class RoomManager implements IRoo
createNamedQuery("getRoomsOrganisationByOrganisationId", RoomOrganisation.class);
query.setParameter("organisation_id", organisation_id);
- query.setParameter("deleted", true);
List<RoomOrganisation> ll = query.getResultList();
@@ -654,7 +662,6 @@ public class RoomManager implements IRoo
TypedQuery<RoomOrganisation> q = em.createNamedQuery("selectMaxFromRoomsByOrganisation", RoomOrganisation.class);
q.setParameter("organisation_id", organisation_id);
- q.setParameter("deleted", true);
List<RoomOrganisation> ll = q.getResultList();
return ll.size();
@@ -677,7 +684,7 @@ public class RoomManager implements IRoo
long organisation_id, int start, int max, String orderby,
boolean asc) {
try {
- String hql = "select c from RoomOrganisation as c where c.organisation.id = :organisation_id AND c.deleted <> :deleted";
+ String hql = "select c from RoomOrganisation as c where c.organisation.id = :organisation_id AND c.deleted = false";
if (orderby.startsWith("c.")) {
hql += "ORDER BY " + orderby;
} else {
@@ -692,7 +699,6 @@ public class RoomManager implements IRoo
TypedQuery<RoomOrganisation> q = em.createQuery(hql, RoomOrganisation.class);
q.setParameter("organisation_id", organisation_id);
- q.setParameter("deleted", true);
q.setFirstResult(start);
q.setMaxResults(max);
List<RoomOrganisation> ll = q.getResultList();
@@ -712,7 +718,6 @@ public class RoomManager implements IRoo
q.setParameter("rooms_id", rooms_id);
q.setParameter("organisation_id", organisation_id);
- q.setParameter("deleted", true);
List<RoomOrganisation> ll = q.getResultList();
if (ll.size() > 0) {
@@ -733,7 +738,6 @@ public class RoomManager implements IRoo
try {
TypedQuery<RoomOrganisation> q = em.createNamedQuery("getRoomsOrganisationByRoomsId", RoomOrganisation.class);
q.setParameter("rooms_id", rooms_id);
- q.setParameter("deleted", true);
return q.getResultList();
} catch (Exception ex2) {
log.error("[getRoomsByOrganisation] ", ex2);
@@ -741,7 +745,7 @@ public class RoomManager implements IRoo
return null;
}
- public Long updateRoomInternal(long rooms_id, long roomtypes_id,
+ public Long updateRoomInternal(long rooms_id, long roomtypesId,
String name, boolean ispublic, String comment,
Long numberOfPartizipants, List<Integer> organisations,
Boolean appointment, Boolean isDemoRoom, Integer demoTime,
@@ -762,7 +766,7 @@ public class RoomManager implements IRoo
r.setIspublic(ispublic);
r.setNumberOfPartizipants(numberOfPartizipants);
r.setName(name);
- r.setRoomtype(roomTypeDao.get(roomtypes_id));
+ r.setRoomtype(roomTypeDao.get(roomtypesId));
r.setUpdatetime(new Date());
r.setAllowUserQuestions(allowUserQuestions);
r.setIsAudioOnly(isAudioOnly);
@@ -991,7 +995,6 @@ public class RoomManager implements IRoo
TypedQuery<Room> query = em.createNamedQuery("getRoomByOwnerAndTypeId", Room.class);
query.setParameter("ownerId", ownerId);
query.setParameter("roomtypesId", roomtypesId);
- query.setParameter("deleted", true);
List<Room> ll = query.getResultList();
if (ll.size() > 0) {
room = ll.get(0);
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java Mon Oct 6 16:48:57 2014
@@ -48,7 +48,7 @@ import org.apache.openmeetings.db.dao.us
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.server.LdapConfig;
import org.apache.openmeetings.db.entity.user.Address;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.entity.user.User.Type;
@@ -314,7 +314,7 @@ public class LdapLoginManagement {
u.setType(Type.ldap);
u.setRights(rights);
u.setDomainId(domainId);
- u.getOrganisation_users().add(new Organisation_Users(orgDao.get(cfgDao.getConfValue("default_domain_id", Long.class, "-1"))));
+ u.getOrganisationUsers().add(new OrganisationUser(orgDao.get(cfgDao.getConfValue("default_domain_id", Long.class, "-1"))));
u.setLogin(user);
u.setAge(new Date());
u.setShowContactDataToContacts(true);
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java Mon Oct 6 16:48:57 2014
@@ -102,13 +102,12 @@ public class ConferenceService {
* @param organisation_id
* @return - all available Rooms of this organization
*/
- public List<RoomOrganisation> getRoomsByOrganisationAndType(String SID,
- long organisation_id, long roomtypes_id) {
+ public List<RoomOrganisation> getRoomsByOrganisationAndType(String SID, long organisation_id, long roomtypesId) {
try {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
log.debug("getRoomsByOrganisationAndType");
- List<RoomOrganisation> roomOrgsList = roomManager.getRoomsOrganisationByOrganisationIdAndRoomType(organisation_id, roomtypes_id);
+ List<RoomOrganisation> roomOrgsList = roomManager.getRoomsOrganisationByOrganisationIdAndRoomType(organisation_id, roomtypesId);
List<RoomOrganisation> filtered = new ArrayList<RoomOrganisation>();
@@ -116,7 +115,7 @@ public class ConferenceService {
.hasNext();) {
RoomOrganisation orgRoom = iter.next();
- if (!orgRoom.getRoom().getAppointment()) {
+ if (!orgRoom.getRoom().isAppointment()) {
orgRoom.getRoom().setCurrentusers(
this.getRoomClientsListByRoomId(orgRoom.getRoom()
.getId()));
@@ -176,17 +175,17 @@ public class ConferenceService {
* get a List of all public availible rooms (non-appointments)
*
* @param SID
- * @param roomtypes_id
+ * @param roomtypesId
* @return - public rooms with given type, null in case of the error
*/
- public List<Room> getRoomsPublic(String SID, Long roomtypes_id) {
+ public List<Room> getRoomsPublic(String SID, Long roomtypesId) {
try {
log.debug("getRoomsPublic");
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
- List<Room> roomList = roomDao.getPublicRooms(roomtypes_id);
+ List<Room> roomList = roomDao.getPublicRooms(roomtypesId);
// Filter : no appointed meetings
List<Room> filtered = new ArrayList<Room>();
@@ -194,7 +193,7 @@ public class ConferenceService {
for (Iterator<Room> iter = roomList.iterator(); iter.hasNext();) {
Room rooms = iter.next();
- if (!rooms.getAppointment()) {
+ if (!rooms.isAppointment()) {
rooms.setCurrentusers(this.getRoomClientsListByRoomId(rooms
.getId()));
filtered.add(rooms);
@@ -256,7 +255,7 @@ public class ConferenceService {
Room room = roomDao.get(room_id);
- if (room.getAppointment() == false)
+ if (room.isAppointment() == false)
return null;
try {
@@ -286,7 +285,7 @@ public class ConferenceService {
Room room = roomDao.get(room_id);
- if (room.getAppointment() == false) {
+ if (room.isAppointment() == false) {
throw new IllegalStateException("Room has no appointment");
}
@@ -342,7 +341,7 @@ public class ConferenceService {
Long rooms_id = ment.getRoom().getId();
Room rooom = roomDao.get(rooms_id);
- if (!rooom.getRoomtype().getRoomtypes_id()
+ if (!rooom.getRoomtype().getId()
.equals(room_types_id))
continue;
@@ -439,13 +438,13 @@ public class ConferenceService {
* @param SID
* @param externalUserId
* @param externalUserType
- * @param roomtypes_id
+ * @param roomtypesId
* @return - room with the given external id
*/
- public Room getRoomByExternalId(String SID, Long externalUserId, String externalUserType, long roomtypes_id) {
+ public Room getRoomByExternalId(String SID, Long externalUserId, String externalUserType, long roomtypesId) {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
- return roomManager.getRoomByExternalId(externalUserId, externalUserType, roomtypes_id);
+ return roomManager.getRoomByExternalId(externalUserId, externalUserType, roomtypesId);
}
return null;
}
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=1629710&r1=1629709&r2=1629710&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 Mon Oct 6 16:48:57 2014
@@ -161,7 +161,7 @@ public class MainService implements IPen
String streamId = current.getClient().getId();
Client currentClient = sessionManager.getClientByStreamId(streamId, null);
- if (!u.getOrganisation_users().isEmpty()) {
+ if (!u.getOrganisationUsers().isEmpty()) {
u.setSessionData(sessiondataDao.getSessionByHash(wicketSID));
currentClient.setUser_id(u.getId());
currentClient.setRoom_id(wicketroomid);
@@ -401,7 +401,7 @@ public class MainService implements IPen
User defaultRpcUser = userDao.get(defaultRpcUserid);
User user = new User();
- user.setOrganisation_users(defaultRpcUser.getOrganisation_users());
+ user.setOrganisationUsers(defaultRpcUser.getOrganisationUsers());
return user;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java Mon Oct 6 16:48:57 2014
@@ -37,7 +37,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.db.entity.user.Organisation;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.core.remote.util.SessionVariablesUtil;
@@ -171,7 +171,7 @@ public class MobileService implements IP
}
//private rooms
- for (Organisation_Users ou : u.getOrganisation_users()) {
+ for (OrganisationUser ou : u.getOrganisationUsers()) {
Organisation org = ou.getOrganisation();
boolean first = true;
for (Room r : roomDao.getOrganisationRooms(org.getId())) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Mon Oct 6 16:48:57 2014
@@ -1204,38 +1204,28 @@ public class ScopeApplicationAdapter ext
Room room = roomDao.get(room_id);
// not really - default logic
- if (room.getAppointment() == null || room.getAppointment() == false) {
-
- if (room.isModerated()) {
-
- // if this is a Moderated Room then the Room can be only
- // locked off by the Moderator Bit
- List<Client> clientModeratorListRoom = this.sessionManager
- .getCurrentModeratorByRoom(room_id);
-
- // If there is no Moderator yet and we are asking for it
- // then deny it
- // cause at this moment, the user should wait untill a
- // Moderator enters the Room
- if (clientModeratorListRoom.size() == 0) {
- return false;
- } else {
- return true;
- }
-
+ if (!room.isAppointment() && room.isModerated()) {
+ // if this is a Moderated Room then the Room can be only
+ // locked off by the Moderator Bit
+ List<Client> clientModeratorListRoom = this.sessionManager
+ .getCurrentModeratorByRoom(room_id);
+
+ // If there is no Moderator yet and we are asking for it
+ // then deny it
+ // cause at this moment, the user should wait untill a
+ // Moderator enters the Room
+ if (clientModeratorListRoom.size() == 0) {
+ return false;
} else {
return true;
}
-
} else {
-
// FIXME: TODO: For Rooms that are created as Appointment we
// have to check that too
// but I don't know yet the Logic behind it - swagner 19.06.2009
return true;
}
-
} catch (Exception err) {
log.error("[checkRoomValues]", err);
}
@@ -1329,7 +1319,7 @@ public class ScopeApplicationAdapter ext
}
// default logic for non regular rooms
- if (room.getAppointment() == null || room.getAppointment() == false) {
+ if (!room.isAppointment()) {
if (room.isModerated()) {
// if this is a Moderated Room then the Room can be only
// locked off by the Moderator Bit
@@ -1391,9 +1381,7 @@ public class ScopeApplicationAdapter ext
// whatever Role that should get the Moderation
currentClient.setIsMod(false);
}
-
}
-
}
// Update the Client List
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java Mon Oct 6 16:48:57 2014
@@ -230,7 +230,7 @@ public class AppointmentDao {
a.setUpdated(new Date());
a.setDeleted(true);
a.setMeetingMembers(null);
- if (Boolean.TRUE.equals(a.getRoom().getAppointment())) {
+ if (Boolean.TRUE.equals(a.getRoom().isAppointment())) {
a.getRoom().setDeleted(true);
}
update(a, userId);
@@ -369,28 +369,16 @@ public class AppointmentDao {
// ---------------------------------------------------------------------------------------------
- public Appointment getAppointmentByRoomId(Long user_id, Long rooms_id) {
+ public Appointment getAppointmentByRoomId(Long userId, Long roomId) {
try {
+ TypedQuery<Appointment> query = em.createNamedQuery("getAppointmentByRoomId", Appointment.class);
- String hql = "select a from Appointment a "
- + "WHERE a.deleted = false "
- + "AND a.owner.id = :user_id "
- + "AND a.room.id = :rooms_id ";
-
- TypedQuery<Appointment> query = em.createQuery(hql,
- Appointment.class);
-
- query.setParameter("user_id", user_id);
- query.setParameter("rooms_id", rooms_id);
+ query.setParameter("userId", userId);
+ query.setParameter("roomId", roomId);
- List<Appointment> listAppoints = query.getResultList();
-
- if (listAppoints.size() > 0) {
- return listAppoints.get(0);
- }
-
- return null;
+ List<Appointment> list = query.getResultList();
+ return list.size() > 0 ? list.get(0) : null;
} catch (Exception e) {
log.error("[getAppointmentByRoomId]", e);
return null;
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java Mon Oct 6 16:48:57 2014
@@ -30,7 +30,7 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,31 +47,26 @@ public class AppointmentReminderTypDao {
@Autowired
private FieldLanguagesValuesDao fieldLanguagesValuesDao;
- public AppointmentReminderTyps get(Long typId) {
+ public AppointmentReminderType get(Long typId) {
try {
- log.debug("AppointmentReminderTypById: " + typId);
+ log.debug("AppointmentReminderTypeById: " + typId);
- String hql = "select app from AppointmentReminderTyps app WHERE app.deleted = false AND app.id = :typId";
-
- TypedQuery<AppointmentReminderTyps> query = em.createQuery(hql, AppointmentReminderTyps.class);
+ TypedQuery<AppointmentReminderType> query = em.createNamedQuery("getAppointmentReminderTypeById", AppointmentReminderType.class);
query.setParameter("typId", typId);
- AppointmentReminderTyps appointmentReminderTyps = null;
try {
- appointmentReminderTyps = query.getSingleResult();
+ return query.getSingleResult();
} catch (NoResultException ex) {
}
-
- return appointmentReminderTyps;
} catch (Exception ex2) {
- log.error("[getAppointmentReminderTypsById]: " + ex2);
+ log.error("[get]: " + ex2);
}
return null;
}
- public Long updateAppointmentReminderTyps(Long typId, String name) {
+ public Long update(Long typId, String name) {
try {
- AppointmentReminderTyps ac = get(typId);
+ AppointmentReminderType ac = get(typId);
ac.setName(name);
ac.setUpdatetime(new Date());
@@ -86,15 +81,15 @@ public class AppointmentReminderTypDao {
return typId;
} catch (Exception ex2) {
- log.error("[updateAppointmentReminderTyps]: ", ex2);
+ log.error("[update]: ", ex2);
}
return null;
}
- public Long addAppointmentReminderTyps(Long user_id, String name, long fieldvalues_id) {
+ public Long add(Long user_id, String name, long fieldvalues_id) {
try {
- AppointmentReminderTyps ac = new AppointmentReminderTyps();
+ AppointmentReminderType ac = new AppointmentReminderType();
ac.setName(name);
ac.setStarttime(new Date());
@@ -107,15 +102,15 @@ public class AppointmentReminderTypDao {
return category_id;
} catch (Exception ex2) {
- log.error("[addAppointmentReminderTyps]: ", ex2);
+ log.error("[add]: ", ex2);
}
return null;
}
- public Long deleteAppointmentReminderTyp(Long typId) {
+ public Long delete(Long typId) {
try {
- AppointmentReminderTyps ac = get(typId);
+ AppointmentReminderType ac = get(typId);
log.debug("ac: " + ac);
@@ -136,28 +131,24 @@ public class AppointmentReminderTypDao {
return typId;
} catch (Exception ex2) {
- log.error("[deleteAppointmentReminderTyp]: " + ex2);
+ log.error("[delete]: " + ex2);
}
return null;
}
- public List<AppointmentReminderTyps> getAppointmentReminderTypList(long language_id) {
- log.debug("getAppointmenetReminderTypList");
-
+ public List<AppointmentReminderType> getList(long language_id) {
+ log.debug("getList");
try {
+ TypedQuery<AppointmentReminderType> query = em.createNamedQuery("getAppointmentReminderTypes", AppointmentReminderType.class);
- String hql = "select a from AppointmentReminderTyps a WHERE a.deleted = false ";
-
- TypedQuery<AppointmentReminderTyps> query = em.createQuery(hql, AppointmentReminderTyps.class);
-
- List<AppointmentReminderTyps> listAppointmentReminderTyp = query.getResultList();
- for (AppointmentReminderTyps ti : listAppointmentReminderTyp) {
+ List<AppointmentReminderType> listAppointmentReminderTyp = query.getResultList();
+ for (AppointmentReminderType ti : listAppointmentReminderTyp) {
ti.setLabel(fieldLanguagesValuesDao.get(ti.getFieldvalues_id(), language_id));
}
return listAppointmentReminderTyp;
} catch (Exception ex2) {
- log.error("[getAppointmentReminderTypList]: " + ex2);
+ log.error("[getList]: " + ex2);
}
return null;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java Mon Oct 6 16:48:57 2014
@@ -39,7 +39,7 @@ import org.apache.openmeetings.db.dto.fi
import org.apache.openmeetings.db.dto.file.RecordingObject;
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.record.FlvRecording.Status;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -119,7 +119,6 @@ public class FlvRecordingDao {
TypedQuery<FlvRecording> query = em.createNamedQuery("getRecordingsByExternalRoomTypeAndOwner", FlvRecording.class);
query.setParameter("externalRoomType", externalRoomType);
query.setParameter("insertedBy", insertedBy);
- query.setParameter("deleted", true);
List<FlvRecording> flvRecordingList = query.getResultList();
@@ -185,8 +184,7 @@ public class FlvRecordingDao {
public List<FlvRecording> getFlvRecordingByRoomId(Long room_id) {
try {
TypedQuery<FlvRecording> query = em.createNamedQuery("getRecordingsByRoom", FlvRecording.class);
- query.setParameter("deleted", true);
- query.setParameter("room_id", room_id);
+ query.setParameter("roomId", room_id);
List<FlvRecording> flvRecordingList = query.getResultList();
@@ -289,7 +287,7 @@ public class FlvRecordingDao {
long publicFileSize = 0;
//get all organizations the user can view
- for (Organisation_Users ou : userDao.get(userId).getOrganisation_users()) {
+ for (OrganisationUser ou : userDao.get(userId).getOrganisationUsers()) {
List<FlvRecording>publicFlvRecordings = getFlvRecordingRootByPublic(ou.getOrganisation().getId());
//get sizes
for (FlvRecording publicFlvRecording : publicFlvRecordings) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomTypeDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomTypeDao.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomTypeDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomTypeDao.java Mon Oct 6 16:48:57 2014
@@ -50,7 +50,6 @@ public class RoomTypeDao {
*/
public List<RoomType> getAll(long langId) {
TypedQuery<RoomType> query = em.createNamedQuery("getAllRoomTypes", RoomType.class);
- query.setParameter("deleted", true);
List<RoomType> ll = query.getResultList();
for (RoomType ti : ll) {
ti.setLabel(fieldLangValueDao.get(ti.getFieldvalues_id(), langId));
@@ -60,8 +59,7 @@ public class RoomTypeDao {
public RoomType get(long id) {
TypedQuery<RoomType> query = em.createNamedQuery("getRoomTypesById", RoomType.class);
- query.setParameter("roomtypes_id", id);
- query.setParameter("deleted", true);
+ query.setParameter("id", id);
List<?> ll = query.getResultList();
if (ll.size() > 0) {
return (RoomType) ll.get(0);
@@ -83,7 +81,7 @@ public class RoomTypeDao {
rtype.setDeleted(deleted);
rtype.setFieldvalues_id(fieldvalues_id);
rtype = em.merge(rtype);
- long returnId = rtype.getRoomtypes_id();
+ long returnId = rtype.getId();
return returnId;
} catch (Exception ex2) {
log.error("[addRoomType] ", ex2);
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java Mon Oct 6 16:48:57 2014
@@ -41,7 +41,6 @@ public class OrganisationDao implements
public Organisation get(long id) {
TypedQuery<Organisation> query = em.createNamedQuery("getOrganisationById", Organisation.class);
query.setParameter("organisation_id", id);
- query.setParameter("deleted", false);
Organisation o = null;
try {
o = query.getSingleResult();
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java Mon Oct 6 16:48:57 2014
@@ -26,53 +26,53 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.dao.IDataProviderDao;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.DaoHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class OrganisationUserDao implements IDataProviderDao<Organisation_Users> {
+public class OrganisationUserDao implements IDataProviderDao<OrganisationUser> {
@PersistenceContext
private EntityManager em;
@Autowired
private UserDao usersDao;
public final static String[] searchFields = {"user.lastname", "user.firstname", "user.login", "user.adresses.email"};
- public Organisation_Users get(long id) {
- TypedQuery<Organisation_Users> q = em.createNamedQuery("getOrganisationUsersById", Organisation_Users.class);
+ public OrganisationUser get(long id) {
+ TypedQuery<OrganisationUser> q = em.createNamedQuery("getOrganisationUsersById", OrganisationUser.class);
q.setParameter("id", id);
return q.getSingleResult();
}
- public List<Organisation_Users> get(int start, int count) {
+ public List<OrganisationUser> get(int start, int count) {
throw new RuntimeException("Should not be used");
}
- public List<Organisation_Users> get(String search, int start, int count, String sort) {
+ public List<OrganisationUser> get(String search, int start, int count, String sort) {
throw new RuntimeException("Should not be used");
}
- public List<Organisation_Users> get(long orgId, String search, int start, int count, String sort) {
- TypedQuery<Organisation_Users> q = em.createQuery(DaoHelper.getSearchQuery("Organisation_Users", "ou", null, search, false, false, "ou.organisation.id = :orgId", sort, searchFields), Organisation_Users.class);
+ public List<OrganisationUser> get(long orgId, String search, int start, int count, String sort) {
+ TypedQuery<OrganisationUser> q = em.createQuery(DaoHelper.getSearchQuery(OrganisationUser.class.getSimpleName(), "ou", null, search, false, false, "ou.organisation.id = :orgId", sort, searchFields), OrganisationUser.class);
q.setParameter("orgId", orgId);
q.setFirstResult(start);
q.setMaxResults(count);
return q.getResultList();
}
- public List<Organisation_Users> get(long orgId, int start, int count) {
- TypedQuery<Organisation_Users> q = em.createNamedQuery("getOrganisationUsersByOrgId", Organisation_Users.class);
+ public List<OrganisationUser> get(long orgId, int start, int count) {
+ TypedQuery<OrganisationUser> q = em.createNamedQuery("getOrganisationUsersByOrgId", OrganisationUser.class);
q.setParameter("id", orgId);
q.setFirstResult(start);
q.setMaxResults(count);
return q.getResultList();
}
- public Organisation_Users getByOrganizationAndUser(long orgId, long userId) {
+ public OrganisationUser getByOrganizationAndUser(long orgId, long userId) {
try {
- List<Organisation_Users> list = em.createNamedQuery("isUserInOrganization", Organisation_Users.class)
+ List<OrganisationUser> list = em.createNamedQuery("isUserInOrganization", OrganisationUser.class)
.setParameter("orgId", orgId).setParameter("userId", userId).getResultList();
if (list != null && !list.isEmpty()) {
return list.get(0);
@@ -84,7 +84,7 @@ public class OrganisationUserDao impleme
}
public boolean isUserInOrganization(long orgId, long userId) {
- return em.createNamedQuery("isUserInOrganization", Organisation_Users.class)
+ return em.createNamedQuery("isUserInOrganization", OrganisationUser.class)
.setParameter("orgId", orgId).setParameter("userId", userId).getResultList().size() > 0;
}
@@ -97,7 +97,7 @@ public class OrganisationUserDao impleme
}
public long count(long orgId, String search) {
- TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery("Organisation_Users", "ou", search, false, true, null, searchFields), Long.class);
+ TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery(OrganisationUser.class.getSimpleName(), "ou", search, false, true, null, searchFields), Long.class);
return q.getSingleResult();
}
@@ -107,13 +107,13 @@ public class OrganisationUserDao impleme
return q.getSingleResult();
}
- public void update(List<Organisation_Users> list, Long userId) {
- for (Organisation_Users ou : list) {
+ public void update(List<OrganisationUser> list, Long userId) {
+ for (OrganisationUser ou : list) {
update(ou, userId);
}
}
- public Organisation_Users update(Organisation_Users entity, Long userId) {
+ public OrganisationUser update(OrganisationUser entity, Long userId) {
if (entity.getId() == null) {
entity.setStarttime(new Date());
em.persist(entity);
@@ -125,20 +125,20 @@ public class OrganisationUserDao impleme
return entity;
}
- private void updateUser(Organisation_Users entity, boolean delete, Long userId) {
+ private void updateUser(OrganisationUser entity, boolean delete, Long userId) {
//entity has been detached need to re-fetch
User u = usersDao.get(entity.getUser().getId());
- int idx = u.getOrganisation_users().indexOf(entity);
+ int idx = u.getOrganisationUsers().indexOf(entity);
if (delete && idx > -1) {
- Organisation_Users ou = u.getOrganisation_users().remove(idx);
+ OrganisationUser ou = u.getOrganisationUsers().remove(idx);
em.remove(ou);
} else if (!delete && idx < 0) {
- u.getOrganisation_users().add(entity);
+ u.getOrganisationUsers().add(entity);
}
usersDao.update(u, userId);
}
- public void delete(Organisation_Users entity, Long userId) {
+ public void delete(OrganisationUser entity, Long userId) {
if (entity.getId() != null) {
updateUser(entity, true, userId);
}
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=1629710&r1=1629709&r2=1629710&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 Mon Oct 6 16:48:57 2014
@@ -93,10 +93,8 @@ public class StateDao {
*/
public State getStateById(long state_id) {
try {
- TypedQuery<State> query = em
- .createNamedQuery("getStateById", State.class);
+ TypedQuery<State> query = em.createNamedQuery("getStateById", State.class);
query.setParameter("state_id", state_id);
- query.setParameter("deleted", true);
List<State> ll = query.getResultList();
if (ll.size() > 0) {
return ll.get(0);
@@ -118,10 +116,8 @@ public class StateDao {
if (name == null) {
return null;
}
- TypedQuery<State> query = em
- .createNamedQuery("getStateByName", State.class);
+ TypedQuery<State> query = em.createNamedQuery("getStateByName", State.class);
query.setParameter("name", name.toLowerCase());
- query.setParameter("deleted", true);
List<State> ll = query.getResultList();
if (ll.size() > 0) {
return ll.get(0);
@@ -139,9 +135,7 @@ public class StateDao {
*/
public List<State> getStates() {
try {
- TypedQuery<State> query = em
- .createNamedQuery("getStates", State.class);
- query.setParameter("deleted", true);
+ TypedQuery<State> query = em.createNamedQuery("getStates", State.class);
List<State> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java Mon Oct 6 16:48:57 2014
@@ -45,7 +45,7 @@ import org.apache.openjpa.persistence.Op
import org.apache.openmeetings.db.dao.IDataProviderDao;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.entity.user.Address;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.entity.user.User.Type;
@@ -122,7 +122,7 @@ public class UserDao implements IDataPro
}
private String getAdditionalJoin(boolean filterContacts) {
- return filterContacts ? "LEFT JOIN u.organisation_users ou" : null;
+ return filterContacts ? "LEFT JOIN u.organisationUsers ou" : null;
}
private String getAdditionalWhere(boolean excludeContacts, Map<String, Object> params) {
@@ -137,7 +137,7 @@ public class UserDao implements IDataPro
if (filterContacts) {
params.put("ownerId", ownerId);
params.put("contact", Type.contact);
- return "((u.type <> :contact AND ou.organisation.id IN (SELECT ou.organisation.id FROM Organisation_Users ou WHERE ou.user.id = :ownerId)) "
+ return "((u.type <> :contact AND ou.organisation.id IN (SELECT ou.organisation.id FROM OrganisationUser ou WHERE ou.user.id = :ownerId)) "
+ "OR (u.type = :contact AND u.ownerId = :ownerId))";
}
return null;
@@ -201,8 +201,8 @@ public class UserDao implements IDataPro
}
public User update(User u, Long userId) {
- if (u.getOrganisation_users() != null) {
- for (Organisation_Users ou : u.getOrganisation_users()) {
+ if (u.getOrganisationUsers() != null) {
+ for (OrganisationUser ou : u.getOrganisationUsers()) {
ou.setUser(u);
}
}
@@ -268,10 +268,10 @@ public class UserDao implements IDataPro
try {
if (userId != 0) {
User us = get(userId);
- for (Organisation_Users ou : us.getOrganisation_users()){
+ for (OrganisationUser ou : us.getOrganisationUsers()){
em.remove(ou);
}
- us.setOrganisation_users(null);
+ us.setOrganisationUsers(null);
us.setDeleted(true);
us.setUpdatetime(new Date());
us.setSipUser(null);
@@ -596,8 +596,8 @@ public class UserDao implements IDataPro
if (!AuthLevelUtil.hasLoginLevel(u.getRights())) {
throw new OmException(-41L);
}
- log.debug("loginUser " + u.getOrganisation_users());
- if (u.getOrganisation_users().isEmpty()) {
+ log.debug("loginUser " + u.getOrganisationUsers());
+ if (u.getOrganisationUsers().isEmpty()) {
throw new OmException("No Organization assigned to user");
}
@@ -622,7 +622,7 @@ public class UserDao implements IDataPro
public User addUser(Set<Right> rights, String firstname, String login, String lastname, long language_id,
String userpass, Address adress, boolean sendSMS, Date age, String hash, TimeZone timezone,
Boolean forceTimeZoneCheck, String userOffers, String userSearchs, Boolean showContactData,
- Boolean showContactDataToContacts, String externalId, String externalType, List<Organisation_Users> orgList, String pictureuri) throws NoSuchAlgorithmException {
+ Boolean showContactDataToContacts, String externalId, String externalType, List<OrganisationUser> orgList, String pictureuri) throws NoSuchAlgorithmException {
User u = new User();
u.setFirstname(firstname);
@@ -655,7 +655,7 @@ public class UserDao implements IDataPro
u.setRegdate(new Date());
u.setDeleted(false);
u.setPictureuri(pictureuri);
- u.setOrganisation_users(orgList);
+ u.setOrganisationUsers(orgList);
return update(u, null);
}
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=1629710&r1=1629709&r2=1629710&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 Mon Oct 6 16:48:57 2014
@@ -39,7 +39,7 @@ public class RoomDTO {
comment = r.getComment();
roomtype = r.getRoomtype();
numberOfPartizipants = r.getNumberOfPartizipants();
- appointment = r.getAppointment();
+ appointment = r.isAppointment();
confno = r.getConfno();
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java Mon Oct 6 16:48:57 2014
@@ -81,9 +81,8 @@ import org.simpleframework.xml.Root;
+ " OR (a.start < :starttime AND a.end > :endtime) "
+ " )"
)
- , @NamedQuery(name="getAppointmentByRoomId", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.room.id = :room_id")
- //TODO this query returns duplicates if the user books an appointment with
- //his own user as second meeting-member, swagner 19.02.2012
+ , @NamedQuery(name="getAppointmentByRoomId", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.owner.id = :userId AND a.room.id = :roomId")
+ //TODO this query returns duplicates if the user books an appointment with his own user as second meeting-member, swagner 19.02.2012
, @NamedQuery(name="appointmentsInRangeByUser",
query="SELECT a FROM MeetingMember mm, IN(mm.appointment) a "
+ "WHERE mm.deleted = false AND mm.user.id <> a.owner.id AND mm.user.id = :userId "
@@ -95,7 +94,7 @@ import org.simpleframework.xml.Root;
)
, @NamedQuery(name="appointedRoomsInRangeByUser",
query="SELECT a.room FROM MeetingMember mm, IN(mm.appointment) a "
- + "WHERE mm.deleted <> true AND mm.user.id <> a.owner.id AND mm.user.id = :userId "
+ + "WHERE mm.deleted = false AND mm.user.id <> a.owner.id AND mm.user.id = :userId "
+ " AND ( "
+ " (a.start BETWEEN :starttime AND :endtime) "
+ " OR (a.end BETWEEN :starttime AND :endtime) "
@@ -161,7 +160,7 @@ public class Appointment implements IDat
@JoinColumn(name = "remind_id", nullable = true)
@ForeignKey(enabled = true)
@Element(name="typId", data=true, required=false)
- private AppointmentReminderTyps remind;
+ private AppointmentReminderType remind;
@Column(name = "isdaily")
@Element(data=true, required = false)
@@ -287,11 +286,11 @@ public class Appointment implements IDat
this.category = category;
}
- public AppointmentReminderTyps getRemind() {
+ public AppointmentReminderType getRemind() {
return remind;
}
- public void setRemind(AppointmentReminderTyps remind) {
+ public void setRemind(AppointmentReminderType remind) {
this.remind = remind;
}
Copied: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java (from r1629707, openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderTyps.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java?p2=openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java&p1=openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderTyps.java&r1=1629707&r2=1629710&rev=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderTyps.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java Mon Oct 6 16:48:57 2014
@@ -28,6 +28,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -39,8 +41,12 @@ import org.simpleframework.xml.Element;
@Entity
-@Table(name = "appointmentremindertyps")
-public class AppointmentReminderTyps implements IDataProviderEntity {
+@NamedQueries({
+ @NamedQuery(name="getAppointmentReminderTypeById", query="SELECT app FROM AppointmentReminderType app WHERE app.deleted = false AND app.id = :typId")
+ , @NamedQuery(name="getAppointmentReminderTypes", query="SELECT a FROM AppointmentReminderType a WHERE a.deleted = false")
+})
+@Table(name = "appt_reminder_type")
+public class AppointmentReminderType implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java Mon Oct 6 16:48:57 2014
@@ -86,7 +86,7 @@ import org.simpleframework.xml.Root;
+ "AND r.externalRoomType LIKE :externalRoomType AND c.insertedBy LIKE :insertedBy AND c.deleted = false")
, @NamedQuery(name = "getRecordingsByExternalRoomType", query = "SELECT c FROM FlvRecording c, Room r WHERE c.roomId = r.id "
+ "AND r.externalRoomType LIKE :externalRoomType AND c.deleted = false")
- , @NamedQuery(name = "getRecordingsByRoom", query = "SELECT c FROM FlvRecording c WHERE c.deleted = false AND c.roomId = :room_id "
+ , @NamedQuery(name = "getRecordingsByRoom", query = "SELECT c FROM FlvRecording c WHERE c.deleted = false AND c.roomId = :roomId "
+ "ORDER BY c.type ASC, c.fileName")
, @NamedQuery(name = "getRecordingsByParent", query = "SELECT c FROM FlvRecording c WHERE c.deleted = false AND c.parentItemId = :parentItemId "
+ "ORDER BY c.type ASC, c.fileName")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Mon Oct 6 16:48:57 2014
@@ -57,17 +57,17 @@ import org.simpleframework.xml.Root;
})
@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 = "getPublicRooms", query = "SELECT r from Room r WHERE r.ispublic = true and r.deleted = false and r.roomtype.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 <> :deleted"),
+ + "AND c.roomtype.id = :roomtypesId "
+ + "AND c.deleted = false"),
@NamedQuery(name = "selectMaxFromRooms", query = "select count(c.id) from Room c "
- + "where c.deleted <> true AND c.name LIKE :search "),
+ + "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 <> :deleted"),
+ + "AND rt.id = :roomtypesId 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.id = :id"),
@NamedQuery(name = "getSipRoomIdsByIds", query = "SELECT r.id FROM Room r WHERE r.deleted = false AND r.sipEnabled = true AND r.id IN :ids"),
@@ -341,11 +341,11 @@ public class Room implements IDataProvid
this.numberOfPartizipants = numberOfPartizipants;
}
- public Boolean getAppointment() {
+ public boolean isAppointment() {
return appointment;
}
- public void setAppointment(Boolean appointment) {
+ public void setAppointment(boolean appointment) {
this.appointment = appointment;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java Mon Oct 6 16:48:57 2014
@@ -42,24 +42,24 @@ import org.simpleframework.xml.Root;
@NamedQueries({
@NamedQuery(name = "getAllRoomsOrganisations", query = "select ro from RoomOrganisation ro ORDER BY ro.id"),
@NamedQuery(name = "getRoomsOrganisationByOrganisationIdAndRoomType", query = "select c from RoomOrganisation as c "
- + "where c.room.roomtypes_id = :roomtypes_id AND c.organisation.id = :organisation_id "
- + "AND c.deleted <> :deleted"),
+ + "where c.room.roomtype.id = :roomtypesId AND c.organisation.id = :organisation_id "
+ + "AND c.deleted = false"),
@NamedQuery(name = "getRoomsOrganisationByOrganisationId", query = "SELECT c FROM RoomOrganisation c "
+ "LEFT JOIN FETCH c.room "
+ "WHERE c.organisation.id = :organisation_id "
- + "AND c.deleted <> :deleted AND c.room.deleted <> :deleted AND c.room.appointment = false "
- + "AND c.organisation.deleted <> :deleted "
+ + "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"),
@NamedQuery(name = "selectMaxFromRoomsByOrganisation", query = "select c from Rooms_Organisation as c "
+ "where c.organisation.id = :organisation_id "
- + "AND c.deleted <> :deleted"),
+ + "AND c.deleted = false"),
@NamedQuery(name = "getRoomsOrganisationByOrganisationIdAndRoomId", query = "select c from RoomOrganisation as c "
+ "where c.room.id = :rooms_id "
+ "AND c.organisation.id = :organisation_id "
- + "AND c.deleted <> :deleted"),
+ + "AND c.deleted = false"),
@NamedQuery(name = "getRoomsOrganisationByRoomsId", query = "select c from RoomOrganisation as c "
+ "where c.room.id = :rooms_id "
- + "AND c.deleted <> :deleted")
+ + "AND c.deleted = false")
})
@Table(name = "rooms_organisation")
@Root(name="room_organisation")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java Mon Oct 6 16:48:57 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.room;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -31,22 +30,22 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Transient;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
import org.simpleframework.xml.Element;
@Entity
@NamedQueries({
- @NamedQuery(name = "getAllRoomTypes", query = "select c from RoomType as c where c.deleted <> :deleted"),
- @NamedQuery(name = "getRoomTypesById", query = "select c from RoomType as c " +
- "where c.roomtypes_id = :roomtypes_id AND c.deleted <> :deleted")
+ @NamedQuery(name = "getAllRoomTypes", query = "select c from RoomType as c where c.deleted = false"),
+ @NamedQuery(name = "getRoomTypesById", query = "select c from RoomType as c WHERE c.id = :id AND c.deleted = false")
})
@Table(name = "roomtype")
-public class RoomType implements Serializable {
+public class RoomType implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
- private Long roomtypes_id;
+ private Long id;
@Column(name = "starttime")
private Date starttime;
@@ -75,11 +74,11 @@ public class RoomType implements Seriali
this.name = name;
}
- public Long getRoomtypes_id() {
- return roomtypes_id;
+ public Long getId() {
+ return id;
}
- public void setRoomtypes_id(Long roomtypes_id) {
- this.roomtypes_id = roomtypes_id;
+ public void setId(Long id) {
+ this.id = id;
}
public Date getStarttime() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java Mon Oct 6 16:48:57 2014
@@ -36,13 +36,13 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
@NamedQuery(name="getOrganisationById",
- query="SELECT c FROM Organisation AS c WHERE c.id = :organisation_id AND c.deleted = :deleted")
+ query="SELECT c FROM Organisation AS c WHERE c.id = :organisation_id AND c.deleted = false")
, @NamedQuery(name="getAnyOrganisationById",
query="SELECT c FROM Organisation AS c WHERE c.id = :organisation_id")
, @NamedQuery(name="getOrganisationsByIds",
query="SELECT c FROM Organisation AS c WHERE c.id IN :ids")
, @NamedQuery(name="getOrganisationsByUserId",
- query="SELECT ou.organisation FROM User u, IN(u.organisation_users) ou WHERE u.deleted = false AND u.id = :user_id")
+ query="SELECT ou.organisation FROM User u, IN(u.organisationUsers) ou WHERE u.deleted = false AND u.id = :user_id")
, @NamedQuery(name="getNondeletedOrganisations", query="SELECT o FROM Organisation o WHERE o.deleted = false ORDER BY o.id")
, @NamedQuery(name="countOrganisations", query="SELECT COUNT(c) FROM Organisation AS c WHERE c.deleted = false")
})
Copied: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java (from r1629691, openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java?p2=openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java&p1=openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java&r1=1629691&r2=1629710&rev=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java Mon Oct 6 16:48:57 2014
@@ -39,15 +39,15 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name="deleteUsersFromOrganisation", query="DELETE FROM Organisation_Users c WHERE c.organisation.id = :id")
- , @NamedQuery(name="countOrganisationUsers", query="SELECT COUNT(c) FROM Organisation_Users c WHERE c.organisation.id = :id")
- , @NamedQuery(name="getOrganisationUsersById", query="SELECT c FROM Organisation_Users c WHERE c.organisation_users_id = :id")
- , @NamedQuery(name="getOrganisationUsersByOrgId", query="SELECT c FROM Organisation_Users c WHERE c.organisation.id = :id")
- , @NamedQuery(name="isUserInOrganization", query="SELECT c FROM Organisation_Users c WHERE c.organisation.id = :orgId AND c.user.id = :userId")
+ @NamedQuery(name="deleteUsersFromOrganisation", query="DELETE FROM OrganisationUser c WHERE c.organisation.id = :id")
+ , @NamedQuery(name="countOrganisationUsers", query="SELECT COUNT(c) FROM OrganisationUser c WHERE c.organisation.id = :id")
+ , @NamedQuery(name="getOrganisationUsersById", query="SELECT c FROM OrganisationUser c WHERE c.id = :id")
+ , @NamedQuery(name="getOrganisationUsersByOrgId", query="SELECT c FROM OrganisationUser c WHERE c.organisation.id = :id")
+ , @NamedQuery(name="isUserInOrganization", query="SELECT c FROM OrganisationUser c WHERE c.organisation.id = :orgId AND c.user.id = :userId")
})
-@Table(name = "organisation_users")
+@Table(name = "organisation_user")
@Root(name="user_organisation")
-public class Organisation_Users implements IDataProviderEntity {
+public class OrganisationUser implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -76,13 +76,13 @@ public class Organisation_Users implemen
private boolean deleted;
@Column(name = "is_moderator")
- @Element(data=true, required=false)
+ @Element(data = true, required = false)
private Boolean isModerator;
- public Organisation_Users() {
+ public OrganisationUser() {
}
- public Organisation_Users(Organisation organisation) {
+ public OrganisationUser(Organisation organisation) {
this.organisation = organisation;
}
@@ -158,7 +158,7 @@ public class Organisation_Users implemen
return false;
if (getClass() != obj.getClass())
return false;
- Organisation_Users other = (Organisation_Users) obj;
+ OrganisationUser other = (OrganisationUser) obj;
if (id == null) {
if (other.id != null)
return false;
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java Mon Oct 6 16:48:57 2014
@@ -32,11 +32,9 @@ import javax.persistence.Table;
@Entity
@NamedQueries({
- @NamedQuery(name = "getStateById", query = "select c from State as c " +
- "where c.state_id = :state_id AND c.deleted <> :deleted"),
- @NamedQuery(name = "getStates", query = "select c from State as c where c.deleted <> :deleted"),
- @NamedQuery(name = "getStateByName", query = "select c from State as c " +
- "where lower(c.name) LIKE :name AND c.deleted <> :deleted")
+ @NamedQuery(name = "getStateById", query = "select c from State as c where c.state_id = :state_id AND c.deleted = false"),
+ @NamedQuery(name = "getStates", query = "select c from State as c where c.deleted = false"),
+ @NamedQuery(name = "getStateByName", query = "select c from State as c where lower(c.name) LIKE :name AND c.deleted = false")
})
@Table(name = "state")
public class State implements Serializable {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java Mon Oct 6 16:48:57 2014
@@ -73,7 +73,7 @@ import org.simpleframework.xml.Root;
@Entity
@FetchGroups({
@FetchGroup(name = "backupexport", attributes = { @FetchAttribute(name = "password") })
- , @FetchGroup(name = "orgUsers", attributes = { @FetchAttribute(name = "organisation_users")})
+ , @FetchGroup(name = "orgUsers", attributes = { @FetchAttribute(name = "organisationUsers")})
})
@NamedQueries({
@NamedQuery(name = "getUserById", query = "SELECT u FROM User u WHERE u.id = :id"),
@@ -97,7 +97,7 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "updatePassword", query = "UPDATE User u SET u.password = :password WHERE u.id = :userId"), //
@NamedQuery(name = "getNondeletedUsers", query = "SELECT u FROM User u WHERE u.deleted = false"),
@NamedQuery(name = "countNondeletedUsers", query = "SELECT COUNT(u) FROM User u WHERE u.deleted = false"),
- @NamedQuery(name = "getUsersByOrganisationId", query = "SELECT u FROM User u WHERE u.deleted = false AND u.organisation_users.organisation.id = :organisation_id"),
+ @NamedQuery(name = "getUsersByOrganisationId", query = "SELECT u FROM User u WHERE u.deleted = false AND u.organisationUsers.organisation.id = :organisation_id"),
@NamedQuery(name = "getExternalUser", query = "SELECT u FROM User u WHERE u.deleted = false AND u.externalUserId LIKE :externalId AND u.externalUserType LIKE :externalType"),
@NamedQuery(name = "getUserByLoginOrEmail", query = "SELECT u from User u WHERE u.deleted = false AND u.type = :type AND (u.login = :userOrEmail OR u.adresses.email = :userOrEmail)")
})
@@ -201,7 +201,7 @@ public class User implements IDataProvid
@JoinColumn(name = "user_id", insertable = true, updatable = true)
@ElementList(name = "organisations", required = false)
@ElementDependent
- private List<Organisation_Users> organisation_users = new ArrayList<Organisation_Users>();
+ private List<OrganisationUser> organisationUsers = new ArrayList<OrganisationUser>();
@OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@PrimaryKeyJoinColumn(name="sip_user_id", referencedColumnName="id")
@@ -428,16 +428,16 @@ public class User implements IDataProvid
this.language_id = language_id;
}
- public List<Organisation_Users> getOrganisation_users() {
- if (organisation_users == null) {
- organisation_users = new ArrayList<Organisation_Users>();
+ public List<OrganisationUser> getOrganisationUsers() {
+ if (organisationUsers == null) {
+ organisationUsers = new ArrayList<OrganisationUser>();
}
- return organisation_users;
+ return organisationUsers;
}
- public void setOrganisation_users(List<Organisation_Users> organisation_users) {
- if (organisation_users != null) {
- this.organisation_users = organisation_users;
+ public void setOrganisationUsers(List<OrganisationUser> organisationUsers) {
+ if (organisationUsers != null) {
+ this.organisationUsers = organisationUsers;
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java Mon Oct 6 16:48:57 2014
@@ -48,26 +48,26 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getContactsByUserAndStatus", query = "select c from UserContact c " +
"where c.owner.id = :ownerId " +
"AND c.pending = :pending " +
- "AND c.contact.deleted <> true"),
+ "AND c.contact.deleted = false"),
@NamedQuery(name = "getUserContactByShareCalendar", query = "select c from UserContact c "
+ "where c.contact.id = :userId "
+ "AND c.owner.id = :contactId "
+ "AND c.shareCalendar = :shareCalendar "
- + "AND c.contact.deleted <> true"),
+ + "AND c.contact.deleted = false"),
@NamedQuery(name = "getContactsByShareCalendar", query = "select c from UserContact c " +
"where c.contact.id = :contactId " +
"AND c.shareCalendar = :shareCalendar " +
- "AND c.contact.deleted <> true"),
+ "AND c.contact.deleted = false"),
@NamedQuery(name = "getContactRequestsByUserAndStatus", query = "select c from UserContact c " +
"where c.contact.id = :user_id " +
"AND c.pending = :pending " +
- "AND c.contact.deleted <> true"),
+ "AND c.contact.deleted = false"),
@NamedQuery(name = "getContactsByUser", query = "SELECT c FROM UserContact c " +
"WHERE c.contact.id = :user_id " +
- "AND c.contact.deleted <> true ORDER BY c.pending DESC"),
+ "AND c.contact.deleted = false ORDER BY c.pending DESC"),
@NamedQuery(name = "countContactsByUser", query = "select COUNT(c) from UserContact c " +
"where c.contact.id = :user_id " +
- "AND c.contact.deleted <> true"),
+ "AND c.contact.deleted = false"),
@NamedQuery(name = "getUserContactsById", query = "SELECT c FROM UserContact c WHERE c.userContactId = :userContactId"),
@NamedQuery(name = "getUserContacts", query = "SELECT c FROM UserContact c ORDER BY c.userContactId")
})
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java?rev=1629710&r1=1629709&r2=1629710&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java Mon Oct 6 16:48:57 2014
@@ -22,7 +22,7 @@ import static org.apache.openmeetings.ut
import java.util.Set;
-import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
import org.red5.logging.Red5LoggerFactory;
@@ -44,7 +44,7 @@ public class AuthLevelUtil {
public static boolean hasModLevel(User u, Long orgId) {
boolean result = hasAdminLevel(u.getRights());
if (!result && orgId != null) {
- for (Organisation_Users ou : u.getOrganisation_users()) {
+ for (OrganisationUser ou : u.getOrganisationUsers()) {
if (orgId.equals(ou.getOrganisation().getId())) {
if (Boolean.TRUE.equals(ou.getIsModerator())) {
result = true;
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=1629710&r1=1629709&r2=1629710&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 Mon Oct 6 16:48:57 2014
@@ -19,11 +19,11 @@
package org.apache.openmeetings.backup;
import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
-import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType;
import org.simpleframework.xml.stream.InputNode;
import org.simpleframework.xml.stream.OutputNode;
-public class AppointmentReminderTypeConverter extends OmConverter<AppointmentReminderTyps> {
+public class AppointmentReminderTypeConverter extends OmConverter<AppointmentReminderType> {
private AppointmentReminderTypDao appointmentReminderTypDaoImpl;
public AppointmentReminderTypeConverter() {
@@ -34,11 +34,11 @@ public class AppointmentReminderTypeConv
this.appointmentReminderTypDaoImpl = appointmentReminderTypDaoImpl;
}
- public AppointmentReminderTyps read(InputNode node) throws Exception {
+ public AppointmentReminderType read(InputNode node) throws Exception {
return appointmentReminderTypDaoImpl.get(getlongValue(node));
}
- public void write(OutputNode node, AppointmentReminderTyps value) throws Exception {
+ public void write(OutputNode node, AppointmentReminderType value) throws Exception {
node.setData(true);
node.setValue(value == null ? "0" : "" + value.getId());
}