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/01/29 10:01:59 UTC

svn commit: r1562380 - in /openmeetings/trunk/singlewebapp/src: db/java/org/apache/openmeetings/db/dao/calendar/ db/java/org/apache/openmeetings/db/dao/record/ db/java/org/apache/openmeetings/db/dao/room/ db/java/org/apache/openmeetings/db/dao/server/ ...

Author: solomax
Date: Wed Jan 29 09:01:58 2014
New Revision: 1562380

URL: http://svn.apache.org/r1562380
Log:
Entities are ordered by id while backup export

Modified:
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/PollDao.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/ServerDao.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/Room.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/Server.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/UserContact.java
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java Wed Jan 29 09:01:58 2014
@@ -125,7 +125,7 @@ public class AppointmentDao {
 
 	public List<Appointment> getAppointments() {
 		return em.createQuery(
-				"SELECT a FROM Appointment a LEFT JOIN FETCH a.meetingMembers WHERE a.deleted = false "
+				"SELECT a FROM Appointment a LEFT JOIN FETCH a.meetingMembers WHERE a.deleted = false ORDER BY a.id"
 				, Appointment.class).getResultList();
 	}
 

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java Wed Jan 29 09:01:58 2014
@@ -133,7 +133,7 @@ public class FlvRecordingDao {
 
 	public List<FlvRecording> getAllFlvRecordings() {
 		try {
-			String hql = "SELECT c FROM FlvRecording c LEFT JOIN FETCH c.flvRecordingMetaData";
+			String hql = "SELECT c FROM FlvRecording c LEFT JOIN FETCH c.flvRecordingMetaData ORDER BY c.flvRecordingId";
 
 			TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
 

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/PollDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/PollDao.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/PollDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/PollDao.java Wed Jan 29 09:01:58 2014
@@ -140,7 +140,7 @@ public class PollDao {
 	
 	public List<RoomPoll> getPollListBackup() {
 		try {
-			TypedQuery<RoomPoll> q = em.createNamedQuery("getPollListBackup",RoomPoll.class);
+			TypedQuery<RoomPoll> q = em.createNamedQuery("getPollListBackup", RoomPoll.class);
 			return q.getResultList();
 		} catch (NoResultException nre) {
 			//expected

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/ServerDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/ServerDao.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/ServerDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/ServerDao.java Wed Jan 29 09:01:58 2014
@@ -73,8 +73,7 @@ public class ServerDao implements IDataP
 	 * @see org.apache.openmeetings.data.OmDAO#get(int, int)
 	 */
 	public List<Server> get(int start, int max) {
-		TypedQuery<Server> q = em.createNamedQuery("getAllServers",
-				Server.class);
+		TypedQuery<Server> q = em.createNamedQuery("getAllServers", Server.class);
 		q.setFirstResult(start);
 		q.setMaxResults(max);
 		return q.getResultList();

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java Wed Jan 29 09:01:58 2014
@@ -246,8 +246,7 @@ public class AbstractUserDao  {
 
 	public List<User> getAllUsersDeleted() {
 		try {
-			TypedQuery<User> q = em.createNamedQuery("getAllUsers",
-					User.class);
+			TypedQuery<User> q = em.createNamedQuery("getAllUsers", User.class);
 			@SuppressWarnings("unchecked")
 			OpenJPAQuery<User> kq = OpenJPAPersistence.cast(q);
 			kq.getFetchPlan().addFetchGroup("backupexport");

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java Wed Jan 29 09:01:58 2014
@@ -93,8 +93,7 @@ public class PrivateMessageFolderDao imp
 	}
 
 	public List<PrivateMessageFolder> get(int start, int count) {
-		String hql = "select c from PrivateMessageFolder c ";
-		return em.createQuery(hql, PrivateMessageFolder.class)
+		return em.createQuery("SELECT c FROM PrivateMessageFolder c ORDER BY c.privateMessageFolderId", PrivateMessageFolder.class)
 				.setFirstResult(start).setMaxResults(count)
 				.getResultList();
 	}

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java Wed Jan 29 09:01:58 2014
@@ -45,7 +45,7 @@ import org.simpleframework.xml.Root;
 @NamedQueries({
     @NamedQuery(name="getMeetingMemberById"
     		, query="SELECT mm FROM MeetingMember mm WHERE mm.deleted = false AND mm.id = :id")
-    , @NamedQuery(name="getMeetingMembers", query="SELECT mm FROM MeetingMember mm")
+    , @NamedQuery(name="getMeetingMembers", query="SELECT mm FROM MeetingMember mm ORDER BY mm.id")
     , @NamedQuery(name="getMeetingMemberIdsByAppointment"
     		, query="SELECT mm.id FROM MeetingMember mm WHERE mm.deleted = false AND mm.appointment.id = :id")
 })

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java Wed Jan 29 09:01:58 2014
@@ -35,7 +35,7 @@ import org.simpleframework.xml.Root;
 
 @Entity
 @NamedQueries({
-	@NamedQuery(name="getAllFiles", query="SELECT c FROM FileExplorerItem c")
+	@NamedQuery(name="getAllFiles", query="SELECT c FROM FileExplorerItem c ORDER BY c.fileExplorerItemId")
     , @NamedQuery(name="getById", query="SELECT c FROM FileExplorerItem c WHERE c.fileExplorerItemId = :fileExplorerItemId")
     , @NamedQuery(name="getByHash", query="SELECT c FROM FileExplorerItem c WHERE c.fileHash = :fileHash")
 })

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/Room.java Wed Jan 29 09:01:58 2014
@@ -72,7 +72,7 @@ import org.simpleframework.xml.Root;
 	@NamedQuery(name = "getRoomById", query = "SELECT r FROM Room r WHERE r.deleted = false AND r.rooms_id = :id"),
 	@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 LEFT JOIN FETCH r.moderators WHERE r.deleted = false "),
+	@NamedQuery(name = "getBackupRooms", query = "SELECT r FROM Room r LEFT JOIN FETCH r.moderators WHERE r.deleted = false 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 "
 				+ "WHERE c.organisation.organisation_id = :orgId AND c.deleted = false AND c.room.deleted = false AND c.room.appointment = false "

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java Wed Jan 29 09:01:58 2014
@@ -40,7 +40,7 @@ import org.simpleframework.xml.Root;
 
 @Entity
 @NamedQueries({
-	@NamedQuery(name = "getAllRoomsOrganisations", query = "select c from RoomOrganisation as c"),
+	@NamedQuery(name = "getAllRoomsOrganisations", query = "select ro from RoomOrganisation ro ORDER BY ro.rooms_organisation_id"),
 	@NamedQuery(name = "getRoomsOrganisationByOrganisationIdAndRoomType", query = "select c from RoomOrganisation as c "
 			+ "where c.room.roomtypes_id = :roomtypes_id "
 			+ "AND c.organisation.organisation_id = :organisation_id "

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/RoomPoll.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/RoomPoll.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/RoomPoll.java Wed Jan 29 09:01:58 2014
@@ -49,7 +49,7 @@ import org.simpleframework.xml.Root;
 	@NamedQuery(name = "deletePoll", query = "DELETE FROM RoomPoll rp WHERE rp.roomPollId = :roomPollId"),
 	@NamedQuery(name = "getPoll", query = "SELECT rp FROM RoomPoll rp " +
 			"WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived"),
-	@NamedQuery(name = "getPollListBackup", query = "SELECT rp FROM RoomPoll rp"),
+	@NamedQuery(name = "getPollListBackup", query = "SELECT rp FROM RoomPoll rp ORDER BY rp.roomPollId"),
 	@NamedQuery(name = "getArchivedPollList", query = "SELECT rp FROM RoomPoll rp " +
 			"WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived"),
 	@NamedQuery(name = "hasPoll", query = "SELECT COUNT(rp) FROM RoomPoll rp " +

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/LdapConfig.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/LdapConfig.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/LdapConfig.java Wed Jan 29 09:01:58 2014
@@ -43,7 +43,7 @@ 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")
+	, @NamedQuery(name="getActiveLdapConfigs", query="SELECT c FROM LdapConfig c WHERE c.deleted = false AND c.isActive = :isActive ORDER BY c.ldapConfigId")
 })
 @Table(name = "ldapconfig")
 @Root(name="ldapconfig")

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/OAuthServer.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/OAuthServer.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/OAuthServer.java Wed Jan 29 09:01:58 2014
@@ -38,7 +38,7 @@ import org.simpleframework.xml.Root;
 @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 as s where s.deleted = false"),
+		@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 {
@@ -96,15 +96,15 @@ public class OAuthServer implements Seri
 	private String loginParamName;
 	
 	@Column(name = "email_param_name")
-	@Element(data = true)
+	@Element(data = true, required = false)
 	private String emailParamName;
 	
 	@Column(name = "firstname_param_name")
-	@Element(data = true)
+	@Element(data = true, required = false)
 	private String firstnameParamName;
 	
 	@Column(name = "lastname_param_name")
-	@Element(data = true)
+	@Element(data = true, required = false)
 	private String lastnameParamName;
 	
 	@Column(name = "deleted")

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/Server.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/Server.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/Server.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/server/Server.java Wed Jan 29 09:01:58 2014
@@ -43,7 +43,7 @@ import org.simpleframework.xml.Root;
 
 @Entity
 @NamedQueries({
-		@NamedQuery(name = "getAllServers", query = "SELECT s FROM Server s WHERE s.deleted = false"),
+		@NamedQuery(name = "getAllServers", query = "SELECT s FROM Server s WHERE s.deleted = false ORDER BY s.id"),
 		@NamedQuery(name = "getServerCount", query = "SELECT COUNT(s) FROM Server s WHERE s.deleted = false"),
 		@NamedQuery(name = "getServerById", query = "SELECT s FROM Server s LEFT JOIN FETCH s.insertedby LEFT JOIN FETCH s.updatedby WHERE s.deleted = false AND s.id = :id"),
 		@NamedQuery(name = "getServerByName", query = "SELECT s FROM Server s WHERE s.deleted = false AND s.name LIKE :name"),

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java Wed Jan 29 09:01:58 2014
@@ -42,7 +42,7 @@ import org.simpleframework.xml.Root;
 		query="SELECT c FROM Organisation AS c WHERE c.organisation_id = :organisation_id")
 	, @NamedQuery(name="getOrganisationsByUserId",
 		query="SELECT ou.organisation FROM User u, IN(u.organisation_users) ou WHERE u.deleted = false AND u.user_id = :user_id")
-	, @NamedQuery(name="getNondeletedOrganisations", query="SELECT u FROM Organisation u WHERE u.deleted = false")
+	, @NamedQuery(name="getNondeletedOrganisations", query="SELECT o FROM Organisation o WHERE o.deleted = false ORDER BY o.organisation_id")
 	, @NamedQuery(name="countOrganisations", query="SELECT COUNT(c) FROM Organisation AS c WHERE c.deleted = false")
 })
 @Table(name = "organisation")

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java Wed Jan 29 09:01:58 2014
@@ -42,7 +42,7 @@ import org.simpleframework.xml.Root;
 
 @Entity
 @NamedQueries({
-	@NamedQuery(name = "getPrivateMessages", query = "select c from PrivateMessage c"),
+	@NamedQuery(name = "getPrivateMessages", query = "SELECT c FROM PrivateMessage c ORDER BY c.privateMessageId"),
 	@NamedQuery(name = "getPrivateMessagesById", query = "select c from PrivateMessage c " +
 			"where c.privateMessageId = :privateMessageId "),
 	@NamedQuery(name = "getNumberMessages", query = "select COUNT(c.privateMessageId) from PrivateMessage c " +

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java Wed Jan 29 09:01:58 2014
@@ -85,7 +85,7 @@ import org.simpleframework.xml.Root;
 			+ "lower(c.login) LIKE :search "
 			+ "OR lower(c.firstname) LIKE :search "
 			+ "OR lower(c.lastname) LIKE :search )"),
-	@NamedQuery(name = "getAllUsers", query = "SELECT u FROM User u"),
+	@NamedQuery(name = "getAllUsers", query = "SELECT u FROM User u ORDER BY u.user_id"),
 	@NamedQuery(name = "checkPassword", query = "select count(c.user_id) from User c "
 			+ "where c.deleted = false " //
 			+ "AND c.user_id = :userId " //

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/UserContact.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/UserContact.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/UserContact.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/UserContact.java Wed Jan 29 09:01:58 2014
@@ -68,9 +68,8 @@ import org.simpleframework.xml.Root;
 	@NamedQuery(name = "countContactsByUser", query = "select COUNT(c) from UserContact c " +
 			"where c.contact.user_id = :user_id " +
 			"AND c.contact.deleted <> true"),
-	@NamedQuery(name = "getUserContactsById", query = "select c from UserContact c " +
-			"where c.userContactId = :userContactId"),
-	@NamedQuery(name = "getUserContacts", query = "select c from UserContact c")
+	@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")
 })
 @Table(name = "user_contact")
 @Root(name="usercontact")

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java?rev=1562380&r1=1562379&r2=1562380&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java Wed Jan 29 09:01:58 2014
@@ -1356,8 +1356,7 @@ public class RoomManager implements IRoo
 			if (roomtypesId == null || roomtypesId == 0) {
 				return null;
 			}
-			log.debug("getRoomByOwnerAndTypeId : " + ownerId + " || "
-					+ roomtypesId);
+			log.debug("getRoomByOwnerAndTypeId : " + ownerId + " || " + roomtypesId);
 			Room room = null;
 			TypedQuery<Room> query = em.createNamedQuery("getRoomByOwnerAndTypeId", Room.class);
 			query.setParameter("ownerId", ownerId);