Author: solomax
Date: Fri Aug 14 08:19:23 2015
New Revision: 1695833
URL: http://svn.apache.org/r1695833
Log:
[OPENMEETINGS-1118] DTOs are improved, tests are fixed
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentReminderTypeDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FilesObject.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FoldersObject.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LiberaryObject.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentation.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomCountBean.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomUser.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObject.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/server/ClientSessionInfo.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/server/ServerDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java
Fri Aug 14 08:19:23 2015
@@ -27,6 +27,8 @@ public class SearchResult<T> {
private Collection<T> result;
private Long errorId;
+ public SearchResult() {}
+
public String getObjectName() {
return objectName;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java
Fri Aug 14 08:19:23 2015
@@ -36,8 +36,7 @@ public class ServiceResult implements Se
, SUCCESS
}
- public ServiceResult() {
- }
+ public ServiceResult() {}
public ServiceResult(long code, String message, String type) {
super();
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java
Fri Aug 14 08:19:23 2015
@@ -18,12 +18,17 @@
*/
package org.apache.openmeetings.db.dto.calendar;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypeDao;
import org.apache.openmeetings.db.dao.room.RoomTypeDao;
@@ -33,7 +38,10 @@ import org.apache.openmeetings.db.dto.us
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
-public class AppointmentDTO {
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+public class AppointmentDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
private Long id;
private String title;
private String location;
@@ -101,7 +109,7 @@ public class AppointmentDTO {
a.setIcalId(icalId);
a.setMeetingMembers(new ArrayList<MeetingMember>());
for(MeetingMemberDTO mm : meetingMembers) {
- //TODO FIXME a.getMeetingMembers().add(mm.get());
+ //a.getMeetingMembers().add(mm.get());
}
//MeetingMember
a.setLanguageId(languageId);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentReminderTypeDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentReminderTypeDTO.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentReminderTypeDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentReminderTypeDTO.java
Fri Aug 14 08:19:23 2015
@@ -18,10 +18,19 @@
*/
package org.apache.openmeetings.db.dto.calendar;
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypeDao;
import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType;
-public class AppointmentReminderTypeDTO {
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+public class AppointmentReminderTypeDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
private Long id;
private String name;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
Fri Aug 14 08:19:23 2015
@@ -18,10 +18,19 @@
*/
package org.apache.openmeetings.db.dto.calendar;
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
import org.apache.openmeetings.db.dto.user.UserDTO;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
-public class MeetingMemberDTO {
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+public class MeetingMemberDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
private Long id;
private UserDTO user;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java
Fri Aug 14 08:19:23 2015
@@ -31,6 +31,8 @@ public class FileExplorerObject {
private Long userHomeSize;
private Long roomHomeSize;
+ public FileExplorerObject() {}
+
public FileExplorerItem[] getUserHome() {
return userHome;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FilesObject.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FilesObject.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FilesObject.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FilesObject.java
Fri Aug 14 08:19:23 2015
@@ -31,6 +31,9 @@ public class FilesObject {
private String lastModified;
private String fileBytes;
private String isimage;
+
+ public FilesObject() {}
+
public String getFileName() {
return fileName;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FoldersObject.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FoldersObject.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FoldersObject.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FoldersObject.java
Fri Aug 14 08:19:23 2015
@@ -27,6 +27,8 @@ public class FoldersObject {
private String folderName;
private String lastModified;
+ public FoldersObject() {}
+
public String getFolderName() {
return folderName;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LiberaryObject.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LiberaryObject.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LiberaryObject.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LiberaryObject.java
Fri Aug 14 08:19:23 2015
@@ -33,6 +33,9 @@ public class LiberaryObject {
private LinkedList<FoldersObject> foldersList;
private PresentationObject presentationObject;
private String error;
+
+ public LiberaryObject() {}
+
public LinkedList<FilesObject> getFilesList() {
return filesList;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java
Fri Aug 14 08:19:23 2015
@@ -22,6 +22,9 @@ public class LibraryPresenationThumbs {
private String name = "";
private LibraryPresentationThumb[] thumbs = null;
+
+ public LibraryPresenationThumbs() {}
+
public String getName() {
return name;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentation.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentation.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentation.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentation.java
Fri Aug 14 08:19:23 2015
@@ -25,6 +25,8 @@ public class LibraryPresentation {
private LibraryPresentationFile swfDocument = null;
private LibraryPresenationThumbs thumbs = null;
+ public LibraryPresentation() {}
+
public LibraryPresentationFile getOriginalDocument() {
return originalDocument;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java
Fri Aug 14 08:19:23 2015
@@ -25,6 +25,8 @@ public class LibraryPresentationFile {
private String lastmod = null;
private Long size = null;
+ public LibraryPresentationFile() {}
+
public String getName() {
return name;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java
Fri Aug 14 08:19:23 2015
@@ -25,6 +25,8 @@ public class LibraryPresentationThumb {
private String lastmod = null;
private Long size = null;
+ public LibraryPresentationThumb() {}
+
public String getName() {
return name;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java
Fri Aug 14 08:19:23 2015
@@ -31,6 +31,8 @@ public class PresentationObject {
private FilesObject swfDocument;
LinkedList<FilesObject> thumbs;
+ public PresentationObject() {}
+
public FilesObject getOriginalDocument() {
return originalDocument;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java
Fri Aug 14 08:19:23 2015
@@ -26,6 +26,8 @@ public class RecordingContainerData impl
private long userHomeSize;
private long publicFileSize;
+ public RecordingContainerData() {}
+
public long getUserHomeSize() {
return userHomeSize;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
Fri Aug 14 08:19:23 2015
@@ -18,13 +18,21 @@
*/
package org.apache.openmeetings.db.dto.record;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
import org.apache.openmeetings.db.entity.record.FlvRecording;
-public class RecordingDTO {
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+public class RecordingDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
private Long id;
private String name;
private String flvName;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java
Fri Aug 14 08:19:23 2015
@@ -23,6 +23,8 @@ public class BrowserStatus {
private boolean browserInited = false;
private String currentURL = "";
+ public BrowserStatus() {}
+
public boolean isBrowserInited() {
return browserInited;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java
Fri Aug 14 08:19:23 2015
@@ -26,6 +26,8 @@ public class Cliparts {
private String[] generalList;
private List<Cliparts> subCategories;
+ public Cliparts() {}
+
public String[] getGeneralList() {
return generalList;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java
Fri Aug 14 08:19:23 2015
@@ -20,11 +20,16 @@ package org.apache.openmeetings.db.dto.r
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import java.io.Serializable;
import java.security.NoSuchAlgorithmException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Invitation;
@@ -35,7 +40,10 @@ import org.apache.openmeetings.util.cryp
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-public class InvitationDTO {
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+public class InvitationDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
private static final Logger log =
Red5LoggerFactory.getLogger(InvitationDTO.class, webAppRootKey);
private static ThreadLocal<SimpleDateFormat> SDF = new
ThreadLocal<SimpleDateFormat>() {
protected SimpleDateFormat initialValue() {
@@ -56,6 +64,8 @@ public class InvitationDTO {
private String validTo;
private long languageId;
+ public InvitationDTO() {}
+
public String getEmail() {
return email;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomCountBean.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomCountBean.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomCountBean.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomCountBean.java
Fri Aug 14 08:19:23 2015
@@ -24,6 +24,8 @@ public class RoomCountBean {
private Integer roomCount;
private Integer maxUser;
+ public RoomCountBean() {}
+
public long getRoomId() {
return roomId;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
Fri Aug 14 08:19:23 2015
@@ -18,14 +18,22 @@
*/
package org.apache.openmeetings.db.dto.room;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
import org.apache.openmeetings.db.dao.room.RoomTypeDao;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomType;
-public class RoomDTO {
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+public class RoomDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
private Long id;
private String name;
private String comment;
@@ -52,8 +60,7 @@ public class RoomDTO {
private boolean screenSharingHidden;
private boolean whiteboardHidden;
- public RoomDTO() {
- }
+ public RoomDTO() {}
public RoomDTO(Room r) {
id = r.getId();
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java
Fri Aug 14 08:19:23 2015
@@ -18,7 +18,16 @@
*/
package org.apache.openmeetings.db.dto.room;
-public class RoomOptionsDTO {
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+public class RoomOptionsDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
private Long roomId;
private Long recordingId;
private boolean moderator;
@@ -27,6 +36,8 @@ public class RoomOptionsDTO {
private boolean allowSameURLMultipleTimes;
private boolean allowRecording;
+ public RoomOptionsDTO() {}
+
public Long getRoomId() {
return roomId;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java
Fri Aug 14 08:19:23 2015
@@ -28,6 +28,8 @@ public class RoomReturn {
private Date created;
private RoomUser[] roomUser;
+ public RoomReturn() {}
+
public Long getRoomId() {
return roomId;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
Fri Aug 14 08:19:23 2015
@@ -30,8 +30,7 @@ public class RoomSearchResult {
private List<RoomDTO> result;
private Long errorId;
- public RoomSearchResult() {
- }
+ public RoomSearchResult() {}
public RoomSearchResult(SearchResult<Room> copy) {
if (copy != null) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java
Fri Aug 14 08:19:23 2015
@@ -28,6 +28,8 @@ public class RoomStatus {
BrowserStatus browserStatus;
Boolean roomFull = false;
+ public RoomStatus() {}
+
public List<Client> getClientList() {
return clientList;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomUser.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomUser.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomUser.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomUser.java
Fri Aug 14 08:19:23 2015
@@ -27,6 +27,8 @@ public class RoomUser {
private Boolean isBroadCasting;
private String avsettings;
+ public RoomUser() {}
+
public String getFirstname() {
return firstname;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObject.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObject.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObject.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObject.java
Fri Aug 14 08:19:23 2015
@@ -34,6 +34,8 @@ public class WhiteboardObject {
private Map<String, List> roomItems = new HashMap<String, List>();
private Date created = new Date();
+ public WhiteboardObject() {}
+
public Long getWhiteBoardId() {
return whiteBoardId;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
Fri Aug 14 08:19:23 2015
@@ -26,6 +26,8 @@ public class WhiteboardObjectList {
private Long roomId;
private Map<Long,WhiteboardObject> whiteboardObjects = new
HashMap<Long,WhiteboardObject>();
+ public WhiteboardObjectList() {}
+
public Long getRoomId() {
return roomId;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.java
Fri Aug 14 08:19:23 2015
@@ -29,6 +29,8 @@ public class WhiteboardSyncLockObject {
private Date addtime;
private Date inserted;
+ public WhiteboardSyncLockObject() {}
+
public String getPublicSID() {
return publicSID;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/server/ClientSessionInfo.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/server/ClientSessionInfo.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/server/ClientSessionInfo.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/server/ClientSessionInfo.java
Fri Aug 14 08:19:23 2015
@@ -26,6 +26,8 @@ public class ClientSessionInfo {
private Client rcl;
public Long serverId;
+ public ClientSessionInfo() {}
+
public ClientSessionInfo(Client rcl, Long serverId) {
super();
this.rcl = rcl;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/server/ServerDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/server/ServerDTO.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/server/ServerDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/server/ServerDTO.java
Fri Aug 14 08:19:23 2015
@@ -18,9 +18,14 @@
*/
package org.apache.openmeetings.db.dto.server;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
import org.apache.openmeetings.db.entity.server.Server;
/**
@@ -31,7 +36,10 @@ import org.apache.openmeetings.db.entity
* @author sebawagner
*
*/
-public class ServerDTO {
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ServerDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
private Long id;
private String name;
private String address;
@@ -43,6 +51,8 @@ public class ServerDTO {
private boolean active;
private String comment;
+ public ServerDTO() {}
+
public ServerDTO(Server s) {
if (s == null) {
return;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
Fri Aug 14 08:19:23 2015
@@ -18,7 +18,16 @@
*/
package org.apache.openmeetings.db.dto.user;
-public class ExternalUserDTO {
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ExternalUserDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
private String login;
private String firstname;
private String lastname;
@@ -27,6 +36,8 @@ public class ExternalUserDTO {
private String externalId;
private String externalType;
+ public ExternalUserDTO() {}
+
public String getLogin() {
return login;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
Fri Aug 14 08:19:23 2015
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.db.dto.user;
+import java.io.Serializable;
import java.util.Set;
import org.apache.openmeetings.db.dao.user.UserDao;
@@ -26,7 +27,8 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.entity.user.User.Type;
-public class UserDTO {
+public class UserDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
private Long id;
private String login;
private String password;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Fri Aug 14
08:19:23 2015
@@ -192,7 +192,7 @@
</plugin>
<goal>download-single</goal>
<configuration>
-
<url>https://dl.bintray.com/openmeetings/generic/backups/</url>
+
<url>https://dl.bintray.com/openmeetings/generic/backups</url>
<fromFile>@item@</fromFile>
<toDir>${old-backups.dir}</toDir>
<skip>${old-backups.dwnd.skip}</skip>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
Fri Aug 14 08:19:23 2015
@@ -272,7 +272,6 @@
<bean id="fileWebService"
class="org.apache.openmeetings.webservice.FileWebService" />
<bean id="groupWebService"
class="org.apache.openmeetings.webservice.GroupWebService" />
<bean id="recordWebService"
class="org.apache.openmeetings.webservice.RecordingWebService" />
- <bean id="roomWebService"
class="org.apache.openmeetings.webservice.RoomWebService" />
<bean id="roomTypeWebService"
class="org.apache.openmeetings.webservice.RoomTypeWebService" />
<bean id="roomWebService"
class="org.apache.openmeetings.webservice.RoomWebService" />
<bean id="serverWebService"
class="org.apache.openmeetings.webservice.ServerWebService" />
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1695833&r1=1695832&r2=1695833&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
Fri Aug 14 08:19:23 2015
@@ -658,8 +658,8 @@ public class CalendarWebService {
}
// return new Long(-1);
// return numberOfPartizipants;
- }*/
-
+ }
+*/
/**
* Add a meeting member to a certain room. This is the same as adding an
* external user to a event in the calendar.
