This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 602a028 [OPENMEETINGS-1856] sonar should be more happy
602a028 is described below
commit 602a028925a5a389d11e2ff5c4ec55bb74bb14a8
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed Mar 6 14:07:22 2019 +0700
[OPENMEETINGS-1856] sonar should be more happy
---
.../openmeetings/db/entity/basic/ChatMessage.java | 29 ++---
.../db/entity/basic/Configuration.java | 19 ++-
.../openmeetings/db/entity/basic/MailMessage.java | 17 ++-
.../db/entity/calendar/Appointment.java | 135 ++++++++++-----------
.../db/entity/calendar/MeetingMember.java | 13 +-
.../db/entity/calendar/OmCalendar.java | 37 +++---
.../openmeetings/db/entity/file/BaseFileItem.java | 27 ++---
.../openmeetings/db/entity/file/FileItem.java | 37 +++---
.../openmeetings/db/entity/file/FileItemLog.java | 10 +-
.../openmeetings/db/entity/log/ConferenceLog.java | 15 +--
.../openmeetings/db/entity/record/Recording.java | 57 +++++----
.../db/entity/record/RecordingChunk.java | 13 +-
.../openmeetings/db/entity/room/Invitation.java | 9 +-
.../apache/openmeetings/db/entity/room/Room.java | 39 +++---
.../openmeetings/db/entity/room/RoomGroup.java | 5 +-
.../openmeetings/db/entity/room/RoomModerator.java | 13 +-
.../openmeetings/db/entity/room/RoomPoll.java | 24 ++--
.../db/entity/room/RoomPollAnswer.java | 7 +-
.../openmeetings/db/entity/server/LdapConfig.java | 11 +-
.../openmeetings/db/entity/server/OAuthServer.java | 10 +-
.../openmeetings/db/entity/server/SOAPLogin.java | 5 +-
.../openmeetings/db/entity/server/Sessiondata.java | 7 +-
.../apache/openmeetings/db/entity/user/Group.java | 17 ++-
.../openmeetings/db/entity/user/GroupUser.java | 13 +-
.../db/entity/user/PrivateMessage.java | 15 +--
.../apache/openmeetings/db/entity/user/User.java | 43 +++----
.../openmeetings/db/entity/user/UserContact.java | 41 +++----
.../mail/template/AbstractTemplatePanel.java | 5 +-
.../web/admin/users/PasswordDialog.java | 14 +--
.../apache/openmeetings/web/pages/HashPage.java | 3 +-
.../mail/template/subject/TestSubjTemplate.java | 11 +-
.../openmeetings/web/pages/TestHashPage.java | 27 ++++-
pom.xml | 2 +-
33 files changed, 339 insertions(+), 391 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
index 4cee3df..d1b1073 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
@@ -28,7 +28,6 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
@@ -40,21 +39,19 @@ import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
-@NamedQueries({
- @NamedQuery(name = "getChatMessageById", query = "SELECT c FROM
ChatMessage c WHERE c.id = :id")
- , @NamedQuery(name = "getChatMessages", query = "SELECT c FROM
ChatMessage c ORDER BY c.id")
- , @NamedQuery(name = "getGlobalChatMessages", query = "SELECT c FROM
ChatMessage c WHERE c.toUser IS NULL AND c.toRoom IS NULL ORDER BY c.sent DESC")
- , @NamedQuery(name = "getChatMessagesByRoom", query = "SELECT c FROM
ChatMessage c WHERE c.toUser IS NULL AND c.toRoom.id = :roomId"
- + " AND (true = :all OR (false = :all AND
c.needModeration = false)) ORDER BY c.sent DESC")
- , @NamedQuery(name = "getChatMessagesByUser", query = "SELECT c FROM
ChatMessage c WHERE c.toUser IS NOT NULL AND c.toRoom IS NULL AND "
- + "(c.fromUser.id = :userId OR c.toUser.id = :userId)
ORDER BY c.sent DESC")
- , @NamedQuery(name = "getChatMessagesByUserTime", query = "SELECT c
FROM ChatMessage c WHERE c.toUser IS NOT NULL AND c.toRoom IS NULL AND "
- + "(c.fromUser.id = :userId OR c.toUser.id = :userId)
AND c.sent > :date ORDER BY c.sent DESC")
- , @NamedQuery(name = "deleteChatGlobal", query = "DELETE FROM
ChatMessage c WHERE c.toUser IS NULL AND c.toRoom IS NULL")
- , @NamedQuery(name = "deleteChatRoom", query = "DELETE FROM ChatMessage
c WHERE c.toUser IS NULL AND c.toRoom.id = :roomId")
- , @NamedQuery(name = "deleteChatUser", query = "DELETE FROM ChatMessage
c WHERE c.toRoom IS NULL AND c.toUser.id = :userId")
- , @NamedQuery(name = "purgeChatUserName", query = "UPDATE ChatMessage c
SET c.fromName = :purged WHERE c.fromUser.id = :userId")
-})
+@NamedQuery(name = "getChatMessageById", query = "SELECT c FROM ChatMessage c
WHERE c.id = :id")
+@NamedQuery(name = "getChatMessages", query = "SELECT c FROM ChatMessage c
ORDER BY c.id")
+@NamedQuery(name = "getGlobalChatMessages", query = "SELECT c FROM ChatMessage
c WHERE c.toUser IS NULL AND c.toRoom IS NULL ORDER BY c.sent DESC")
+@NamedQuery(name = "getChatMessagesByRoom", query = "SELECT c FROM ChatMessage
c WHERE c.toUser IS NULL AND c.toRoom.id = :roomId"
+ + " AND (true = :all OR (false = :all AND c.needModeration =
false)) ORDER BY c.sent DESC")
+@NamedQuery(name = "getChatMessagesByUser", query = "SELECT c FROM ChatMessage
c WHERE c.toUser IS NOT NULL AND c.toRoom IS NULL AND "
+ + "(c.fromUser.id = :userId OR c.toUser.id = :userId) ORDER BY
c.sent DESC")
+@NamedQuery(name = "getChatMessagesByUserTime", query = "SELECT c FROM
ChatMessage c WHERE c.toUser IS NOT NULL AND c.toRoom IS NULL AND "
+ + "(c.fromUser.id = :userId OR c.toUser.id = :userId) AND
c.sent > :date ORDER BY c.sent DESC")
+@NamedQuery(name = "deleteChatGlobal", query = "DELETE FROM ChatMessage c
WHERE c.toUser IS NULL AND c.toRoom IS NULL")
+@NamedQuery(name = "deleteChatRoom", query = "DELETE FROM ChatMessage c WHERE
c.toUser IS NULL AND c.toRoom.id = :roomId")
+@NamedQuery(name = "deleteChatUser", query = "DELETE FROM ChatMessage c WHERE
c.toRoom IS NULL AND c.toUser.id = :userId")
+@NamedQuery(name = "purgeChatUserName", query = "UPDATE ChatMessage c SET
c.fromName = :purged WHERE c.fromUser.id = :userId")
@Table(name = "chat")
@Root(name = "ChatMessage")
public class ChatMessage implements IDataProviderEntity {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
index eafea67..6d17e8d 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
@@ -29,7 +29,6 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
@@ -40,16 +39,14 @@ import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
-@NamedQueries({
- @NamedQuery(name = "forceGetConfigurationByKey", query =
"SELECT c FROM Configuration c WHERE c.key LIKE :key"),
- @NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c
FROM Configuration c "
- + "WHERE c.key IN :keys and c.deleted = false"),
- @NamedQuery(name = "getNondeletedConfiguration", query =
"SELECT c FROM Configuration c "
- + "LEFT JOIN FETCH c.user WHERE c.deleted =
false ORDER BY c.id ASC"),
- @NamedQuery(name = "getConfigurationById", query = "SELECT c
FROM Configuration c "
- + "LEFT JOIN FETCH c.user WHERE c.id = :id and
c.deleted = false"),
- @NamedQuery(name = "countConfigurations", query = "SELECT
COUNT(c) FROM Configuration c WHERE c.deleted = false")
-})
+@NamedQuery(name = "forceGetConfigurationByKey", query = "SELECT c FROM
Configuration c WHERE c.key LIKE :key")
+@NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c FROM
Configuration c "
+ + "WHERE c.key IN :keys and c.deleted = false")
+@NamedQuery(name = "getNondeletedConfiguration", query = "SELECT c FROM
Configuration c "
+ + "LEFT JOIN FETCH c.user WHERE c.deleted = false ORDER BY c.id
ASC")
+@NamedQuery(name = "getConfigurationById", query = "SELECT c FROM
Configuration c "
+ + "LEFT JOIN FETCH c.user WHERE c.id = :id and c.deleted =
false")
+@NamedQuery(name = "countConfigurations", query = "SELECT COUNT(c) FROM
Configuration c WHERE c.deleted = false")
@Table(name = "configuration")
@Root(name = "config")
public class Configuration extends HistoricalEntity {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
index bff9218..1e2e2b8 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
@@ -26,22 +26,19 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import org.apache.openmeetings.db.entity.HistoricalEntity;
@Entity
-@NamedQueries({
- @NamedQuery(name = "getMailMessageById", query = "SELECT m FROM
MailMessage m WHERE m.id = :id")
- , @NamedQuery(name = "getMailMessages", query = "SELECT m FROM
MailMessage m ORDER BY m.updated, m.inserted")
- , @NamedQuery(name = "getMailMessagesByStatus", query = "SELECT m FROM
MailMessage m WHERE m.status = :status ORDER BY m.updated, m.inserted")
- , @NamedQuery(name = "countMailMessages", query = "SELECT COUNT(m) FROM
MailMessage m")
- , @NamedQuery(name = "resetMailStatusByDate", query = "UPDATE
MailMessage m SET m.status = :noneStatus WHERE m.status = :sendingStatus AND
m.updated < :date")
- , @NamedQuery(name = "resetMailStatusById", query = "UPDATE MailMessage
m SET m.errorCount = 0, m.status = :noneStatus WHERE m.id = :id")
- , @NamedQuery(name = "purgeMailMessages", query = "DELETE FROM
MailMessage m WHERE m.recipients LIKE :email OR m.replyTo LIKE :email")
-})
+@NamedQuery(name = "getMailMessageById", query = "SELECT m FROM MailMessage m
WHERE m.id = :id")
+@NamedQuery(name = "getMailMessages", query = "SELECT m FROM MailMessage m
ORDER BY m.updated, m.inserted")
+@NamedQuery(name = "getMailMessagesByStatus", query = "SELECT m FROM
MailMessage m WHERE m.status = :status ORDER BY m.updated, m.inserted")
+@NamedQuery(name = "countMailMessages", query = "SELECT COUNT(m) FROM
MailMessage m")
+@NamedQuery(name = "resetMailStatusByDate", query = "UPDATE MailMessage m SET
m.status = :noneStatus WHERE m.status = :sendingStatus AND m.updated < :date")
+@NamedQuery(name = "resetMailStatusById", query = "UPDATE MailMessage m SET
m.errorCount = 0, m.status = :noneStatus WHERE m.id = :id")
+@NamedQuery(name = "purgeMailMessages", query = "DELETE FROM MailMessage m
WHERE m.recipients LIKE :email OR m.replyTo LIKE :email")
@Table(name = "email_queue")
public class MailMessage extends HistoricalEntity {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
index 334c2fc..f929491 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
@@ -35,7 +35,6 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
@@ -49,74 +48,72 @@ import org.simpleframework.xml.Root;
@Entity
@Table(name = "appointment")
-@NamedQueries({
- @NamedQuery(name="getAppointmentById", query="SELECT a FROM Appointment
a WHERE a.deleted = false AND a.id = :id")
- , @NamedQuery(name="getAppointmentByIdAny", query="SELECT a FROM
Appointment a WHERE a.id = :id")
- , @NamedQuery(name="getAppointments", query="SELECT a FROM Appointment
a WHERE a.deleted = false ORDER BY a.id")
- , @NamedQuery(name="appointmentsInRange",
- query="SELECT a FROM Appointment a "
- + "WHERE a.deleted = false "
- + " AND ( "
- + " (a.start BETWEEN :start AND :end) "
- + " OR (a.end BETWEEN :start AND :end) "
- + " OR (a.start < :start AND a.end > :end) "
- + " )"
- + " AND a.owner.id = :userId"
- )
- , @NamedQuery(name="joinedAppointmentsInRange",
- query="SELECT a FROM MeetingMember mm INNER JOIN mm.appointment
a "
- + "WHERE mm.deleted = false AND mm.user.id <>
a.owner.id AND mm.user.id = :userId "
- + " AND a.id NOT IN (SELECT a.id FROM Appointment a
WHERE a.owner.id = :userId)"
- + " AND mm.connectedEvent = false "
//connectedEvent is set for the MeetingMember if event is created from "Private
Messages", it is weird
- + " AND ( "
- + " (a.start BETWEEN :start AND :end) "
- + " OR (a.end BETWEEN :start AND :end) "
- + " OR (a.start < :start AND a.end > :end) "
- + " )"
- )
- , @NamedQuery(name="appointmentsInRangeRemind",
- query="SELECT a FROM Appointment a "
- //only ReminderType simple mail is concerned!
- + "WHERE a.deleted = false AND a.reminderEmailSend =
false"
- + " AND (a.reminder <> :none) "
- + " AND ( "
- + " (a.start BETWEEN :start AND :end) "
- + " OR (a.end BETWEEN :start AND :end) "
- + " OR (a.start < :start AND a.end > :end) "
- + " )"
- )
- , @NamedQuery(name="getAppointmentByRoomId", query="SELECT a FROM
Appointment a WHERE a.room.id = :roomId")
- , @NamedQuery(name="getAppointmentByOwnerRoomId", query="SELECT a FROM
Appointment a WHERE a.deleted = false AND a.owner.id = :userId AND a.room.id =
:roomId")
- //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 "
- + " AND ( "
- + " (a.start BETWEEN :start AND :end) "
- + " OR (a.end BETWEEN :start AND :end) "
- + " OR (a.start < :start AND a.end > :end) "
- + " )"
- )
- , @NamedQuery(name="appointedRoomsInRangeByUser",
- query="SELECT a.room FROM MeetingMember mm, IN(mm.appointment)
a "
- + "WHERE mm.deleted = false AND mm.user.id <>
a.owner.id AND mm.user.id = :userId "
- + " AND ( "
- + " (a.start BETWEEN :start AND :end) "
- + " OR (a.end BETWEEN :start AND :end) "
- + " OR (a.start < :start AND a.end > :end) "
- + " )"
- )
- , @NamedQuery(name="getNextAppointment", query="SELECT a FROM
Appointment a WHERE a.deleted = false AND a.start > :start AND a.owner.id =
:userId")
- , @NamedQuery(name="getAppointmentsByTitle", query="SELECT a FROM
Appointment a WHERE a.deleted = false AND a.title LIKE :title AND a.owner.id =
:userId")
-
- //Calendar Related Queries
- , @NamedQuery(name = "getAppointmentsbyCalendar",
- query = "SELECT a FROM Appointment a WHERE a.deleted = false
AND a.calendar.id = :calId ORDER BY a.id")
- , @NamedQuery(name = "getHrefsforAppointmentsinCalendar",
- query = "SELECT a.href FROM Appointment a WHERE a.deleted =
FALSE AND a.calendar.id = :calId ORDER BY a.id")
- , @NamedQuery(name = "deleteAppointmentsbyCalendar",
- query = "UPDATE Appointment a SET a.deleted = true WHERE
a.calendar.id = :calId")
-})
+@NamedQuery(name="getAppointmentById", query="SELECT a FROM Appointment a
WHERE a.deleted = false AND a.id = :id")
+@NamedQuery(name="getAppointmentByIdAny", query="SELECT a FROM Appointment a
WHERE a.id = :id")
+@NamedQuery(name="getAppointments", query="SELECT a FROM Appointment a WHERE
a.deleted = false ORDER BY a.id")
+@NamedQuery(name="appointmentsInRange",
+ query="SELECT a FROM Appointment a "
+ + "WHERE a.deleted = false "
+ + " AND ( "
+ + " (a.start BETWEEN :start AND :end) "
+ + " OR (a.end BETWEEN :start AND :end) "
+ + " OR (a.start < :start AND a.end > :end) "
+ + " )"
+ + " AND a.owner.id = :userId"
+ )
+@NamedQuery(name="joinedAppointmentsInRange",
+ query="SELECT a FROM MeetingMember mm INNER JOIN mm.appointment a "
+ + "WHERE mm.deleted = false AND mm.user.id <> a.owner.id AND
mm.user.id = :userId "
+ + " AND a.id NOT IN (SELECT a.id FROM Appointment a WHERE
a.owner.id = :userId)"
+ + " AND mm.connectedEvent = false " //connectedEvent is set
for the MeetingMember if event is created from "Private Messages", it is weird
+ + " AND ( "
+ + " (a.start BETWEEN :start AND :end) "
+ + " OR (a.end BETWEEN :start AND :end) "
+ + " OR (a.start < :start AND a.end > :end) "
+ + " )"
+ )
+@NamedQuery(name="appointmentsInRangeRemind",
+ query="SELECT a FROM Appointment a "
+ //only ReminderType simple mail is concerned!
+ + "WHERE a.deleted = false AND a.reminderEmailSend = false"
+ + " AND (a.reminder <> :none) "
+ + " AND ( "
+ + " (a.start BETWEEN :start AND :end) "
+ + " OR (a.end BETWEEN :start AND :end) "
+ + " OR (a.start < :start AND a.end > :end) "
+ + " )"
+ )
+@NamedQuery(name="getAppointmentByRoomId", query="SELECT a FROM Appointment a
WHERE a.room.id = :roomId")
+@NamedQuery(name="getAppointmentByOwnerRoomId", query="SELECT a FROM
Appointment a WHERE a.deleted = false AND a.owner.id = :userId AND a.room.id =
:roomId")
+//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 "
+ + " AND ( "
+ + " (a.start BETWEEN :start AND :end) "
+ + " OR (a.end BETWEEN :start AND :end) "
+ + " OR (a.start < :start AND a.end > :end) "
+ + " )"
+ )
+@NamedQuery(name="appointedRoomsInRangeByUser",
+ query="SELECT a.room FROM MeetingMember mm, IN(mm.appointment) a "
+ + "WHERE mm.deleted = false AND mm.user.id <> a.owner.id AND
mm.user.id = :userId "
+ + " AND ( "
+ + " (a.start BETWEEN :start AND :end) "
+ + " OR (a.end BETWEEN :start AND :end) "
+ + " OR (a.start < :start AND a.end > :end) "
+ + " )"
+ )
+@NamedQuery(name="getNextAppointment", query="SELECT a FROM Appointment a
WHERE a.deleted = false AND a.start > :start AND a.owner.id = :userId")
+@NamedQuery(name="getAppointmentsByTitle", query="SELECT a FROM Appointment a
WHERE a.deleted = false AND a.title LIKE :title AND a.owner.id = :userId")
+
+//Calendar Related Queries
+@NamedQuery(name = "getAppointmentsbyCalendar",
+ query = "SELECT a FROM Appointment a WHERE a.deleted = false AND
a.calendar.id = :calId ORDER BY a.id")
+@NamedQuery(name = "getHrefsforAppointmentsinCalendar",
+ query = "SELECT a.href FROM Appointment a WHERE a.deleted = FALSE AND
a.calendar.id = :calId ORDER BY a.id")
+@NamedQuery(name = "deleteAppointmentsbyCalendar",
+ query = "UPDATE Appointment a SET a.deleted = true WHERE a.calendar.id
= :calId")
@Root(name = "appointment")
public class Appointment extends HistoricalEntity {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
index 4dfce4e..2413e8c 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
@@ -27,7 +27,6 @@ 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.OneToOne;
import javax.persistence.Table;
@@ -41,13 +40,11 @@ import org.simpleframework.xml.Root;
@Entity
@Table(name = "meeting_member")
-@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 ORDER BY mm.id")
- , @NamedQuery(name="getMeetingMemberIdsByAppointment"
- , query="SELECT mm.id FROM MeetingMember mm WHERE
mm.deleted = false AND mm.appointment.id = :id")
-})
+@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
ORDER BY mm.id")
+@NamedQuery(name="getMeetingMemberIdsByAppointment"
+ , query="SELECT mm.id FROM MeetingMember mm WHERE mm.deleted =
false AND mm.appointment.id = :id")
@Root(name = "meetingmember")
public class MeetingMember extends HistoricalEntity {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/OmCalendar.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/OmCalendar.java
index f7e7bae..f51d767 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/OmCalendar.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/OmCalendar.java
@@ -28,7 +28,6 @@ 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;
@@ -40,25 +39,23 @@ import org.simpleframework.xml.Root;
@Entity
@Table(name = "om_calendar")
-@NamedQueries({
- @NamedQuery(name = "getCalendars", query = "SELECT c FROM
OmCalendar c WHERE c.deleted = false ORDER BY c.id"),
- @NamedQuery(name = "getCalendarbyUser", query = "SELECT c FROM
OmCalendar c"
- + " WHERE c.deleted = false AND c.owner.id =
:userId AND c.syncType <> OmCalendar$SyncType.GOOGLE_CALENDAR "
- + "ORDER BY c.id")
- // OpenJPA has trouble with referencing Subclasses, thus java $
symbol is used
- // Comes from the OpenJPA Mailing List.
- ,
- @NamedQuery(name = "getGoogleCalendars", query = "SELECT c FROM
OmCalendar c WHERE c.deleted = false AND c.owner.id = :userId "
- + "AND c.syncType =
OmCalendar$SyncType.GOOGLE_CALENDAR ORDER BY c.id"),
- @NamedQuery(name = "getAppointmentsbyCalendarinRange", query =
"SELECT a FROM Appointment a "
- + "WHERE a.deleted = false "
- + " AND ( "
- + " (a.start BETWEEN :start AND
:end) "
- + " OR (a.end BETWEEN :start AND
:end) "
- + " OR (a.start < :start AND a.end
> :end) "
- + " )"
- + " AND a.owner.id = :userId AND
a.calendar.id = :calId "),
- @NamedQuery(name = "getCalendarbyId", query = "SELECT c FROM
OmCalendar c WHERE c.deleted = false AND c.id = :calId") })
+@NamedQuery(name = "getCalendars", query = "SELECT c FROM OmCalendar c WHERE
c.deleted = false ORDER BY c.id")
+@NamedQuery(name = "getCalendarbyUser", query = "SELECT c FROM OmCalendar c"
+ + " WHERE c.deleted = false AND c.owner.id = :userId AND
c.syncType <> OmCalendar$SyncType.GOOGLE_CALENDAR "
+ + "ORDER BY c.id")
+// OpenJPA has trouble with referencing Subclasses, thus java $ symbol is used
+// Comes from the OpenJPA Mailing List.
+@NamedQuery(name = "getGoogleCalendars", query = "SELECT c FROM OmCalendar c
WHERE c.deleted = false AND c.owner.id = :userId "
+ + "AND c.syncType = OmCalendar$SyncType.GOOGLE_CALENDAR ORDER
BY c.id")
+@NamedQuery(name = "getAppointmentsbyCalendarinRange", query = "SELECT a FROM
Appointment a "
+ + "WHERE a.deleted = false "
+ + " AND ( "
+ + " (a.start BETWEEN :start AND :end) "
+ + " OR (a.end BETWEEN :start AND :end) "
+ + " OR (a.start < :start AND a.end > :end) "
+ + " )"
+ + " AND a.owner.id = :userId AND a.calendar.id = :calId ")
+@NamedQuery(name = "getCalendarbyId", query = "SELECT c FROM OmCalendar c
WHERE c.deleted = false AND c.id = :calId")
@Root(name = "calendar")
public class OmCalendar extends HistoricalEntity {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
index 6b9605c..590e328 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
@@ -45,7 +45,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -56,20 +55,18 @@ import org.apache.openmeetings.util.OmFileHelper;
import org.simpleframework.xml.Element;
@Entity
-@NamedQueries({
- @NamedQuery(name = "getFileById", query = "SELECT f FROM BaseFileItem f
WHERE f.deleted = false AND f.id = :id")
- , @NamedQuery(name = "getAnyFileById", query = "SELECT f FROM
BaseFileItem f WHERE f.id = :id")
- , @NamedQuery(name = "getFileByHash", query = "SELECT f FROM
BaseFileItem f WHERE f.deleted = false AND f.hash = :hash")
- , @NamedQuery(name = "getAllFileItemsForRoom", query = "SELECT f FROM
BaseFileItem f"
- + " WHERE f.deleted = false AND f.type <> :folder"
- + " AND (f.roomId IS NULL OR f.roomId = :roomId)"
- + " AND (f.groupId IS NULL OR f.groupId IN :groups)"
- + " AND f.ownerId IS NULL" // not loading personal files
- + " AND f.name LIKE :name"
- + " ORDER BY f.name")
- , @NamedQuery(name = "getFileItemsByIds", query = "SELECT f FROM
BaseFileItem f"
- + " WHERE f.deleted = false AND f.id IN :ids")
-})
+@NamedQuery(name = "getFileById", query = "SELECT f FROM BaseFileItem f WHERE
f.deleted = false AND f.id = :id")
+@NamedQuery(name = "getAnyFileById", query = "SELECT f FROM BaseFileItem f
WHERE f.id = :id")
+@NamedQuery(name = "getFileByHash", query = "SELECT f FROM BaseFileItem f
WHERE f.deleted = false AND f.hash = :hash")
+@NamedQuery(name = "getAllFileItemsForRoom", query = "SELECT f FROM
BaseFileItem f"
+ + " WHERE f.deleted = false AND f.type <> :folder"
+ + " AND (f.roomId IS NULL OR f.roomId = :roomId)"
+ + " AND (f.groupId IS NULL OR f.groupId IN :groups)"
+ + " AND f.ownerId IS NULL" // not loading personal files
+ + " AND f.name LIKE :name"
+ + " ORDER BY f.name")
+@NamedQuery(name = "getFileItemsByIds", query = "SELECT f FROM BaseFileItem f"
+ + " WHERE f.deleted = false AND f.id IN :ids")
@Table(name = "om_file")
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
public abstract class BaseFileItem extends HistoricalEntity {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
index 069cad8..d835273 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
@@ -20,32 +20,29 @@ package org.apache.openmeetings.db.entity.file;
import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
-@NamedQueries({
- @NamedQuery(name = "getAllFiles", query = "SELECT f FROM FileItem f
ORDER BY f.id")
- , @NamedQuery(name = "getFilesByRoom", query = "SELECT f FROM FileItem
f WHERE f.deleted = false AND f.roomId = :roomId " +
- "AND f.ownerId IS NULL AND f.parentId IS NULL ORDER BY
f.type ASC, f.name ")
- , @NamedQuery(name = "getFilesByOwner", query = "SELECT f FROM FileItem
f WHERE f.deleted = false AND f.ownerId = :ownerId "
- + "AND f.parentId IS NULL ORDER BY f.type ASC, f.name ")
- , @NamedQuery(name = "getFilesByParent", query = "SELECT f FROM
FileItem f WHERE f.deleted = false "
- + "AND f.parentId = :parentId ORDER BY f.type ASC,
f.name ")
- , @NamedQuery(name = "getFilesFilteredByParent", query = "SELECT f FROM
FileItem f WHERE f.deleted = false "
- + "AND f.parentId = :parentId AND f.type IN :filter
ORDER BY f.type ASC, f.name ")
- , @NamedQuery(name = "getFileExternal", query = "SELECT f FROM FileItem
f WHERE f.deleted = false AND f.externalId = :externalId AND f.externalType
LIKE :externalType")
- , @NamedQuery(name = "getFileAllExternal", query = "SELECT f FROM
FileItem f WHERE f.deleted = false AND f.externalType LIKE :externalType")
- , @NamedQuery(name = "getFileByGroup", query = "SELECT f FROM FileItem
f WHERE f.deleted = false AND f.ownerId IS NULL "
- + "AND f.groupId = :groupId AND f.parentId IS NULL "
- + "ORDER BY f.type ASC, f.name")
- , @NamedQuery(name = "getFileFilteredByGroup", query = "SELECT f FROM
FileItem f WHERE f.deleted = false AND f.ownerId IS NULL "
- + "AND f.groupId = :groupId AND f.parentId IS NULL AND
f.type IN :filter "
- + "ORDER BY f.type ASC, f.name")
-})
+@NamedQuery(name = "getAllFiles", query = "SELECT f FROM FileItem f ORDER BY
f.id")
+@NamedQuery(name = "getFilesByRoom", query = "SELECT f FROM FileItem f WHERE
f.deleted = false AND f.roomId = :roomId " +
+ "AND f.ownerId IS NULL AND f.parentId IS NULL ORDER BY f.type
ASC, f.name ")
+@NamedQuery(name = "getFilesByOwner", query = "SELECT f FROM FileItem f WHERE
f.deleted = false AND f.ownerId = :ownerId "
+ + "AND f.parentId IS NULL ORDER BY f.type ASC, f.name ")
+@NamedQuery(name = "getFilesByParent", query = "SELECT f FROM FileItem f WHERE
f.deleted = false "
+ + "AND f.parentId = :parentId ORDER BY f.type ASC, f.name ")
+@NamedQuery(name = "getFilesFilteredByParent", query = "SELECT f FROM FileItem
f WHERE f.deleted = false "
+ + "AND f.parentId = :parentId AND f.type IN :filter ORDER BY
f.type ASC, f.name ")
+@NamedQuery(name = "getFileExternal", query = "SELECT f FROM FileItem f WHERE
f.deleted = false AND f.externalId = :externalId AND f.externalType LIKE
:externalType")
+@NamedQuery(name = "getFileAllExternal", query = "SELECT f FROM FileItem f
WHERE f.deleted = false AND f.externalType LIKE :externalType")
+@NamedQuery(name = "getFileByGroup", query = "SELECT f FROM FileItem f WHERE
f.deleted = false AND f.ownerId IS NULL "
+ + "AND f.groupId = :groupId AND f.parentId IS NULL "
+ + "ORDER BY f.type ASC, f.name")
+@NamedQuery(name = "getFileFilteredByGroup", query = "SELECT f FROM FileItem f
WHERE f.deleted = false AND f.ownerId IS NULL "
+ + "AND f.groupId = :groupId AND f.parentId IS NULL AND f.type
IN :filter "
+ + "ORDER BY f.type ASC, f.name")
@Root
public class FileItem extends BaseFileItem {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItemLog.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItemLog.java
index 3e3c9c1..3b2aa15 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItemLog.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItemLog.java
@@ -28,18 +28,14 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
-import javax.persistence.Table;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
@Entity
-@NamedQueries({
- @NamedQuery(name = "getFileLogsByFile", query = "SELECT fl FROM
FileItemLog fl WHERE fl.fileId = :fileId"),
- @NamedQuery(name = "countErrorFileLogsByFile", query = "SELECT
COUNT(fl) FROM FileItemLog fl WHERE fl.fileId = :fileId AND fl.optional = false
AND fl.exitCode <> 0"),
- @NamedQuery(name = "deleteErrorFileLogsByFile", query = "DELETE
FROM FileItemLog fl WHERE fl.fileId = :fileId") })
-@Table(name = "file_log")
+@NamedQuery(name = "getFileLogsByFile", query = "SELECT fl FROM FileItemLog fl
WHERE fl.fileId = :fileId")
+@NamedQuery(name = "countErrorFileLogsByFile", query = "SELECT COUNT(fl) FROM
FileItemLog fl WHERE fl.fileId = :fileId AND fl.optional = false AND
fl.exitCode <> 0")
+@NamedQuery(name = "deleteErrorFileLogsByFile", query = "DELETE FROM
FileItemLog fl WHERE fl.fileId = :fileId")
public class FileItemLog implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
public static final int MAX_LOG_SIZE = 1 * 1024 * 1024;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
index d07d183..06d32e3 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
@@ -27,7 +27,6 @@ import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
@@ -35,14 +34,12 @@ import
org.apache.openmeetings.db.entity.IDataProviderEntity;
@Entity
@Table(name = "conference_log")
-@NamedQueries({
- @NamedQuery(name = "getLogRecentRooms", query = "SELECT c FROM
ConferenceLog c "
- + "WHERE c.roomId IS NOT NULL AND c.type = :roomEnter and
c.userId = :userId ORDER BY c.inserted DESC")
- , @NamedQuery(name = "clearLogUserIpByUser", query = "UPDATE
ConferenceLog c SET c.userip = NULL "
- + "WHERE c.userip IS NOT NULL AND c.userId = :userId")
- , @NamedQuery(name = "clearLogUserIp", query = "UPDATE ConferenceLog c
SET c.userip = NULL "
- + "WHERE c.userip IS NOT NULL AND c.inserted < :date")
-})
+@NamedQuery(name = "getLogRecentRooms", query = "SELECT c FROM ConferenceLog c
"
+ + "WHERE c.roomId IS NOT NULL AND c.type = :roomEnter and c.userId =
:userId ORDER BY c.inserted DESC")
+@NamedQuery(name = "clearLogUserIpByUser", query = "UPDATE ConferenceLog c SET
c.userip = NULL "
+ + "WHERE c.userip IS NOT NULL AND c.userId = :userId")
+@NamedQuery(name = "clearLogUserIp", query = "UPDATE ConferenceLog c SET
c.userip = NULL "
+ + "WHERE c.userip IS NOT NULL AND c.inserted < :date")
public class ConferenceLog implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
index d52f4cf..708bd53 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
@@ -31,7 +31,6 @@ import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.xml.bind.annotation.XmlAccessType;
@@ -60,35 +59,33 @@ import org.simpleframework.xml.Root;
*
*/
@Entity
-@NamedQueries({
- @NamedQuery(name = "getRecordingsByExternalUser", query = "SELECT c
FROM Recording c, User u "
- + "WHERE c.insertedBy = u.id AND u.externalId =
:externalId AND u.externalType = :externalType "
- + "AND c.deleted = false")
- , @NamedQuery(name = "getRecordingsPublic", query = "SELECT f FROM
Recording f WHERE f.deleted = false AND f.ownerId IS NULL "
- + "AND f.groupId IS NULL AND (f.parentId IS NULL OR
f.parentId = 0) "
- + "ORDER BY f.type ASC, f.inserted")
- , @NamedQuery(name = "getRecordingsByGroup", query = "SELECT f FROM
Recording f WHERE f.deleted = false AND f.ownerId IS NULL "
- + "AND f.groupId = :groupId AND (f.parentId IS NULL OR
f.parentId = 0) "
- + "ORDER BY f.type ASC, f.inserted")
- , @NamedQuery(name = "getRecordingsByOwner", query = "SELECT f FROM
Recording f WHERE f.deleted = false AND f.ownerId = :ownerId "
- + "AND (f.parentId IS NULL OR f.parentId = 0) "
- + "ORDER BY f.type ASC, f.inserted")
- , @NamedQuery(name = "resetRecordingProcessingStatus", query = "UPDATE
Recording f SET f.status = :error WHERE f.status IN (:recording, :converting)")
- , @NamedQuery(name = "getRecordingsAll", query = "SELECT c FROM
Recording c LEFT JOIN FETCH c.chunks ORDER BY c.id")
- , @NamedQuery(name = "getRecordingsByRoom", query = "SELECT c FROM
Recording c WHERE c.deleted = false AND c.roomId = :roomId "
- + "ORDER BY c.type ASC, c.inserted")
- , @NamedQuery(name = "getRecordingsByParent", query = "SELECT f FROM
Recording f WHERE f.deleted = false AND f.parentId = :parentId "
- + "ORDER BY f.type ASC, f.inserted")
- , @NamedQuery(name = "getRecordingsByExternalType", query = "SELECT rec
FROM Recording rec, Room r, User u "
- + "WHERE rec.deleted = false AND rec.roomId = r.id AND
rec.insertedBy = u.id "
- + "AND (r.externalType = :externalType OR
u.externalType = :externalType)")
- , @NamedQuery(name = "getExpiringRecordings", query = "SELECT DISTINCT
rec FROM Recording rec "
- + "WHERE rec.deleted = false AND rec.notified =
:notified AND rec.inserted < :date "
- + " AND (rec.groupId = :groupId "
- + " OR rec.ownerId IN (SELECT gu.user.id FROM
GroupUser gu WHERE gu.group.id = :groupId)"
- + " OR rec.roomId IN (SELECT rg.room.id FROM
RoomGroup rg WHERE rg.group.id = :groupId)"
- + " ) order by rec.inserted ASC")
-})
+@NamedQuery(name = "getRecordingsByExternalUser", query = "SELECT c FROM
Recording c, User u "
+ + "WHERE c.insertedBy = u.id AND u.externalId = :externalId
AND u.externalType = :externalType "
+ + "AND c.deleted = false")
+@NamedQuery(name = "getRecordingsPublic", query = "SELECT f FROM Recording f
WHERE f.deleted = false AND f.ownerId IS NULL "
+ + "AND f.groupId IS NULL AND (f.parentId IS NULL OR f.parentId
= 0) "
+ + "ORDER BY f.type ASC, f.inserted")
+@NamedQuery(name = "getRecordingsByGroup", query = "SELECT f FROM Recording f
WHERE f.deleted = false AND f.ownerId IS NULL "
+ + "AND f.groupId = :groupId AND (f.parentId IS NULL OR
f.parentId = 0) "
+ + "ORDER BY f.type ASC, f.inserted")
+@NamedQuery(name = "getRecordingsByOwner", query = "SELECT f FROM Recording f
WHERE f.deleted = false AND f.ownerId = :ownerId "
+ + "AND (f.parentId IS NULL OR f.parentId = 0) "
+ + "ORDER BY f.type ASC, f.inserted")
+@NamedQuery(name = "resetRecordingProcessingStatus", query = "UPDATE Recording
f SET f.status = :error WHERE f.status IN (:recording, :converting)")
+@NamedQuery(name = "getRecordingsAll", query = "SELECT c FROM Recording c LEFT
JOIN FETCH c.chunks ORDER BY c.id")
+@NamedQuery(name = "getRecordingsByRoom", query = "SELECT c FROM Recording c
WHERE c.deleted = false AND c.roomId = :roomId "
+ + "ORDER BY c.type ASC, c.inserted")
+@NamedQuery(name = "getRecordingsByParent", query = "SELECT f FROM Recording f
WHERE f.deleted = false AND f.parentId = :parentId "
+ + "ORDER BY f.type ASC, f.inserted")
+@NamedQuery(name = "getRecordingsByExternalType", query = "SELECT rec FROM
Recording rec, Room r, User u "
+ + "WHERE rec.deleted = false AND rec.roomId = r.id AND
rec.insertedBy = u.id "
+ + "AND (r.externalType = :externalType OR u.externalType =
:externalType)")
+@NamedQuery(name = "getExpiringRecordings", query = "SELECT DISTINCT rec FROM
Recording rec "
+ + "WHERE rec.deleted = false AND rec.notified = :notified AND
rec.inserted < :date "
+ + " AND (rec.groupId = :groupId "
+ + " OR rec.ownerId IN (SELECT gu.user.id FROM GroupUser gu
WHERE gu.group.id = :groupId)"
+ + " OR rec.roomId IN (SELECT rg.room.id FROM RoomGroup rg
WHERE rg.group.id = :groupId)"
+ + " ) order by rec.inserted ASC")
@Root(name = "flvrecording")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingChunk.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingChunk.java
index dba3996..94d8f60 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingChunk.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingChunk.java
@@ -30,7 +30,6 @@ 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.xml.bind.annotation.XmlType;
@@ -50,13 +49,11 @@ import org.simpleframework.xml.Root;
* @author sebawagner
*/
@Entity
-@NamedQueries({
- @NamedQuery(name = "getChunkById", query = "SELECT c FROM
RecordingChunk c WHERE c.id = :id")
- , @NamedQuery(name = "getChunkByRecording", query = "SELECT c FROM
RecordingChunk c WHERE c.recording.id = :recordingId AND c.deleted = false")
- , @NamedQuery(name = "getNotScreenChunkByRecording", query = "SELECT c
FROM RecordingChunk c WHERE c.recording.id = :recordingId AND c.deleted = false
"
- + "AND c.type <> :screen AND c.streamStatus <> :none")
- , @NamedQuery(name = "getScreenChunkByRecording", query = "SELECT c
FROM RecordingChunk c WHERE c.recording.id = :recordingId AND c.type = :screen")
-})
+@NamedQuery(name = "getChunkById", query = "SELECT c FROM RecordingChunk c
WHERE c.id = :id")
+@NamedQuery(name = "getChunkByRecording", query = "SELECT c FROM
RecordingChunk c WHERE c.recording.id = :recordingId AND c.deleted = false")
+@NamedQuery(name = "getNotScreenChunkByRecording", query = "SELECT c FROM
RecordingChunk c WHERE c.recording.id = :recordingId AND c.deleted = false "
+ + "AND c.type <> :screen AND c.streamStatus <> :none")
+@NamedQuery(name = "getScreenChunkByRecording", query = "SELECT c FROM
RecordingChunk c WHERE c.recording.id = :recordingId AND c.type = :screen")
@Table(name = "recording_chunk")
@Root(name = "flvrecordingmetadata")
public class RecordingChunk extends HistoricalEntity {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
index 09ba6d1..f5c57bc 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
@@ -31,7 +31,6 @@ 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;
@@ -43,11 +42,9 @@ import org.apache.openmeetings.db.entity.record.Recording;
import org.apache.openmeetings.db.entity.user.User;
@Entity
-@NamedQueries({
- @NamedQuery(name = "getInvitationbyId", query = "SELECT i FROM
Invitation i WHERE i.deleted = false AND i.id = :id")
- , @NamedQuery(name = "getInvitationByHashCode", query = "SELECT i FROM
Invitation i where i.hash LIKE :hashCode AND i.deleted = false")
- , @NamedQuery(name = "getInvitationByAppointment", query = "SELECT i
FROM Invitation i WHERE i.appointment.id = :appointmentId")
-})
+@NamedQuery(name = "getInvitationbyId", query = "SELECT i FROM Invitation i
WHERE i.deleted = false AND i.id = :id")
+@NamedQuery(name = "getInvitationByHashCode", query = "SELECT i FROM
Invitation i where i.hash LIKE :hashCode AND i.deleted = false")
+@NamedQuery(name = "getInvitationByAppointment", query = "SELECT i FROM
Invitation i WHERE i.appointment.id = :appointmentId")
@Table(name = "invitation")
public class Invitation extends HistoricalEntity {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
index 33077a9..ff68d69 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
@@ -36,7 +36,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.Lob;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
@@ -61,26 +60,24 @@ import org.simpleframework.xml.Root;
, @FetchGroup(name = "roomGroups", attributes = { @FetchAttribute(name
= "groups") })
, @FetchGroup(name = "roomFiles", attributes = { @FetchAttribute(name =
"files") })
})
-@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.type = :type"),
- @NamedQuery(name = "getRoomByOwnerAndTypeId", query = "SELECT r FROM
Room as r WHERE r.ownerId = :ownerId "
- + "AND r.type = :type AND r.deleted =
false"),
- @NamedQuery(name = "selectMaxFromRooms", query = "SELECT COUNT(r.id)
from Room r WHERE r.deleted = false AND r.name LIKE :search "),
- @NamedQuery(name = "getRoomByExternalId", query = "SELECT r FROM Room
as r "
- + "WHERE r.externalId = :externalId AND r.externalType
= :externalType "
- + "AND r.type = :type AND r.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 = "getRoomsByIds", query = "SELECT r FROM Room r WHERE
r.deleted = false AND r.id IN :ids"),
- @NamedQuery(name = "getSipRoomIdsByIds", query = "SELECT r.id FROM Room
r WHERE r.deleted = false AND r.sipEnabled = true AND r.id IN :ids"),
- @NamedQuery(name = "countRooms", query = "SELECT COUNT(r) FROM Room r
WHERE r.deleted = false"),
- @NamedQuery(name = "getBackupRooms", query = "SELECT r FROM Room r
ORDER BY r.id"),
- @NamedQuery(name = "getRoomsCapacityByIds", query = "SELECT
SUM(r.capacity) FROM Room r WHERE r.deleted = false AND r.id IN :ids")
- , @NamedQuery(name = "getGroupRooms", query = "SELECT DISTINCT rg.room
FROM RoomGroup rg LEFT JOIN FETCH rg.room "
- + "WHERE rg.group.id = :groupId AND rg.room.deleted =
false AND rg.room.appointment = false "
- + "ORDER BY rg.room.name ASC")
-})
+@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.type = :type")
+@NamedQuery(name = "getRoomByOwnerAndTypeId", query = "SELECT r FROM Room as r
WHERE r.ownerId = :ownerId "
+ + "AND r.type = :type AND r.deleted = false")
+@NamedQuery(name = "selectMaxFromRooms", query = "SELECT COUNT(r.id) from Room
r WHERE r.deleted = false AND r.name LIKE :search ")
+@NamedQuery(name = "getRoomByExternalId", query = "SELECT r FROM Room as r "
+ + "WHERE r.externalId = :externalId AND r.externalType =
:externalType "
+ + "AND r.type = :type AND r.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 = "getRoomsByIds", query = "SELECT r FROM Room r WHERE
r.deleted = false AND r.id IN :ids")
+@NamedQuery(name = "getSipRoomIdsByIds", query = "SELECT r.id FROM Room r
WHERE r.deleted = false AND r.sipEnabled = true AND r.id IN :ids")
+@NamedQuery(name = "countRooms", query = "SELECT COUNT(r) FROM Room r WHERE
r.deleted = false")
+@NamedQuery(name = "getBackupRooms", query = "SELECT r FROM Room r ORDER BY
r.id")
+@NamedQuery(name = "getRoomsCapacityByIds", query = "SELECT SUM(r.capacity)
FROM Room r WHERE r.deleted = false AND r.id IN :ids")
+@NamedQuery(name = "getGroupRooms", query = "SELECT DISTINCT rg.room FROM
RoomGroup rg LEFT JOIN FETCH rg.room "
+ + "WHERE rg.group.id = :groupId AND rg.room.deleted = false AND
rg.room.appointment = false "
+ + "ORDER BY rg.room.name ASC")
@Table(name = "room")
@Root(name = "room")
@XmlRootElement
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java
index 93f9bd2..4717e60 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java
@@ -26,7 +26,6 @@ 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;
@@ -37,9 +36,7 @@ import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
-@NamedQueries({
- @NamedQuery(name = "getAllRoomGroups", query = "SELECT rg FROM
RoomGroup rg ORDER BY rg.id")
-})
+@NamedQuery(name = "getAllRoomGroups", query = "SELECT rg FROM RoomGroup rg
ORDER BY rg.id")
@Table(name = "room_group")
@Root(name="room_organisation")
public class RoomGroup implements IDataProviderEntity {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
index 5a774fe..2b8c79a 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
@@ -26,7 +26,6 @@ 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;
@@ -37,13 +36,11 @@ import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
-@NamedQueries({
- @NamedQuery(name = "getRoomModeratorById", query = "select c from
RoomModerator as c where c.id = :id"),
- @NamedQuery(name = "getRoomModeratorsByIds", query = "select c from
RoomModerator as c where c.id IN :ids"),
- @NamedQuery(name = "getRoomModeratorByRoomId", query = "select c from
RoomModerator as c where c.roomId = :roomId AND c.deleted = false"),
- @NamedQuery(name = "getRoomModeratorByUserAndRoomId", query = "select c
from RoomModerator as c "
- + "where c.roomId = :roomId AND c.deleted = false AND
c.user.id = :userId")
-})
+@NamedQuery(name = "getRoomModeratorById", query = "select c from
RoomModerator as c where c.id = :id")
+@NamedQuery(name = "getRoomModeratorsByIds", query = "select c from
RoomModerator as c where c.id IN :ids")
+@NamedQuery(name = "getRoomModeratorByRoomId", query = "select c from
RoomModerator as c where c.roomId = :roomId AND c.deleted = false")
+@NamedQuery(name = "getRoomModeratorByUserAndRoomId", query = "select c from
RoomModerator as c "
+ + "where c.roomId = :roomId AND c.deleted = false AND c.user.id
= :userId")
@Table(name = "room_moderator")
@Root(name = "room_moderator")
public class RoomModerator extends HistoricalEntity {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
index 27b529c..900dae3 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
@@ -32,7 +32,6 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
@@ -47,18 +46,17 @@ import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
@Entity
-@NamedQueries({
- @NamedQuery(name = "closePoll", query = "UPDATE RoomPoll rp SET
rp.archived = :archived "
- + "WHERE rp.room.id = :roomId"),
- @NamedQuery(name = "deletePoll", query = "DELETE FROM RoomPoll rp WHERE
rp.id = :id"),
- @NamedQuery(name = "getPollById", query = "SELECT rp FROM RoomPoll rp
WHERE rp.id = :id"),
- @NamedQuery(name = "getPoll", query = "SELECT rp FROM RoomPoll rp "
- + "WHERE rp.room.id = :roomId AND rp.archived = false"),
- @NamedQuery(name = "getPollListBackup", query = "SELECT rp FROM
RoomPoll rp ORDER BY rp.id"),
- @NamedQuery(name = "getArchivedPollList", query = "SELECT rp FROM
RoomPoll rp "
- + "WHERE rp.room.id = :roomId AND rp.archived = true
ORDER BY rp.created DESC"),
- @NamedQuery(name = "hasPoll", query = "SELECT COUNT(rp) FROM RoomPoll
rp "
- + "WHERE rp.room.id = :roomId AND rp.archived =
:archived") })
+@NamedQuery(name = "closePoll", query = "UPDATE RoomPoll rp SET rp.archived =
:archived "
+ + "WHERE rp.room.id = :roomId")
+@NamedQuery(name = "deletePoll", query = "DELETE FROM RoomPoll rp WHERE rp.id
= :id")
+@NamedQuery(name = "getPollById", query = "SELECT rp FROM RoomPoll rp WHERE
rp.id = :id")
+@NamedQuery(name = "getPoll", query = "SELECT rp FROM RoomPoll rp "
+ + "WHERE rp.room.id = :roomId AND rp.archived = false")
+@NamedQuery(name = "getPollListBackup", query = "SELECT rp FROM RoomPoll rp
ORDER BY rp.id")
+@NamedQuery(name = "getArchivedPollList", query = "SELECT rp FROM RoomPoll rp "
+ + "WHERE rp.room.id = :roomId AND rp.archived = true ORDER BY
rp.created DESC")
+@NamedQuery(name = "hasPoll", query = "SELECT COUNT(rp) FROM RoomPoll rp "
+ + "WHERE rp.room.id = :roomId AND rp.archived = :archived")
@Table(name = "room_poll")
@Root(name = "roompoll")
public class RoomPoll implements IDataProviderEntity {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
index be298be..cd55676 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
@@ -27,7 +27,6 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToOne;
import javax.persistence.Table;
@@ -39,10 +38,8 @@ import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
-@NamedQueries({
- @NamedQuery(name = "hasVoted", query = "SELECT rpa FROM RoomPollAnswer
rpa WHERE rpa.roomPoll.room.id = :roomId "
- + "AND rpa.votedUser.id = :userId AND
rpa.roomPoll.archived = false")
-})
+@NamedQuery(name = "hasVoted", query = "SELECT rpa FROM RoomPollAnswer rpa
WHERE rpa.roomPoll.room.id = :roomId "
+ + "AND rpa.votedUser.id = :userId AND rpa.roomPoll.archived =
false")
@Table(name = "room_poll_answer")
@Root(name="roompollanswer")
public class RoomPollAnswer implements IDataProviderEntity {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
index ef89083..58cacbf 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
@@ -27,7 +27,6 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
@@ -38,12 +37,10 @@ import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
-@NamedQueries({
- @NamedQuery(name="getNondeletedLdapConfigs", query="SELECT u FROM
LdapConfig u WHERE u.deleted = false")
- , @NamedQuery(name="getLdapConfigById", query="SELECT c FROM LdapConfig
c WHERE c.id = :id AND c.deleted = false")
- , @NamedQuery(name="countNondeletedLdapConfigs", query="SELECT
COUNT(c.id) FROM LdapConfig c WHERE c.deleted = false")
- , @NamedQuery(name="getActiveLdapConfigs", query="SELECT c FROM
LdapConfig c WHERE c.deleted = false AND c.active = :isActive ORDER BY c.id")
-})
+@NamedQuery(name="getNondeletedLdapConfigs", query="SELECT u FROM LdapConfig u
WHERE u.deleted = false")
+@NamedQuery(name="getLdapConfigById", query="SELECT c FROM LdapConfig c WHERE
c.id = :id AND c.deleted = false")
+@NamedQuery(name="countNondeletedLdapConfigs", query="SELECT COUNT(c.id) FROM
LdapConfig c WHERE c.deleted = false")
+@NamedQuery(name="getActiveLdapConfigs", query="SELECT c FROM LdapConfig c
WHERE c.deleted = false AND c.active = :isActive ORDER BY c.id")
@Table(name = "ldapconfig")
@Root(name="ldapconfig")
public class LdapConfig extends HistoricalEntity {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
index 60e206c..bbeae85 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
@@ -33,7 +33,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.MapKeyColumn;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
@@ -43,11 +42,10 @@ import org.simpleframework.xml.Root;
@Entity
@Table(name = "oauth_server")
-@NamedQueries({
- @NamedQuery(name = "getEnabledOAuthServers", query = "select s from
OAuthServer as s where s.enabled = true and s.deleted = false"),
- @NamedQuery(name = "getOAuthServerById", query = "select s from
OAuthServer as s where s.id = :id"),
- @NamedQuery(name = "getAllOAuthServers", query = "SELECT s FROM
OAuthServer s WHERE s.deleted = false ORDER BY s.id"),
- @NamedQuery(name = "countOAuthServers", query = "select count(s) from
OAuthServer s WHERE s.deleted = false") })
+@NamedQuery(name = "getEnabledOAuthServers", query = "select s from
OAuthServer as s where s.enabled = true and s.deleted = false")
+@NamedQuery(name = "getOAuthServerById", query = "select s from OAuthServer as
s where s.id = :id")
+@NamedQuery(name = "getAllOAuthServers", query = "SELECT s FROM OAuthServer s
WHERE s.deleted = false ORDER BY s.id")
+@NamedQuery(name = "countOAuthServers", query = "select count(s) from
OAuthServer s WHERE s.deleted = false")
@Root
public class OAuthServer extends HistoricalEntity {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
index 9efffc4..fcc22f0 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
@@ -26,15 +26,12 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
@Entity
@Table(name = "soaplogin")
-@NamedQueries({
- @NamedQuery(name = "getSoapLoginByHash", query = "SELECT s FROM
SOAPLogin s WHERE s.hash LIKE :hash")
-})
+@NamedQuery(name = "getSoapLoginByHash", query = "SELECT s FROM SOAPLogin s
WHERE s.hash LIKE :hash")
public class SOAPLogin implements Serializable {
private static final long serialVersionUID = 1L;
@Id
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
index 1bb5a1d..c20b106 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
@@ -27,16 +27,13 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlRootElement;
@Entity
-@NamedQueries({
- @NamedQuery(name = "getSessionById", query = "SELECT s FROM
Sessiondata s WHERE s.sessionId LIKE :sessionId"),
- @NamedQuery(name = "getSessionToDelete", query = "SELECT s FROM
Sessiondata s WHERE s.refreshed < :refreshed AND s.permanent = false")
-})
+@NamedQuery(name = "getSessionById", query = "SELECT s FROM Sessiondata s
WHERE s.sessionId LIKE :sessionId")
+@NamedQuery(name = "getSessionToDelete", query = "SELECT s FROM Sessiondata s
WHERE s.refreshed < :refreshed AND s.permanent = false")
@Table(name = "sessiondata")
@XmlRootElement
public class Sessiondata implements Serializable {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
index 13d48da..1a939e8 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
@@ -23,7 +23,6 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
@@ -32,15 +31,13 @@ import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
-@NamedQueries({
- @NamedQuery(name="getGroupById", query="SELECT g FROM Group AS g WHERE
g.id = :id AND g.deleted = false")
- , @NamedQuery(name="getGroupByName", query="SELECT g FROM Group AS g
WHERE g.name = :name AND g.deleted = false")
- , @NamedQuery(name="getAnyGroupById", query="SELECT g FROM Group AS g
WHERE g.id = :groupId")
- , @NamedQuery(name="getGroupsByIds", query="SELECT g FROM Group AS g
WHERE g.id IN :ids")
- , @NamedQuery(name="getNondeletedGroups", query="SELECT g FROM Group g
WHERE g.deleted = false ORDER BY g.id")
- , @NamedQuery(name="countGroups", query="SELECT COUNT(g) FROM Group AS
g WHERE g.deleted = false")
- , @NamedQuery(name="getLimitedGroups", query="SELECT g FROM Group AS g
WHERE g.deleted = false AND g.limited = true")
-})
+@NamedQuery(name="getGroupById", query="SELECT g FROM Group AS g WHERE g.id =
:id AND g.deleted = false")
+@NamedQuery(name="getGroupByName", query="SELECT g FROM Group AS g WHERE
g.name = :name AND g.deleted = false")
+@NamedQuery(name="getAnyGroupById", query="SELECT g FROM Group AS g WHERE g.id
= :groupId")
+@NamedQuery(name="getGroupsByIds", query="SELECT g FROM Group AS g WHERE g.id
IN :ids")
+@NamedQuery(name="getNondeletedGroups", query="SELECT g FROM Group g WHERE
g.deleted = false ORDER BY g.id")
+@NamedQuery(name="countGroups", query="SELECT COUNT(g) FROM Group AS g WHERE
g.deleted = false")
+@NamedQuery(name="getLimitedGroups", query="SELECT g FROM Group AS g WHERE
g.deleted = false AND g.limited = true")
@Table(name = "om_group")
@Root(name = "organisation")
public class Group extends HistoricalEntity {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java
index f2c0830..d4c5d84 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java
@@ -26,7 +26,6 @@ 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;
@@ -36,13 +35,11 @@ import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
-@NamedQueries({
- @NamedQuery(name="deleteGroupUsersByGroup", query="DELETE FROM
GroupUser gu WHERE gu.group.id = :id")
- , @NamedQuery(name="countGroupUsers", query="SELECT COUNT(c) FROM
GroupUser c WHERE c.group.id = :id")
- , @NamedQuery(name="getGroupUsersById", query="SELECT c FROM GroupUser
c WHERE c.id = :id")
- , @NamedQuery(name="getGroupUsersByGroupId", query="SELECT c FROM
GroupUser c WHERE c.group.id = :id")
- , @NamedQuery(name="isUserInGroup", query="SELECT c FROM GroupUser c
WHERE c.group.id = :groupId AND c.user.id = :userId")
-})
+@NamedQuery(name="deleteGroupUsersByGroup", query="DELETE FROM GroupUser gu
WHERE gu.group.id = :id")
+@NamedQuery(name="countGroupUsers", query="SELECT COUNT(c) FROM GroupUser c
WHERE c.group.id = :id")
+@NamedQuery(name="getGroupUsersById", query="SELECT c FROM GroupUser c WHERE
c.id = :id")
+@NamedQuery(name="getGroupUsersByGroupId", query="SELECT c FROM GroupUser c
WHERE c.group.id = :id")
+@NamedQuery(name="isUserInGroup", query="SELECT c FROM GroupUser c WHERE
c.group.id = :groupId AND c.user.id = :userId")
@Table(name = "group_user")
@Root(name="user_organisation")
public class GroupUser extends HistoricalEntity {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
index 367487c..3655e18 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
@@ -30,7 +30,6 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
@@ -41,14 +40,12 @@ import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
-@NamedQueries({
- @NamedQuery(name = "getPrivateMessages", query = "SELECT c FROM
PrivateMessage c ORDER BY c.id"),
- @NamedQuery(name = "getPrivateMessageById", query = "SELECT c FROM
PrivateMessage c WHERE c.id = :id "),
- @NamedQuery(name = "updatePrivateMessagesReadStatus", query = "UPDATE
PrivateMessage c SET c.isRead = :isRead WHERE c.id IN (:ids) "),
- @NamedQuery(name = "moveMailsToFolder", query = "UPDATE PrivateMessage
c SET c.folderId = :folderId WHERE c.id IN (:ids) "),
- @NamedQuery(name = "deletePrivateMessages", query = "DELETE FROM
PrivateMessage c WHERE c.id IN (:ids) "),
- @NamedQuery(name = "getPrivateMessagesByRoom", query = "SELECT c FROM
PrivateMessage c WHERE c.room.id = :roomId ")
-})
+@NamedQuery(name = "getPrivateMessages", query = "SELECT c FROM PrivateMessage
c ORDER BY c.id")
+@NamedQuery(name = "getPrivateMessageById", query = "SELECT c FROM
PrivateMessage c WHERE c.id = :id ")
+@NamedQuery(name = "updatePrivateMessagesReadStatus", query = "UPDATE
PrivateMessage c SET c.isRead = :isRead WHERE c.id IN (:ids) ")
+@NamedQuery(name = "moveMailsToFolder", query = "UPDATE PrivateMessage c SET
c.folderId = :folderId WHERE c.id IN (:ids) ")
+@NamedQuery(name = "deletePrivateMessages", query = "DELETE FROM
PrivateMessage c WHERE c.id IN (:ids) ")
+@NamedQuery(name = "getPrivateMessagesByRoom", query = "SELECT c FROM
PrivateMessage c WHERE c.room.id = :roomId ")
@Table(name = "private_message")
@Root(name = "privatemessage")
public class PrivateMessage implements IDataProviderEntity {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
index ee20693..8bd83ac 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
@@ -42,7 +42,6 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
@@ -80,28 +79,26 @@ import org.simpleframework.xml.Root;
@FetchGroup(name = "backupexport", attributes = { @FetchAttribute(name
= "password") })
, @FetchGroup(name = "groupUsers", attributes = { @FetchAttribute(name
= "groupUsers")})
})
-@NamedQueries({
- @NamedQuery(name = "getUserById", query = "SELECT u FROM User u WHERE
u.id = :id"),
- @NamedQuery(name = "getUsersByIds", query = "select c from User c where
c.id IN :ids"),
- @NamedQuery(name = "getUserByLogin", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.type = :type AND u.login = :login AND ((:domainId
= 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId = :domainId))"),
- @NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.type = :type AND u.address.email = :email AND
((:domainId = 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId =
:domainId))"),
- @NamedQuery(name = "getUserByHash", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.type = :type AND u.resethash = :resethash"),
- @NamedQuery(name = "getUserByExpiredHash", query = "SELECT u FROM User
u WHERE u.resetDate < :date"),
- @NamedQuery(name = "getContactByEmailAndUser", query = "SELECT u FROM
User u WHERE u.deleted = false AND u.address.email = :email AND u.type = :type
AND u.ownerId = :ownerId"),
- @NamedQuery(name = "selectMaxFromUsersWithSearch", query = "select
count(c.id) from User c "
- + "where c.deleted = false " + "AND ("
- + "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 ORDER
BY u.id"),
- @NamedQuery(name = "getPassword", query = "SELECT u.password FROM User
u WHERE u.deleted = false AND u.id = :userId "),
- @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 = "getUsersByGroupId", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.groupUsers.group.id = :groupId"),
- @NamedQuery(name = "getExternalUser", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.externalId LIKE :externalId AND u.externalType
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.address.email = :userOrEmail)")
-})
+@NamedQuery(name = "getUserById", query = "SELECT u FROM User u WHERE u.id =
:id")
+@NamedQuery(name = "getUsersByIds", query = "select c from User c where c.id
IN :ids")
+@NamedQuery(name = "getUserByLogin", query = "SELECT u FROM User u WHERE
u.deleted = false AND u.type = :type AND u.login = :login AND ((:domainId = 0
AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId = :domainId))")
+@NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User u WHERE
u.deleted = false AND u.type = :type AND u.address.email = :email AND
((:domainId = 0 AND u.domainId IS NULL) OR (:domainId > 0 AND u.domainId =
:domainId))")
+@NamedQuery(name = "getUserByHash", query = "SELECT u FROM User u WHERE
u.deleted = false AND u.type = :type AND u.resethash = :resethash")
+@NamedQuery(name = "getUserByExpiredHash", query = "SELECT u FROM User u
WHERE u.resetDate < :date")
+@NamedQuery(name = "getContactByEmailAndUser", query = "SELECT u FROM User u
WHERE u.deleted = false AND u.address.email = :email AND u.type = :type AND
u.ownerId = :ownerId")
+@NamedQuery(name = "selectMaxFromUsersWithSearch", query = "select count(c.id)
from User c "
+ + "where c.deleted = false " + "AND ("
+ + "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 ORDER BY u.id")
+@NamedQuery(name = "getPassword", query = "SELECT u.password FROM User u WHERE
u.deleted = false AND u.id = :userId ")
+@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 = "getUsersByGroupId", query = "SELECT u FROM User u WHERE
u.deleted = false AND u.groupUsers.group.id = :groupId")
+@NamedQuery(name = "getExternalUser", query = "SELECT u FROM User u WHERE
u.deleted = false AND u.externalId LIKE :externalId AND u.externalType 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.address.email = :userOrEmail)")
@Table(name = "om_user")
@Root(name = "user")
public class User extends HistoricalEntity {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
index 6f01a2a..d965594 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
@@ -29,7 +29,6 @@ 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;
@@ -38,27 +37,25 @@ import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
-@NamedQueries({
- @NamedQuery(name = "deleteUserContact", query = "delete from
UserContact u where u.id = :id"),
- @NamedQuery(name = "deleteAllUserContacts", query = "delete from
UserContact u where u.owner.id = :ownerId"),
- @NamedQuery(name = "getContactByUserOwner", query = "SELECT c FROM
UserContact c WHERE c.contact.id = :userId AND c.owner.id = :ownerId AND
c.contact.deleted = false"),
- @NamedQuery(name = "getContactsByUserAndStatus", query = "select c from
UserContact c " +
- "where c.owner.id = :ownerId " +
- "AND c.pending = :pending " +
- "AND c.contact.deleted = false"),
- @NamedQuery(name = "getContactRequestsByUserAndStatus", query = "select
c from UserContact c " +
- "where c.contact.id = :userId " +
- "AND c.pending = :pending " +
- "AND c.contact.deleted = false"),
- @NamedQuery(name = "getContactsByUser", query = "SELECT c FROM
UserContact c " +
- "WHERE c.contact.id = :userId " +
- "AND c.contact.deleted = false ORDER BY c.pending
DESC"),
- @NamedQuery(name = "countContactsByUser", query = "select COUNT(c) from
UserContact c " +
- "where c.contact.id = :userId " +
- "AND c.contact.deleted = false"),
- @NamedQuery(name = "getUserContactsById", query = "SELECT c FROM
UserContact c WHERE c.id = :id"),
- @NamedQuery(name = "getUserContacts", query = "SELECT c FROM
UserContact c ORDER BY c.id")
-})
+@NamedQuery(name = "deleteUserContact", query = "delete from UserContact u
where u.id = :id")
+@NamedQuery(name = "deleteAllUserContacts", query = "delete from UserContact u
where u.owner.id = :ownerId")
+@NamedQuery(name = "getContactByUserOwner", query = "SELECT c FROM UserContact
c WHERE c.contact.id = :userId AND c.owner.id = :ownerId AND c.contact.deleted
= false")
+@NamedQuery(name = "getContactsByUserAndStatus", query = "select c from
UserContact c " +
+ "where c.owner.id = :ownerId " +
+ "AND c.pending = :pending " +
+ "AND c.contact.deleted = false")
+@NamedQuery(name = "getContactRequestsByUserAndStatus", query = "select c from
UserContact c " +
+ "where c.contact.id = :userId " +
+ "AND c.pending = :pending " +
+ "AND c.contact.deleted = false")
+@NamedQuery(name = "getContactsByUser", query = "SELECT c FROM UserContact c "
+
+ "WHERE c.contact.id = :userId " +
+ "AND c.contact.deleted = false ORDER BY c.pending DESC")
+@NamedQuery(name = "countContactsByUser", query = "select COUNT(c) from
UserContact c " +
+ "where c.contact.id = :userId " +
+ "AND c.contact.deleted = false")
+@NamedQuery(name = "getUserContactsById", query = "SELECT c FROM UserContact c
WHERE c.id = :id")
+@NamedQuery(name = "getUserContacts", query = "SELECT c FROM UserContact c
ORDER BY c.id")
@Table(name = "user_contact")
@Root(name="usercontact")
public class UserContact implements Serializable {
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
index e46786d..39c0d5f 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
@@ -18,11 +18,12 @@
*/
package org.apache.openmeetings.service.mail.template;
+import static org.apache.openmeetings.db.util.FormatHelper.isRtlLanguage;
+
import java.util.Locale;
import org.apache.openmeetings.IApplication;
import org.apache.openmeetings.IWebSession;
-import org.apache.openmeetings.db.util.FormatHelper;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
@@ -40,7 +41,7 @@ public abstract class AbstractTemplatePanel extends Panel {
protected AbstractTemplatePanel(Locale locale) {
super(COMP_ID);
this.locale = locale;
- add(new
TransparentWebMarkupContainer("container").add(AttributeModifier.append("dir",
FormatHelper.isRtlLanguage(this.locale.toLanguageTag()) ? "rtl" : "ltr")));
+ add(new
TransparentWebMarkupContainer("container").add(AttributeModifier.append("dir",
isRtlLanguage(this.locale.toLanguageTag()) ? "rtl" : "ltr")));
}
public static IWebSession getOmSession() {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
index 25efc88..3c36082 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
@@ -40,8 +40,8 @@ import
com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class PasswordDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
- private DialogButton ok;
- private DialogButton cancel;
+ private DialogButton btnOk;
+ private DialogButton btnCancel;
protected final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
private final Form<String> form = new Form<>("form");
private final PasswordTextField pass = new
PasswordTextField("password", Model.of(""));
@@ -60,20 +60,20 @@ public class PasswordDialog extends
AbstractFormDialog<String> {
@Override
protected void onInitialize() {
setTitle(new ResourceModel("537"));
- ok = new DialogButton("ok", getString("54"));
- cancel = new DialogButton("cancel", getString("lbl.cancel"));
+ btnOk = new DialogButton("ok", getString("54"));
+ btnCancel = new DialogButton("cancel", getString("lbl.cancel"));
add(form.add(feedback, pass.setRequired(false).setLabel(new
ResourceModel("110")).setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true)));
super.onInitialize();
}
@Override
protected List<DialogButton> getButtons() {
- return Arrays.asList(ok, cancel);
+ return Arrays.asList(btnOk, btnCancel);
}
@Override
public DialogButton getSubmitButton() {
- return ok;
+ return btnOk;
}
@Override
@@ -94,7 +94,7 @@ public class PasswordDialog extends
AbstractFormDialog<String> {
@Override
public void onClick(AjaxRequestTarget target, DialogButton button) {
- if (!form.hasError() || !button.equals(ok)) {
+ if (!form.hasError() || !button.equals(btnOk)) {
super.onClick(target, button);
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
index 645bc02..e9830f3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
@@ -69,10 +69,11 @@ public class HashPage extends BaseInitedPage implements
IUpdatable {
public static final String APP_TYPE_SETTINGS = "settings";
public static final String SWF = "swf";
public static final String PANEL_MAIN = "panel-main";
+ public static final String PANEL_RECORDING = "panel-recording";
public static final String INVITATION_HASH = "invitation";
static final String HASH = "secure";
static final String LANG = "language";
- private final WebMarkupContainer recContainer = new
WebMarkupContainer("panel-recording");
+ private final WebMarkupContainer recContainer = new
WebMarkupContainer(PANEL_RECORDING);
private final VideoInfo vi = new VideoInfo("info", null);
private final VideoPlayer vp = new VideoPlayer("player");
private boolean error = true;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
index 613ee57..28b70a1 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
@@ -23,6 +23,8 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
import java.util.function.Consumer;
@@ -47,7 +49,14 @@ public class TestSubjTemplate extends AbstractWicketTester {
String[] ids = TimeZone.getAvailableIDs();
Recording rec = new Recording();
rec.setRoomId(5L);
- for (User u : userDao.get(0, 100)) {
+ List<User> users = new ArrayList<>(userDao.get(0, 100));
+ User en = new User();
+ en.setLanguageId(1L); // ltr
+ User ar = new User();
+ ar.setLanguageId(14L); // rtl, arabic
+ users.add(en);
+ users.add(ar);
+ for (User u : users) {
TimeZone tz =
TimeZone.getTimeZone(ids[rnd.nextInt(ids.length)]);
checkTemplate(CreatedAppointmentTemplate.get(u, a, tz,
u.getLogin()));
checkTemplate(CanceledAppointmentTemplate.get(u, a, tz,
u.getLogin()));
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
index ea648b4..48ff625 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
@@ -23,6 +23,7 @@ import static
org.apache.openmeetings.web.common.OmWebSocketPanel.CONNECTED_MSG;
import static org.apache.openmeetings.web.pages.HashPage.HASH;
import static org.apache.openmeetings.web.pages.HashPage.INVITATION_HASH;
import static org.apache.openmeetings.web.pages.HashPage.PANEL_MAIN;
+import static org.apache.openmeetings.web.pages.HashPage.PANEL_RECORDING;
import static org.apache.openmeetings.web.util.OmUrlFragment.CHILD_ID;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -41,11 +42,12 @@ import
org.apache.openmeetings.db.entity.room.Invitation.Valid;
import org.apache.openmeetings.util.crypt.CryptProvider;
import org.apache.openmeetings.web.common.MainPanel;
import org.apache.openmeetings.web.room.RoomPanel;
+import org.apache.openmeetings.web.user.record.VideoInfo;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.protocol.ws.util.tester.WebSocketTester;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.string.Strings;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -72,11 +74,16 @@ public class TestHashPage extends AbstractWicketTester {
tester.assertInvisible(PANEL_MAIN);
}
- private void checkPanel(PageParameters pp, Class<? extends Panel>
clazz) {
+ private HashPage commonCheck(PageParameters pp) {
HashPage page = tester.startPage(HashPage.class, pp);
tester.assertRenderedPage(HashPage.class);
MessageDialog dlg =
(MessageDialog)tester.getComponentFromLastRenderedPage("access-denied");
assertFalse("Access denied should NOT be displayed",
((JQueryBehavior)dlg.getBehaviors().get(0)).getOption("autoOpen"));
+ return page;
+ }
+
+ private void checkMainPanel(PageParameters pp, Class<? extends Panel>
clazz) {
+ HashPage page = commonCheck(pp);
tester.assertComponent(PANEL_MAIN, MainPanel.class);
tester.assertInvisible("header");
@@ -85,6 +92,17 @@ public class TestHashPage extends AbstractWicketTester {
tester.assertComponent(String.format("%s:contents:%s",
PANEL_MAIN, CHILD_ID), clazz);
}
+ private void checkRecordingPanel(PageParameters pp, Class<? extends
Panel> clazz) {
+ HashPage page = commonCheck(pp);
+ tester.assertComponent(PANEL_RECORDING,
WebMarkupContainer.class);
+ tester.assertVisible(PANEL_RECORDING);
+ tester.assertVisible("header");
+
+ WebSocketTester webSocketTester = new WebSocketTester(tester,
page);
+ webSocketTester.sendMessage(CONNECTED_MSG);
+ tester.assertComponent(String.format("%s:%s", PANEL_RECORDING,
"info"), clazz);
+ }
+
private Invitation get(Long userId, Long roomId, Long apptId, Long
recId, Valid valid, String passwd, Date from, Date to) {
Invitation i = new Invitation();
i.setHash(randomUUID().toString());
@@ -152,10 +170,9 @@ public class TestHashPage extends AbstractWicketTester {
@Test
public void testValidOneTimeRoom() {
Invitation i = get(1L, 2L, null, null, Valid.OneTime, null,
null, null);
- checkPanel(new PageParameters().add(INVITATION_HASH,
i.getHash()), RoomPanel.class);
+ checkMainPanel(new PageParameters().add(INVITATION_HASH,
i.getHash()), RoomPanel.class);
}
- @Ignore
@Test
public void testValidOneTimeRecording() {
// panel-recording
@@ -163,6 +180,6 @@ public class TestHashPage extends AbstractWicketTester {
rec.setOwnerId(1L);
recDao.update(rec);
Invitation i = get(1L, null, null, rec.getId(), Valid.OneTime,
null, null, null);
- checkPanel(new PageParameters().add(INVITATION_HASH,
i.getHash()), RoomPanel.class);
+ checkRecordingPanel(new PageParameters().add(INVITATION_HASH,
i.getHash()), VideoInfo.class);
}
}
diff --git a/pom.xml b/pom.xml
index f55e410..7208460 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<db>derby</db>
<jdk.version>1.8</jdk.version>
<!-- plugin versions -->
-
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
+
<maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
<maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
