Author: solomax
Date: Sat Oct 11 09:36:06 2014
New Revision: 1631032
URL: http://svn.apache.org/r1631032
Log:
[OPENMEETINGS-1102] DTO are being returned by web services
Added:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/record/
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java
- copied, changed from r1630296,
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java
- copied, changed from r1631024,
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
Removed:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingObject.java
Modified:
openmeetings/branches/3.0.x/docs/RoomService.html
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
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/RoomWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/branches/3.0.x/docs/RoomService.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/docs/RoomService.html?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/docs/RoomService.html (original)
+++ openmeetings/branches/3.0.x/docs/RoomService.html Sat Oct 11 09:36:06 2014
@@ -378,7 +378,7 @@
Gets a list of flv recordings
</p>
<p>
- Return Type:
java.util.List<org.apache.openmeetings.db.dto.file.RecordingObject>
+ Return Type:
java.util.List<org.apache.openmeetings.db.dto.record.RecordingObject>
</p>
<p>Params:</p>
@@ -440,7 +440,7 @@
Gets a list of flv recordings
</p>
<p>
- Return Type:
org.apache.openmeetings.db.dto.file.RecordingObject[]
+ Return Type:
org.apache.openmeetings.db.dto.record.RecordingObject[]
</p>
<p>Params:</p>
Modified:
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
(original)
+++
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
Sat Oct 11 09:36:06 2014
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -44,11 +43,11 @@ import org.apache.openmeetings.db.dao.ro
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.dto.file.RecordingObject;
+import org.apache.openmeetings.db.dto.record.RecordingDTO;
+import org.apache.openmeetings.db.dto.room.RoomDTO;
import org.apache.openmeetings.db.dto.room.RoomSearchResult;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
-import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.room.Invitation;
import org.apache.openmeetings.db.entity.room.Invitation.Valid;
@@ -122,32 +121,12 @@ public class RoomWebService {
* @return - list of public rooms
* @throws AxisFault
*/
- public Room[] getRoomsPublic(String SID, Long roomtypes_id)
- throws AxisFault {
+ public List<RoomDTO> getRoomsPublic(String SID, Long roomtypes_id)
throws AxisFault {
try {
-
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
-
- List<Room> roomList =
roomDao.getPublicRooms(roomtypes_id);
- // We need to re-marshal the Rooms object cause
Axis2 cannot use
- // our objects
- if (roomList != null && roomList.size() != 0) {
- //
roomsListObject.setRoomList(roomList);
- Room[] roomItems = new
Room[roomList.size()];
- int count = 0;
- for (Iterator<Room> it =
roomList.iterator(); it.hasNext();) {
- Room room = it.next();
- room.setCurrentusers(null);
- roomItems[count] = room;
- count++;
- }
-
- return roomItems;
- }
- log.debug("roomList SIZE: " + roomList.size());
-
+ return
RoomDTO.list(roomDao.getPublicRooms(roomtypes_id));
}
return null;
} catch (Exception err) {
@@ -167,22 +146,18 @@ public class RoomWebService {
* @return - true if recording was deleted
* @throws AxisFault
*/
- public boolean deleteFlvRecording(String SID, Long flvRecordingId)
- throws AxisFault {
+ public boolean deleteFlvRecording(String SID, Long flvRecordingId)
throws AxisFault {
try {
-
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
return flvRecordingDao.delete(flvRecordingId);
}
-
+ return false;
} catch (Exception err) {
log.error("[deleteFlvRecording] ", err);
throw new AxisFault(err.getMessage());
}
-
- return false;
}
/**
@@ -195,13 +170,13 @@ public class RoomWebService {
* @return - list of flv recordings
* @throws AxisFault
*/
- public List<RecordingObject> getFlvRecordingByExternalUserId(String SID,
+ public List<RecordingDTO> getFlvRecordingByExternalUserId(String SID,
String externalUserId, String externalUserType) throws
AxisFault {
try {
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return
flvRecordingDao.getFlvRecordingByExternalUserId(externalUserId,
externalUserType);
+ return
RecordingDTO.list(flvRecordingDao.getFlvRecordingByExternalUserId(externalUserId,
externalUserType));
}
return null;
@@ -223,34 +198,14 @@ public class RoomWebService {
* @return - list of flv recordings
* @throws AxisFault
*/
- public RecordingObject[] getFlvRecordingByExternalRoomTypeAndCreator(
+ public List<RecordingDTO> getFlvRecordingByExternalRoomTypeAndCreator(
String SID, String externalRoomType, Long insertedBy)
throws AxisFault {
try {
-
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- List<FlvRecording> recordingList =
flvRecordingDao
-
.getFlvRecordingByExternalRoomTypeAndCreator(
-
externalRoomType, insertedBy);
-
- // We need to re-marshal the Rooms object cause
Axis2 cannot use
- // our objects
- if (recordingList != null &&
recordingList.size() != 0) {
- //
roomsListObject.setRoomList(roomList);
- RecordingObject[] recordingListItems =
new RecordingObject[recordingList.size()];
- int count = 0;
- for (Iterator<FlvRecording> it =
recordingList.iterator(); it.hasNext();) {
- FlvRecording flvRecording =
it.next();
- recordingListItems[count] = new
RecordingObject(flvRecording);
- count++;
- }
-
- return recordingListItems;
- }
-
- return null;
+ return
RecordingDTO.list(flvRecordingDao.getFlvRecordingByExternalRoomTypeAndCreator(externalRoomType,
insertedBy));
}
return null;
@@ -270,15 +225,13 @@ public class RoomWebService {
* @return - list of flv recordings
* @throws AxisFault
*/
- public List<FlvRecording> getFlvRecordingByExternalRoomTypeByList(
+ public List<RecordingDTO> getFlvRecordingByExternalRoomTypeByList(
String SID, String externalRoomType) throws AxisFault {
try {
-
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return
flvRecordingDao.getFlvRecordingByExternalRoomType(externalRoomType);
-
+ return
RecordingDTO.list(flvRecordingDao.getFlvRecordingByExternalRoomType(externalRoomType));
}
return null;
@@ -298,12 +251,12 @@ public class RoomWebService {
* @return - list of flv recordings
* @throws AxisFault
*/
- public List<FlvRecording> getRecordingsByExternalType(String SID,
String externalType) throws AxisFault {
+ public List<RecordingDTO> getRecordingsByExternalType(String SID,
String externalType) throws AxisFault {
try {
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return
flvRecordingDao.getRecordingsByExternalType(externalType);
+ return
RecordingDTO.list(flvRecordingDao.getRecordingsByExternalType(externalType));
}
return null;
@@ -323,33 +276,12 @@ public class RoomWebService {
* @return - list of flv recordings
* @throws AxisFault
*/
- public FlvRecording[] getFlvRecordingByExternalRoomType(String SID,
- String externalRoomType) throws AxisFault {
+ public List<RecordingDTO> getFlvRecordingByExternalRoomType(String SID,
String externalRoomType) throws AxisFault {
try {
-
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- List<FlvRecording> recordingList =
flvRecordingDao.getFlvRecordingByExternalRoomType(externalRoomType);
-
- // We need to re-marshal the Rooms object cause
Axis2 cannot use
- // our objects
- if (recordingList != null &&
recordingList.size() != 0) {
- //
roomsListObject.setRoomList(roomList);
- FlvRecording[] recordingListItems = new
FlvRecording[recordingList
- .size()];
- int count = 0;
- for (Iterator<FlvRecording> it =
recordingList.iterator(); it
- .hasNext();) {
- FlvRecording flvRecording =
it.next();
- recordingListItems[count] =
flvRecording;
- count++;
- }
-
- return recordingListItems;
- }
-
- return null;
+ return
RecordingDTO.list(flvRecordingDao.getFlvRecordingByExternalRoomType(externalRoomType));
}
return null;
@@ -369,35 +301,12 @@ public class RoomWebService {
* @return - list of recordings
* @throws AxisFault
*/
- public FlvRecording[] getFlvRecordingByRoomId(String SID, Long roomId)
- throws AxisFault {
+ public List<RecordingDTO> getFlvRecordingByRoomId(String SID, Long
roomId) throws AxisFault {
try {
-
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
-
- List<FlvRecording> recordingList =
flvRecordingDao
-
.getFlvRecordingByRoomId(roomId);
-
- // We need to re-marshal the Rooms object cause
Axis2 cannot use
- // our objects
- if (recordingList != null &&
recordingList.size() != 0) {
- //
roomsListObject.setRoomList(roomList);
- FlvRecording[] recordingListItems = new
FlvRecording[recordingList
- .size()];
- int count = 0;
- for (Iterator<FlvRecording> it =
recordingList.iterator(); it
- .hasNext();) {
- FlvRecording flvRecording =
it.next();
- recordingListItems[count] =
flvRecording;
- count++;
- }
-
- return recordingListItems;
- }
-
- return null;
+ return
RecordingDTO.list(flvRecordingDao.getFlvRecordingByRoomId(roomId));
}
return null;
@@ -477,8 +386,8 @@ public class RoomWebService {
* @param rooms_id - the room id
* @return - room with the id given
*/
- public Room getRoomById(String SID, long rooms_id) {
- return conferenceService.getRoomById(SID, rooms_id);
+ public RoomDTO getRoomById(String SID, long rooms_id) {
+ return new RoomDTO(conferenceService.getRoomById(SID,
rooms_id));
}
/**
@@ -573,74 +482,6 @@ public class RoomWebService {
// TODO: Add functions to get Users of a Room
/**
- * TODO: Fix Organization Issue
- *
- * deprecated use addRoomWithModeration instead
- *
- * @param SID
- * The SID of the User. This SID must be marked as Loggedin
- * @param name
- * @param roomtypes_id
- * @param comment
- * @param numberOfPartizipants
- * @param ispublic
- * @param videoPodWidth
- * @param videoPodHeight
- * @param videoPodXPosition
- * @param videoPodYPosition
- * @param moderationPanelXPosition
- * @param showWhiteBoard
- * @param whiteBoardPanelXPosition
- * @param whiteBoardPanelYPosition
- * @param whiteBoardPanelHeight
- * @param whiteBoardPanelWidth
- * @param showFilesPanel
- * @param filesPanelXPosition
- * @param filesPanelYPosition
- * @param filesPanelHeight
- * @param filesPanelWidth
- * @return - id of the room or error code
- */
- @Deprecated
- public Long addRoom(String SID, String name, Long roomtypes_id,
- String comment, Long numberOfPartizipants, Boolean
ispublic,
- Integer videoPodWidth, Integer videoPodHeight,
- Integer videoPodXPosition, Integer videoPodYPosition,
- Integer moderationPanelXPosition, Boolean
showWhiteBoard,
- Integer whiteBoardPanelXPosition, Integer
whiteBoardPanelYPosition,
- Integer whiteBoardPanelHeight, Integer
whiteBoardPanelWidth,
- Boolean showFilesPanel, Integer filesPanelXPosition,
- Integer filesPanelYPosition, Integer filesPanelHeight,
- Integer filesPanelWidth) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.addRoom(name, roomtypes_id,
comment,
- numberOfPartizipants, ispublic,
null, false, false,
- null, false, null, true, false,
false, false //isClosed
- , "", "",
- null, null, null, false, //
hideTopBar
- false, // hideChat
- false, //
hideActivitiesAndActions
- false, // hideFilesExplorer
- false, // hideActionsMenu
- false, // hideScreenSharing
- false, // hideWhiteboard
- false, // showMicrophoneStatus
- false, // chatModerated
- false, // chatOpened
- false, // filesOpened
- false, // autoVideoSelect
- false //sipEnabled
- );
- }
- } catch (Exception err) {
- log.error("[addRoom] ", err);
- }
- return new Long(-1);
- }
-
- /**
* Create a conference room
*
* @param SID
@@ -1007,74 +848,6 @@ public class RoomWebService {
}
/**
- * TODO: Fix Organization Issue deprecated use updateRoomWithModeration
- *
- * @param SID
- * The SID of the User. This SID must be marked as Loggedin
- * @param rooms_id
- * @param name
- * @param roomtypes_id
- * @param comment
- * @param numberOfPartizipants
- * @param ispublic
- * @param videoPodWidth
- * @param videoPodHeight
- * @param videoPodXPosition
- * @param videoPodYPosition
- * @param moderationPanelXPosition
- * @param showWhiteBoard
- * @param whiteBoardPanelXPosition
- * @param whiteBoardPanelYPosition
- * @param whiteBoardPanelHeight
- * @param whiteBoardPanelWidth
- * @param showFilesPanel
- * @param filesPanelXPosition
- * @param filesPanelYPosition
- * @param filesPanelHeight
- * @param filesPanelWidth
- *
- * @return - id of the room updated or error code
- */
- @Deprecated
- public Long updateRoom(String SID, Long rooms_id, String name,
- Long roomtypes_id, String comment, Long
numberOfPartizipants,
- Boolean ispublic, Integer videoPodWidth, Integer
videoPodHeight,
- Integer videoPodXPosition, Integer videoPodYPosition,
- Integer moderationPanelXPosition, Boolean
showWhiteBoard,
- Integer whiteBoardPanelXPosition, Integer
whiteBoardPanelYPosition,
- Integer whiteBoardPanelHeight, Integer
whiteBoardPanelWidth,
- Boolean showFilesPanel, Integer filesPanelXPosition,
- Integer filesPanelYPosition, Integer filesPanelHeight,
- Integer filesPanelWidth, Boolean appointment) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.updateRoomInternal(rooms_id,
- roomtypes_id, name, ispublic,
comment,
- numberOfPartizipants, null,
appointment, false, null,
- false, null, true, false, true,
false, "", "", null,
- null, null, false, // hideTopBar
- false, // hideChat
- false, //
hideActivitiesAndActions
- false, // hideFilesExplorer
- false, // hideActionsMenu
- false, // hideScreenSharing
- false, // hideWhiteboard
- false, // showMicrophoneStatus
- false, // chatModerated
- false, // chatOpened
- false, // filesOpened
- false, // autoVideoSelect
- false //sipEnabled
- );
- }
- } catch (Exception err) {
- log.error("[addRoom] ", err);
- }
- return new Long(-1);
- }
-
- /**
* Updates a conference room by its room id
*
* @param SID
Modified:
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
(original)
+++
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
Sat Oct 11 09:36:06 2014
@@ -22,15 +22,14 @@ import java.util.Date;
import java.util.List;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.db.dto.file.RecordingObject;
+import org.apache.openmeetings.db.dto.record.RecordingDTO;
+import org.apache.openmeetings.db.dto.room.RoomDTO;
import org.apache.openmeetings.db.dto.room.RoomSearchResult;
-import org.apache.openmeetings.db.entity.record.FlvRecording;
-import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomType;
public class RoomWebServiceFacade extends BaseWebService {
- public Room[] getRoomsPublic(String SID, Long roomtypes_id) throws
AxisFault {
+ public List<RoomDTO> getRoomsPublic(String SID, Long roomtypes_id)
throws AxisFault {
return getBean(RoomWebService.class).getRoomsPublic(SID,
roomtypes_id);
}
@@ -50,12 +49,12 @@ public class RoomWebServiceFacade extend
flvRecordingId);
}
- public List<RecordingObject> getFlvRecordingByExternalUserId(String SID,
+ public List<RecordingDTO> getFlvRecordingByExternalUserId(String SID,
String externalUserId, String externalUserType) throws
AxisFault {
return
getBean(RoomWebService.class).getFlvRecordingByExternalUserId(SID,
externalUserId, externalUserType);
}
- public RecordingObject[] getFlvRecordingByExternalRoomTypeAndCreator(
+ public List<RecordingDTO> getFlvRecordingByExternalRoomTypeAndCreator(
String SID, String externalRoomType, Long insertedBy)
throws AxisFault {
return getBean(RoomWebService.class)
@@ -63,21 +62,20 @@ public class RoomWebServiceFacade extend
externalRoomType, insertedBy);
}
- public List<FlvRecording> getFlvRecordingByExternalRoomTypeByList(
- String SID, String externalRoomType) throws AxisFault {
+ public List<RecordingDTO>
getFlvRecordingByExternalRoomTypeByList(String SID, String externalRoomType)
throws AxisFault {
return getBean(RoomWebService.class)
.getFlvRecordingByExternalRoomTypeByList(SID,
externalRoomType);
}
- public List<FlvRecording> getRecordingsByExternalType(String SID,
String externalType) throws AxisFault {
+ public List<RecordingDTO> getRecordingsByExternalType(String SID,
String externalType) throws AxisFault {
return
getBean(RoomWebService.class).getRecordingsByExternalType(SID, externalType);
}
- public FlvRecording[] getFlvRecordingByExternalRoomType(String SID,
String externalRoomType) throws AxisFault {
+ public List<RecordingDTO> getFlvRecordingByExternalRoomType(String SID,
String externalRoomType) throws AxisFault {
return
getBean(RoomWebService.class).getFlvRecordingByExternalRoomType(SID,
externalRoomType);
}
- public FlvRecording[] getFlvRecordingByRoomId(String SID, Long roomId)
throws AxisFault {
+ public List<RecordingDTO> getFlvRecordingByRoomId(String SID, Long
roomId) throws AxisFault {
return
getBean(RoomWebService.class).getFlvRecordingByRoomId(SID, roomId);
}
@@ -89,7 +87,7 @@ public class RoomWebServiceFacade extend
return getBean(RoomWebService.class).getRoomCounters(SID,
roomId);
}
- public Room getRoomById(String SID, long rooms_id) throws AxisFault {
+ public RoomDTO getRoomById(String SID, long rooms_id) throws AxisFault {
return getBean(RoomWebService.class).getRoomById(SID, rooms_id);
}
@@ -107,55 +105,6 @@ public class RoomWebServiceFacade extend
return
getBean(RoomWebService.class).getRoomsWithCurrentUsers(SID, start, max,
orderby, asc);
}
- /**
- * TODO: Fix Organization Issue
- *
- * @deprecated use addRoomWithModeration instead
- *
- * @param SID
- * @param name
- * @param roomtypes_id
- * @param comment
- * @param numberOfPartizipants
- * @param ispublic
- * @param videoPodWidth
- * @param videoPodHeight
- * @param videoPodXPosition
- * @param videoPodYPosition
- * @param moderationPanelXPosition
- * @param showWhiteBoard
- * @param whiteBoardPanelXPosition
- * @param whiteBoardPanelYPosition
- * @param whiteBoardPanelHeight
- * @param whiteBoardPanelWidth
- * @param showFilesPanel
- * @param filesPanelXPosition
- * @param filesPanelYPosition
- * @param filesPanelHeight
- * @param filesPanelWidth
- * @return
- */
- @Deprecated
- public Long addRoom(String SID, String name, Long roomtypes_id,
- String comment, Long numberOfPartizipants, Boolean
ispublic,
- Integer videoPodWidth, Integer videoPodHeight,
- Integer videoPodXPosition, Integer videoPodYPosition,
- Integer moderationPanelXPosition, Boolean
showWhiteBoard,
- Integer whiteBoardPanelXPosition, Integer
whiteBoardPanelYPosition,
- Integer whiteBoardPanelHeight, Integer
whiteBoardPanelWidth,
- Boolean showFilesPanel, Integer filesPanelXPosition,
- Integer filesPanelYPosition, Integer filesPanelHeight,
- Integer filesPanelWidth) throws AxisFault {
- return getBean(RoomWebService.class).addRoom(SID, name,
roomtypes_id,
- comment, numberOfPartizipants, ispublic,
videoPodWidth,
- videoPodHeight, videoPodXPosition,
videoPodYPosition,
- moderationPanelXPosition, showWhiteBoard,
- whiteBoardPanelXPosition,
whiteBoardPanelYPosition,
- whiteBoardPanelHeight, whiteBoardPanelWidth,
showFilesPanel,
- filesPanelXPosition, filesPanelYPosition,
filesPanelHeight,
- filesPanelWidth);
- }
-
public Long addRoomWithModeration(String SID, String name,
Long roomtypes_id, String comment, Long
numberOfPartizipants,
Boolean ispublic, Boolean appointment, Boolean
isDemoRoom,
@@ -233,56 +182,6 @@ public class RoomWebServiceFacade extend
externalRoomId, externalRoomType);
}
- /**
- * TODO: Fix Organization Issue
- *
- * @deprecated use updateRoomWithModeration
- *
- * @param SID
- * @param rooms_id
- * @param name
- * @param roomtypes_id
- * @param comment
- * @param numberOfPartizipants
- * @param ispublic
- * @param videoPodWidth
- * @param videoPodHeight
- * @param videoPodXPosition
- * @param videoPodYPosition
- * @param moderationPanelXPosition
- * @param showWhiteBoard
- * @param whiteBoardPanelXPosition
- * @param whiteBoardPanelYPosition
- * @param whiteBoardPanelHeight
- * @param whiteBoardPanelWidth
- * @param showFilesPanel
- * @param filesPanelXPosition
- * @param filesPanelYPosition
- * @param filesPanelHeight
- * @param filesPanelWidth
- * @return
- */
- @Deprecated
- public Long updateRoom(String SID, Long rooms_id, String name,
- Long roomtypes_id, String comment, Long
numberOfPartizipants,
- Boolean ispublic, Integer videoPodWidth, Integer
videoPodHeight,
- Integer videoPodXPosition, Integer videoPodYPosition,
- Integer moderationPanelXPosition, Boolean
showWhiteBoard,
- Integer whiteBoardPanelXPosition, Integer
whiteBoardPanelYPosition,
- Integer whiteBoardPanelHeight, Integer
whiteBoardPanelWidth,
- Boolean showFilesPanel, Integer filesPanelXPosition,
- Integer filesPanelYPosition, Integer filesPanelHeight,
- Integer filesPanelWidth, Boolean appointment) throws
AxisFault {
- return getBean(RoomWebService.class).updateRoom(SID, rooms_id,
name,
- roomtypes_id, comment, numberOfPartizipants,
ispublic,
- videoPodWidth, videoPodHeight,
videoPodXPosition,
- videoPodYPosition, moderationPanelXPosition,
showWhiteBoard,
- whiteBoardPanelXPosition,
whiteBoardPanelYPosition,
- whiteBoardPanelHeight, whiteBoardPanelWidth,
showFilesPanel,
- filesPanelXPosition, filesPanelYPosition,
filesPanelHeight,
- filesPanelWidth, appointment);
- }
-
public Long updateRoomWithModeration(String SID, Long room_id, String
name,
Long roomtypes_id, String comment, Long
numberOfPartizipants,
Boolean ispublic, Boolean appointment, Boolean
isDemoRoom,
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
Sat Oct 11 09:36:06 2014
@@ -35,8 +35,7 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.dto.file.RecordingContainerData;
-import org.apache.openmeetings.db.dto.file.RecordingObject;
+import org.apache.openmeetings.db.dto.record.RecordingContainerData;
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.record.FlvRecording.Status;
import org.apache.openmeetings.db.entity.user.Organisation_Users;
@@ -102,15 +101,15 @@ public class FlvRecordingDao {
return null;
}
- public List<RecordingObject> getFlvRecordingByExternalUserId(String
externalUserId, String externalUserType) {
+ public List<FlvRecording> getFlvRecordingByExternalUserId(String
externalUserId, String externalUserType) {
try {
log.debug("getFlvRecordingByExternalUserId
:externalUserId: {}; externalType: {}", externalUserId, externalUserType);
- TypedQuery<RecordingObject> query =
em.createNamedQuery("getRecordingsByExternalUser", RecordingObject.class);
+ TypedQuery<FlvRecording> query =
em.createNamedQuery("getRecordingsByExternalUser", FlvRecording.class);
query.setParameter("externalUserId", externalUserId);
query.setParameter("externalUserType",
externalUserType);
- List<RecordingObject> flvRecordingList =
query.getResultList();
+ List<FlvRecording> flvRecordingList =
query.getResultList();
log.debug("getFlvRecordingByExternalUserId :: " +
flvRecordingList.size());
Copied:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java
(from r1630296,
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java)
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java?p2=openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java&p1=openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java&r1=1630296&r2=1631032&rev=1631032&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java
Sat Oct 11 09:36:06 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.db.dto.file;
+package org.apache.openmeetings.db.dto.record;
import java.io.Serializable;
Added:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java?rev=1631032&view=auto
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
(added)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
Sat Oct 11 09:36:06 2014
@@ -0,0 +1,134 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.db.dto.record;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.openmeetings.db.entity.record.FlvRecording;
+
+public class RecordingDTO {
+ private Long id;
+ private String name;
+ private String flvName;
+ private String aviName;
+ private Long roomId;
+ private String status;
+ private boolean interview;
+ private Date start;
+ private Date end;
+
+ public RecordingDTO() {}
+
+ public RecordingDTO(FlvRecording r) {
+ this.id = r.getFlvRecordingId();
+ this.name = r.getFileName();
+ this.flvName = r.getFileHash();
+ this.aviName = r.getAlternateDownload();
+ this.roomId = r.getRoom_id();
+ this.status = r.getStatus().name();
+ this.interview = r.getIsInterview();
+ this.start = r.getRecordStart();
+ this.end = r.getRecordEnd();
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getFlvName() {
+ return flvName;
+ }
+
+ public void setFlvName(String flvName) {
+ this.flvName = flvName;
+ }
+
+ public String getAviName() {
+ return aviName;
+ }
+
+ public void setAviName(String aviName) {
+ this.aviName = aviName;
+ }
+
+ public Long getRoomId() {
+ return roomId;
+ }
+
+ public void setRoomId(Long roomId) {
+ this.roomId = roomId;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public boolean isInterview() {
+ return interview;
+ }
+
+ public void setInterview(boolean interview) {
+ this.interview = interview;
+ }
+
+ public Date getStart() {
+ return start;
+ }
+
+ public void setStart(Date start) {
+ this.start = start;
+ }
+
+ public Date getEnd() {
+ return end;
+ }
+
+ public void setEnd(Date end) {
+ this.end = end;
+ }
+
+ public static List<RecordingDTO> list(List<FlvRecording> l) {
+ List<RecordingDTO> rList = new ArrayList<RecordingDTO>();
+ if (l != null) {
+ for (FlvRecording r : l) {
+ rList.add(new RecordingDTO(r));
+ }
+ }
+ return rList;
+
+ }
+}
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/room/RoomDTO.java?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
Sat Oct 11 09:36:06 2014
@@ -18,6 +18,9 @@
*/
package org.apache.openmeetings.db.dto.room;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomType;
@@ -95,4 +98,14 @@ public class RoomDTO {
public void setConfno(String confno) {
this.confno = confno;
}
+
+ public static List<RoomDTO> list(List<Room> l) {
+ List<RoomDTO> rList = new ArrayList<RoomDTO>();
+ if (l != null) {
+ for (Room r : l) {
+ rList.add(new RoomDTO(r));
+ }
+ }
+ return rList;
+ }
}
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
Sat Oct 11 09:36:06 2014
@@ -63,7 +63,7 @@ import org.simpleframework.xml.Root;
@NamedQueries({
@NamedQuery(name = "getRecordingById", query = "SELECT f FROM
FlvRecording f WHERE f.flvRecordingId = :id")
, @NamedQuery(name = "getRecordingByHash", query = "SELECT f FROM
FlvRecording f WHERE f.fileHash = :fileHash")
- , @NamedQuery(name = "getRecordingsByExternalUser", query = "SELECT NEW
org.apache.openmeetings.db.dto.file.RecordingObject(c) "
+ , @NamedQuery(name = "getRecordingsByExternalUser", query = "SELECT c "
+ "FROM FlvRecording c, User u "
+ "WHERE c.insertedBy = u.user_id AND u.externalUserId
= :externalUserId AND u.externalUserType = :externalUserType "
+ "AND c.deleted = false")
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java
Sat Oct 11 09:36:06 2014
@@ -48,6 +48,7 @@ import javax.persistence.OneToOne;
import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.Table;
import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlType;
import org.apache.openjpa.persistence.ElementDependent;
import org.apache.openjpa.persistence.FetchAttribute;
@@ -109,6 +110,7 @@ import org.simpleframework.xml.Root;
public class User implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = -2265479712596674065L;
+ @XmlType(namespace="org.apache.openmeetings.user.user.right")
public enum Right {
Admin // access to Admin module
, Room // enter the room
@@ -117,6 +119,7 @@ public class User implements Serializabl
, Soap // use rest/soap calls
}
+ @XmlType(namespace="org.apache.openmeetings.user.user.type")
public enum Type {
user
, ldap
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
Sat Oct 11 09:36:06 2014
@@ -30,7 +30,7 @@ import java.util.Iterator;
import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.dto.file.RecordingContainerData;
+import org.apache.openmeetings.db.dto.record.RecordingContainerData;
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.record.FlvRecording.Status;
import org.apache.openmeetings.db.entity.user.Organisation;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
Sat Oct 11 09:36:06 2014
@@ -35,8 +35,7 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.dto.file.RecordingContainerData;
-import org.apache.openmeetings.db.dto.file.RecordingObject;
+import org.apache.openmeetings.db.dto.record.RecordingContainerData;
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.record.FlvRecording.Status;
import org.apache.openmeetings.db.entity.user.OrganisationUser;
@@ -92,15 +91,15 @@ public class FlvRecordingDao {
return null;
}
- public List<RecordingObject> getFlvRecordingByExternalUserId(String
externalUserId, String externalUserType) {
+ public List<FlvRecording> getFlvRecordingByExternalUserId(String
externalUserId, String externalUserType) {
try {
log.debug("getFlvRecordingByExternalUserId
:externalUserId: {}; externalType: {}", externalUserId, externalUserType);
- TypedQuery<RecordingObject> query =
em.createNamedQuery("getRecordingsByExternalUser", RecordingObject.class);
+ TypedQuery<FlvRecording> query =
em.createNamedQuery("getRecordingsByExternalUser", FlvRecording.class);
query.setParameter("externalUserId", externalUserId);
query.setParameter("externalUserType",
externalUserType);
- List<RecordingObject> flvRecordingList =
query.getResultList();
+ List<FlvRecording> flvRecordingList =
query.getResultList();
log.debug("getFlvRecordingByExternalUserId :: " +
flvRecordingList.size());
Copied:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java
(from r1631024,
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java?p2=openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java&p1=openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java&r1=1631024&r2=1631032&rev=1631032&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java
Sat Oct 11 09:36:06 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.db.dto.file;
+package org.apache.openmeetings.db.dto.record;
import java.io.Serializable;
Added:
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=1631032&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
(added)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
Sat Oct 11 09:36:06 2014
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.db.dto.record;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.openmeetings.db.entity.record.FlvRecording;
+
+public class RecordingDTO {
+ private Long id;
+ private String name;
+ private String flvName;
+ private String aviName;
+ private Long roomId;
+ private String status;
+ private boolean interview;
+ private Date start;
+ private Date end;
+
+ public RecordingDTO() {}
+
+ public RecordingDTO(FlvRecording r) {
+ this.id = r.getId();
+ this.name = r.getFileName();
+ this.flvName = r.getFileHash();
+ this.aviName = r.getAlternateDownload();
+ this.roomId = r.getRoomId();
+ this.status = r.getStatus().name();
+ this.interview = r.getIsInterview();
+ this.start = r.getRecordStart();
+ this.end = r.getRecordEnd();
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getFlvName() {
+ return flvName;
+ }
+
+ public void setFlvName(String flvName) {
+ this.flvName = flvName;
+ }
+
+ public String getAviName() {
+ return aviName;
+ }
+
+ public void setAviName(String aviName) {
+ this.aviName = aviName;
+ }
+
+ public Long getRoomId() {
+ return roomId;
+ }
+
+ public void setRoomId(Long roomId) {
+ this.roomId = roomId;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public boolean isInterview() {
+ return interview;
+ }
+
+ public void setInterview(boolean interview) {
+ this.interview = interview;
+ }
+
+ public Date getStart() {
+ return start;
+ }
+
+ public void setStart(Date start) {
+ this.start = start;
+ }
+
+ public Date getEnd() {
+ return end;
+ }
+
+ public void setEnd(Date end) {
+ this.end = end;
+ }
+
+ public static List<RecordingDTO> list(List<FlvRecording> l) {
+ List<RecordingDTO> rList = new ArrayList<RecordingDTO>();
+ if (l != null) {
+ for (FlvRecording r : l) {
+ rList.add(new RecordingDTO(r));
+ }
+ }
+ return rList;
+ }
+}
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=1631032&r1=1631031&r2=1631032&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
Sat Oct 11 09:36:06 2014
@@ -18,6 +18,9 @@
*/
package org.apache.openmeetings.db.dto.room;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomType;
@@ -98,4 +101,14 @@ public class RoomDTO {
public void setConfno(String confno) {
this.confno = confno;
}
+
+ public static List<RoomDTO> list(List<Room> l) {
+ List<RoomDTO> rList = new ArrayList<RoomDTO>();
+ if (l != null) {
+ for (Room r : l) {
+ rList.add(new RoomDTO(r));
+ }
+ }
+ return rList;
+ }
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
Sat Oct 11 09:36:06 2014
@@ -67,8 +67,7 @@ import org.simpleframework.xml.Root;
@NamedQueries({
@NamedQuery(name = "getRecordingById", query = "SELECT f FROM
FlvRecording f WHERE f.id = :id")
, @NamedQuery(name = "getRecordingByHash", query = "SELECT f FROM
FlvRecording f WHERE f.fileHash = :fileHash")
- , @NamedQuery(name = "getRecordingsByExternalUser", query = "SELECT NEW
org.apache.openmeetings.db.dto.file.RecordingObject(c) "
- + "FROM FlvRecording c, User u "
+ , @NamedQuery(name = "getRecordingsByExternalUser", query = "SELECT c
FROM FlvRecording c, User u "
+ "WHERE c.insertedBy = u.id AND u.externalUserId =
:externalUserId AND u.externalUserType = :externalUserType "
+ "AND c.deleted = false")
, @NamedQuery(name = "getRecordingsPublic", query = "SELECT f FROM
FlvRecording f WHERE f.deleted = false AND f.ownerId IS NULL "
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
Sat Oct 11 09:36:06 2014
@@ -47,6 +47,7 @@ import javax.persistence.OneToOne;
import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.Table;
import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlType;
import org.apache.openjpa.persistence.ElementDependent;
import org.apache.openjpa.persistence.FetchAttribute;
@@ -106,6 +107,7 @@ import org.simpleframework.xml.Root;
public class User implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
+ @XmlType(namespace="org.apache.openmeetings.user.user.right")
public enum Right {
Admin // access to Admin module
, Room // enter the room
@@ -114,6 +116,7 @@ public class User implements IDataProvid
, Soap // use rest/soap calls
}
+ @XmlType(namespace="org.apache.openmeetings.user.user.type")
public enum Type {
user
, ldap
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
Sat Oct 11 09:36:06 2014
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.we
import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.dto.file.RecordingContainerData;
+import org.apache.openmeetings.db.dto.record.RecordingContainerData;
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.user.Organisation;
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=1631032&r1=1631031&r2=1631032&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
Sat Oct 11 09:36:06 2014
@@ -310,12 +310,12 @@
<bean id="jabberWebService"
class="org.apache.openmeetings.webservice.JabberWebService" />
<bean id="serverWebService"
class="org.apache.openmeetings.webservice.ServerWebService" />
- <bean id="jsonProvider"
class="org.apache.cxf.jaxrs.provider.json.JSONProvider">
- <!-- (writeXsiType=false) -->
+ <!-- (writeXsiType=false) -->
+ <!-- bean id="jsonProvider"
class="org.apache.cxf.jaxrs.provider.json.JSONProvider">
<property name="ignoreNamespaces" value="true" />
</bean>
- <bean id="jaxbProvider"
class="org.apache.cxf.jaxrs.provider.JAXBElementProvider"/>
- <jaxrs:server id="serverRest" address="/rest">
+ <bean id="jaxbProvider"
class="org.apache.cxf.jaxrs.provider.JAXBElementProvider"/-->
+ <jaxrs:server id="server" address="/">
<jaxrs:serviceBeans>
<ref bean="userWebService"/>
<ref bean="roomWebService"/>
@@ -324,23 +324,10 @@
<ref bean="jabberWebService"/>
<ref bean="serverWebService"/>
</jaxrs:serviceBeans>
- <jaxrs:providers>
+ <!-- jaxrs:providers>
<ref bean="jaxbProvider"/>
- </jaxrs:providers>
+ </jaxrs:providers-->
</jaxrs:server>
- <!-- jaxrs:server id="serverJson" address="/json">
- <jaxrs:serviceBeans>
- <ref bean="userWebService"/>
- <ref bean="roomWebService"/>
- <ref bean="fileWebService"/>
- <ref bean="calendarWebService"/>
- <ref bean="jabberWebService"/>
- <ref bean="serverWebService"/>
- </jaxrs:serviceBeans>
- <jaxrs:providers>
- <ref bean="jsonProvider"/>
- </jaxrs:providers>
- </jaxrs:server-->
<jaxws:endpoint id="userServiceWS" address="/UserService"
implementor="#userWebService"
endpointName="UserServiceEndpoint"
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
Sat Oct 11 09:36:06 2014
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -51,14 +50,14 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.dto.file.RecordingObject;
+import org.apache.openmeetings.db.dto.record.RecordingDTO;
import org.apache.openmeetings.db.dto.room.RoomCountBean;
+import org.apache.openmeetings.db.dto.room.RoomDTO;
import org.apache.openmeetings.db.dto.room.RoomReturn;
import org.apache.openmeetings.db.dto.room.RoomSearchResult;
import org.apache.openmeetings.db.dto.room.RoomUser;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
-import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.room.Invitation;
import org.apache.openmeetings.db.entity.room.Invitation.MessageType;
@@ -138,32 +137,12 @@ public class RoomWebService {
* @return - list of public rooms
* @throws ServiceException
*/
- public Room[] getRoomsPublic(String SID, Long roomtypesId)
- throws ServiceException {
+ public List<RoomDTO> getRoomsPublic(String SID, Long roomtypesId)
throws ServiceException {
try {
-
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
-
- List<Room> roomList =
roomDao.getPublicRooms(roomtypesId);
- // We need to re-marshal the Rooms object cause
Axis2 cannot use
- // our objects
- if (roomList != null && roomList.size() != 0) {
- //
roomsListObject.setRoomList(roomList);
- Room[] roomItems = new
Room[roomList.size()];
- int count = 0;
- for (Iterator<Room> it =
roomList.iterator(); it.hasNext();) {
- Room room = it.next();
- room.setCurrentusers(null);
- roomItems[count] = room;
- count++;
- }
-
- return roomItems;
- }
- log.debug("roomList SIZE: " + roomList.size());
-
+ return
RoomDTO.list(roomDao.getPublicRooms(roomtypesId));
}
return null;
} catch (Exception err) {
@@ -211,13 +190,13 @@ public class RoomWebService {
* @return - list of flv recordings
* @throws ServiceException
*/
- public List<RecordingObject> getFlvRecordingByExternalUserId(String SID,
+ public List<RecordingDTO> getFlvRecordingByExternalUserId(String SID,
String externalUserId, String externalUserType) throws
ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return
flvRecordingDao.getFlvRecordingByExternalUserId(externalUserId,
externalUserType);
+ return
RecordingDTO.list(flvRecordingDao.getFlvRecordingByExternalUserId(externalUserId,
externalUserType));
}
return null;
@@ -239,7 +218,7 @@ public class RoomWebService {
* @return - list of flv recordings
* @throws ServiceException
*/
- public RecordingObject[] getFlvRecordingByExternalRoomTypeAndCreator(
+ public List<RecordingDTO> getFlvRecordingByExternalRoomTypeAndCreator(
String SID, String externalRoomType, Long insertedBy)
throws ServiceException {
try {
@@ -247,26 +226,7 @@ public class RoomWebService {
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- List<FlvRecording> recordingList =
flvRecordingDao
-
.getFlvRecordingByExternalRoomTypeAndCreator(
-
externalRoomType, insertedBy);
-
- // We need to re-marshal the Rooms object cause
Axis2 cannot use
- // our objects
- if (recordingList != null &&
recordingList.size() != 0) {
- //
roomsListObject.setRoomList(roomList);
- RecordingObject[] recordingListItems =
new RecordingObject[recordingList.size()];
- int count = 0;
- for (Iterator<FlvRecording> it =
recordingList.iterator(); it.hasNext();) {
- FlvRecording flvRecording =
it.next();
- recordingListItems[count] = new
RecordingObject(flvRecording);
- count++;
- }
-
- return recordingListItems;
- }
-
- return null;
+ return
RecordingDTO.list(flvRecordingDao.getFlvRecordingByExternalRoomTypeAndCreator(externalRoomType,
insertedBy));
}
return null;
@@ -286,14 +246,14 @@ public class RoomWebService {
* @return - list of flv recordings
* @throws ServiceException
*/
- public List<FlvRecording> getFlvRecordingByExternalRoomTypeByList(
+ public List<RecordingDTO> getFlvRecordingByExternalRoomTypeByList(
String SID, String externalRoomType) throws
ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return
flvRecordingDao.getFlvRecordingByExternalRoomType(externalRoomType);
+ return
RecordingDTO.list(flvRecordingDao.getFlvRecordingByExternalRoomType(externalRoomType));
}
@@ -314,12 +274,12 @@ public class RoomWebService {
* @return - list of flv recordings
* @throws AxisFault
*/
- public List<FlvRecording> getRecordingsByExternalType(String SID,
String externalType) throws ServiceException {
+ public List<RecordingDTO> getRecordingsByExternalType(String SID,
String externalType) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return
flvRecordingDao.getRecordingsByExternalType(externalType);
+ return
RecordingDTO.list(flvRecordingDao.getRecordingsByExternalType(externalType));
}
return null;
@@ -339,33 +299,14 @@ public class RoomWebService {
* @return - list of flv recordings
* @throws ServiceException
*/
- public FlvRecording[] getFlvRecordingByExternalRoomType(String SID,
+ public List<RecordingDTO> getFlvRecordingByExternalRoomType(String SID,
String externalRoomType) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- List<FlvRecording> recordingList =
flvRecordingDao.getFlvRecordingByExternalRoomType(externalRoomType);
-
- // We need to re-marshal the Rooms object cause
Axis2 cannot use
- // our objects
- if (recordingList != null &&
recordingList.size() != 0) {
- //
roomsListObject.setRoomList(roomList);
- FlvRecording[] recordingListItems = new
FlvRecording[recordingList
- .size()];
- int count = 0;
- for (Iterator<FlvRecording> it =
recordingList.iterator(); it
- .hasNext();) {
- FlvRecording flvRecording =
it.next();
- recordingListItems[count] =
flvRecording;
- count++;
- }
-
- return recordingListItems;
- }
-
- return null;
+ return
RecordingDTO.list(flvRecordingDao.getFlvRecordingByExternalRoomType(externalRoomType));
}
return null;
@@ -385,35 +326,14 @@ public class RoomWebService {
* @return - list of recordings
* @throws ServiceException
*/
- public FlvRecording[] getFlvRecordingByRoomId(String SID, Long roomId)
+ public List<RecordingDTO> getFlvRecordingByRoomId(String SID, Long
roomId)
throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
-
- List<FlvRecording> recordingList =
flvRecordingDao
-
.getFlvRecordingByRoomId(roomId);
-
- // We need to re-marshal the Rooms object cause
Axis2 cannot use
- // our objects
- if (recordingList != null &&
recordingList.size() != 0) {
- //
roomsListObject.setRoomList(roomList);
- FlvRecording[] recordingListItems = new
FlvRecording[recordingList
- .size()];
- int count = 0;
- for (Iterator<FlvRecording> it =
recordingList.iterator(); it
- .hasNext();) {
- FlvRecording flvRecording =
it.next();
- recordingListItems[count] =
flvRecording;
- count++;
- }
-
- return recordingListItems;
- }
-
- return null;
+ return
RecordingDTO.list(flvRecordingDao.getFlvRecordingByRoomId(roomId));
}
return null;
@@ -589,74 +509,6 @@ public class RoomWebService {
// TODO: Add functions to get Users of a Room
/**
- * TODO: Fix Organization Issue
- *
- * deprecated use addRoomWithModeration instead
- *
- * @param SID
- * The SID of the User. This SID must be marked as Loggedin
- * @param name
- * @param roomtypesId
- * @param comment
- * @param numberOfPartizipants
- * @param ispublic
- * @param videoPodWidth
- * @param videoPodHeight
- * @param videoPodXPosition
- * @param videoPodYPosition
- * @param moderationPanelXPosition
- * @param showWhiteBoard
- * @param whiteBoardPanelXPosition
- * @param whiteBoardPanelYPosition
- * @param whiteBoardPanelHeight
- * @param whiteBoardPanelWidth
- * @param showFilesPanel
- * @param filesPanelXPosition
- * @param filesPanelYPosition
- * @param filesPanelHeight
- * @param filesPanelWidth
- * @return - id of the room or error code
- */
- @Deprecated
- public Long addRoom(String SID, String name, Long roomtypesId,
- String comment, Long numberOfPartizipants, Boolean
ispublic,
- Integer videoPodWidth, Integer videoPodHeight,
- Integer videoPodXPosition, Integer videoPodYPosition,
- Integer moderationPanelXPosition, Boolean
showWhiteBoard,
- Integer whiteBoardPanelXPosition, Integer
whiteBoardPanelYPosition,
- Integer whiteBoardPanelHeight, Integer
whiteBoardPanelWidth,
- Boolean showFilesPanel, Integer filesPanelXPosition,
- Integer filesPanelYPosition, Integer filesPanelHeight,
- Integer filesPanelWidth) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.addRoom(name, roomtypesId,
comment,
- numberOfPartizipants, ispublic,
null, false, false,
- null, false, null, true, false,
false, false //isClosed
- , "", "",
- null, null, null, false, //
hideTopBar
- false, // hideChat
- false, //
hideActivitiesAndActions
- false, // hideFilesExplorer
- false, // hideActionsMenu
- false, // hideScreenSharing
- false, // hideWhiteboard
- false, // showMicrophoneStatus
- false, // chatModerated
- false, // chatOpened
- false, // filesOpened
- false, // autoVideoSelect
- false //sipEnabled
- );
- }
- } catch (Exception err) {
- log.error("[addRoom] ", err);
- }
- return new Long(-1);
- }
-
- /**
* Create a conference room
*
* @param SID
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Sat Oct 11 09:36:06 2014
@@ -23,6 +23,7 @@ import static org.apache.openmeetings.ut
import java.util.ArrayList;
import java.util.Date;
+import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -66,10 +67,10 @@ import org.springframework.beans.factory
* @webservice UserService
*
*/
-@WebService
+@WebService(name = "UserService")
@Features(features = "org.apache.cxf.feature.LoggingFeature")
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-@Path("/user")
+@Path("/UserService")
public class UserWebService {
private static final Logger log =
Red5LoggerFactory.getLogger(UserWebService.class, webAppRootKey);
@@ -101,7 +102,7 @@ public class UserWebService {
* @return - creates new session
*/
@GET
- @Path("/session")
+ @Path("/getSession")
public Sessiondata getSession() {
log.debug("SPRING LOADED getSession -- ");
return sessionDao.startsession();
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1631032&r1=1631031&r2=1631032&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Sat Oct 11 09:36:06 2014
@@ -47,7 +47,7 @@
<batik.version>1.7</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>
<ical4j.version>1.0.5.2</ical4j.version>
- <cxf.version>3.0.0</cxf.version>
+ <cxf.version>3.0.1</cxf.version>
<selenium.version>2.42.2</selenium.version>
<red5-client.version>1.0.3-RELEASE</red5-client.version>
<simple-xml.version>2.7.1</simple-xml.version>
