Author: solomax
Date: Wed Aug 12 10:16:26 2015
New Revision: 1695467
URL: http://svn.apache.org/r1695467
Log:
[OPENMEETINGS-1118] almost all services are rewritten
Added:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypeDao.java
- copied, changed from r1695453,
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.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/user/ExternalUserDTO.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomTypeWebService.java
Removed:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IRoomManager.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.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/room/RoomDTO.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/UserDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1695467&r1=1695466&r2=1695467&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
Wed Aug 12 10:16:26 2015
@@ -20,12 +20,8 @@ package org.apache.openmeetings.core.dat
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@@ -35,7 +31,6 @@ import javax.persistence.criteria.Criter
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-import org.apache.openmeetings.db.dao.room.IRoomManager;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.room.RoomModeratorsDao;
import org.apache.openmeetings.db.dao.room.RoomTypeDao;
@@ -45,7 +40,6 @@ import org.apache.openmeetings.db.dao.us
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.dto.basic.SearchResult;
import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.db.entity.room.RoomModerator;
import org.apache.openmeetings.db.entity.room.RoomOrganisation;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -58,7 +52,7 @@ import org.springframework.transaction.a
*
*/
@Transactional
-public class RoomManager implements IRoomManager {
+public class RoomManager {
private static final Logger log =
Red5LoggerFactory.getLogger(RoomManager.class, webAppRootKey);
@PersistenceContext
@@ -79,31 +73,6 @@ public class RoomManager implements IRoo
@Autowired
private RoomTypeDao roomTypeDao;
- /**
- * Get a Rooms-Object or NULL
- *
- * @param externalRoomId
- * @return Rooms-Object or NULL
- */
- public Room getRoomByExternalId(Long externalRoomId, String
externalRoomType, long roomtypesId) {
- log.debug("getRoombyExternalId : " + externalRoomId + " - " +
externalRoomType + " - " + roomtypesId);
- try {
- TypedQuery<Room> query =
em.createNamedQuery("getRoomByExternalId", Room.class);
- query.setParameter("externalRoomId", externalRoomId);
- query.setParameter("externalRoomType",
externalRoomType);
- query.setParameter("roomtypesId", roomtypesId);
- List<?> ll = query.getResultList();
- if (ll.size() > 0) {
- return (Room) ll.get(0);
- } else {
- log.error("Could not find room " +
externalRoomId);
- }
- } catch (Exception ex2) {
- log.error("[getRoomByExternalId] ", ex2);
- }
- return null;
- }
-
public SearchResult<Room> getRooms(int start, int max, String orderby,
boolean asc, String search) {
try {
SearchResult<Room> sResult = new SearchResult<Room>();
@@ -371,234 +340,6 @@ public class RoomManager implements IRoo
return r == null || r.getConfno() == null ? null :
sipDao.countUsers(r.getConfno());
}
- private List<RoomModerator> getModerators(List<Map<String, Object>> list,
Long roomId) {
- List<RoomModerator> result = new ArrayList<RoomModerator>();
-
- for (Map<String, Object> roomModeratorObj : list) {
- Long roomModeratorsId =
roomModeratorObj.containsKey("roomModeratorsId") ?
Long.parseLong(roomModeratorObj.get("roomModeratorsId").toString()) : null;
- Long userId =
Long.parseLong(roomModeratorObj.get("userId").toString());
- Boolean isSuperModerator =
Boolean.parseBoolean(roomModeratorObj.get("isSuperModerator").toString());
-
- RoomModerator rm = new RoomModerator();
- rm.setId(roomModeratorsId);
- rm.setRoomId(roomId);
- rm.setUser(usersDao.get(userId));
- rm.setSuperModerator(isSuperModerator);
-
- result.add(rm);
- }
- return result;
- }
-
- /**
- * adds a new Record to the table rooms
- * @param name
- * @param roomtypesId
- * @param ispublic
- * @param hideActivitiesAndActions TODO
- * @param hideFilesExplorer TODO
- * @param hideActionsMenu TODO
- * @param hideScreenSharing TODO
- * @param hideWhiteboard TODO
- * @return id of the newly created room or NULL
- */
- public Long addRoom(String name, long roomtypesId,
- String comment, Long numberOfPartizipants, boolean
ispublic,
- List<Integer> organisations, Boolean appointment,
Boolean isDemoRoom,
- Integer demoTime, Boolean isModeratedRoom,
- List<Map<String, Object>> roomModerators,
- Boolean allowUserQuestions, Boolean isAudioOnly,
Boolean allowFontStyles, Boolean isClosed,
- String redirectURL, String conferencePin,
- Long ownerId, Boolean waitForRecording, boolean
allowRecording,
- Boolean hideTopBar, Boolean hideChat, Boolean
hideActivitiesAndActions, Boolean hideFilesExplorer,
- Boolean hideActionsMenu, Boolean hideScreenSharing,
Boolean hideWhiteboard,
- Boolean showMicrophoneStatus, Boolean chatModerated,
boolean chatOpened
- , boolean filesOpened, boolean autoVideoSelect, boolean
sipEnabled) {
-
- try {
- Room r = new Room();
- r.setName(name);
- r.setComment(comment);
- r.setInserted(new Date());
- r.setNumberOfPartizipants(numberOfPartizipants);
- r.setRoomtype(roomTypeDao.get(roomtypesId));
- r.setIspublic(ispublic);
- r.setAllowUserQuestions(allowUserQuestions);
- r.setAudioOnly(isAudioOnly);
- r.setAllowFontStyles(allowFontStyles);
-
- r.setAppointment(appointment);
-
- r.setIsDemoRoom(isDemoRoom);
- r.setDemoTime(demoTime);
-
- r.setModerated(isModeratedRoom);
- r.setHideTopBar(hideTopBar);
-
- r.setDeleted(false);
-
- r.setIsClosed(isClosed);
- r.setRedirectURL(redirectURL);
-
- r.setOwnerId(ownerId);
-
- r.setWaitForRecording(waitForRecording);
- r.setAllowRecording(allowRecording);
-
- r.setChatHidden(hideChat);
- r.setActivitiesHidden(hideActivitiesAndActions);
- r.setHideActionsMenu(hideActionsMenu);
- r.setHideFilesExplorer(hideFilesExplorer);
- r.setHideScreenSharing(hideScreenSharing);
- r.setHideWhiteboard(hideWhiteboard);
- r.setShowMicrophoneStatus(showMicrophoneStatus);
- r.setChatModerated(chatModerated);
- r.setChatOpened(chatOpened);
- r.setFilesOpened(filesOpened);
- r.setAutoVideoSelect(autoVideoSelect);
- r.setSipEnabled(sipEnabled);
- r.setPin(conferencePin);
-
- r = roomDao.update(r, ownerId);
-
- if (organisations != null) {
- Long t =
this.updateRoomOrganisations(organisations, r);
- if (t == null) {
- return null;
- }
- }
-
- if (roomModerators != null) {
- r.setModerators(getModerators(roomModerators,
r.getId()));
- r = roomDao.update(r, ownerId);
- }
-
- return r.getId();
- } catch (Exception ex2) {
- log.error("[addRoom] ", ex2);
- }
- return null;
- }
-
- /**
- * adds/check a new Record to the table rooms with external fields
- *
- * @param name
- * @param roomtypesId
- * @param comment
- * @param numberOfPartizipants
- * @param ispublic
- * @param organisations
- * @param appointment
- * @param isDemoRoom
- * @param demoTime
- * @param isModeratedRoom
- * @param roomModerators
- * @param externalRoomId
- * @param externalRoomType
- * @param allowUserQuestions
- * @param isAudioOnly
- * @param allowFontStyles
- * @param isClosed
- * @param redirectURL
- * @param waitForRecording
- * @param allowRecording
- * @param hideTopBar
- * @return id of (the newly created) room or NULL
- */
- public Long addExternalRoom(String name, long roomtypesId, String
comment,
- Long numberOfPartizipants, boolean ispublic,
List<Integer> organisations,
- Boolean appointment, Boolean isDemoRoom, Integer
demoTime,
- Boolean isModeratedRoom, List<Map<String, Object>>
roomModerators,
- Long externalRoomId, String externalRoomType,
- Boolean allowUserQuestions, Boolean isAudioOnly,
Boolean allowFontStyles, Boolean isClosed,
- String redirectURL, Boolean waitForRecording,
- boolean allowRecording, Boolean hideTopBar) {
-
- log.debug("addExternalRoom");
-
- try {
- Room r = new Room();
- r.setName(name);
- r.setComment(comment);
- r.setInserted(new Date());
- r.setNumberOfPartizipants(numberOfPartizipants);
- r.setRoomtype(roomTypeDao.get(roomtypesId));
- r.setIspublic(ispublic);
-
- r.setAllowUserQuestions(allowUserQuestions);
- r.setAudioOnly(isAudioOnly);
- r.setAllowFontStyles(allowFontStyles);
-
- r.setAppointment(appointment);
-
- r.setIsDemoRoom(isDemoRoom);
- r.setDemoTime(demoTime);
-
- r.setModerated(isModeratedRoom);
-
- r.setDeleted(false);
-
- r.setExternalRoomId(externalRoomId);
- r.setExternalRoomType(externalRoomType);
-
- r.setIsClosed(isClosed);
- r.setRedirectURL(redirectURL);
-
- r.setWaitForRecording(waitForRecording);
- r.setAllowRecording(allowRecording);
-
- r.setHideTopBar(hideTopBar);
-
- r = em.merge(r);
-
- long returnId = r.getId();
-
- if (organisations != null) {
- Long t =
this.updateRoomOrganisations(organisations, r);
- if (t == null) {
- return null;
- }
- }
-
- if (roomModerators != null) {
- r.setModerators(getModerators(roomModerators,
r.getId()));
- r = roomDao.update(r, null);
- }
-
- return returnId;
- } catch (Exception ex2) {
- log.error("[addExternalRoom] ", ex2);
- }
- return null;
- }
-
- /**
- * adds a new record to the table rooms_organisation
- *
- * @param roomId
- * @param organisationId
- * @return the id of the newly created Rooms_Organisation or NULL
- */
- public Long addRoomToOrganisation(long roomId, long organisationId) {
- try {
- RoomOrganisation rOrganisation = new RoomOrganisation();
- rOrganisation.setRoom(roomDao.get(roomId));
- log.debug("addRoomToOrganisation rooms '"
- + rOrganisation.getRoom().getName() +
"'");
- rOrganisation.setInserted(new Date());
-
rOrganisation.setOrganisation(orgDao.get(organisationId));
- rOrganisation.setDeleted(false);
-
- rOrganisation = em.merge(rOrganisation);
- long returnId = rOrganisation.getId();
- return returnId;
- } catch (Exception ex2) {
- log.error("[addRoomToOrganisation] ", ex2);
- }
- return null;
- }
-
/**
* get List of Rooms_Organisation by organisation and roomtype
*
@@ -706,341 +447,4 @@ public class RoomManager implements IRoo
}
return null;
}
-
- public RoomOrganisation
getRoomsOrganisationByOrganisationIdAndRoomId(long organisationId, long roomId)
{
- try {
- TypedQuery<RoomOrganisation> q = em.
-
createNamedQuery("getRoomsOrganisationByOrganisationIdAndRoomId",
RoomOrganisation.class);
-
- q.setParameter("roomId", roomId);
- q.setParameter("organisationId", organisationId);
- List<RoomOrganisation> ll = q.getResultList();
-
- if (ll.size() > 0) {
- return ll.get(0);
- }
- } catch (Exception ex2) {
-
log.error("[getRoomsOrganisationByOrganisationIdAndRoomId] ", ex2);
- }
- return null;
- }
-
- /**
- *
- * @param roomId
- * @return
- */
- public List<RoomOrganisation> getRoomsOrganisationByRoomsId(long
roomId) {
- try {
- TypedQuery<RoomOrganisation> q =
em.createNamedQuery("getRoomsOrganisationByRoomsId", RoomOrganisation.class);
- q.setParameter("roomId", roomId);
- return q.getResultList();
- } catch (Exception ex2) {
- log.error("[getRoomsByOrganisation] ", ex2);
- }
- return null;
- }
-
- public Long updateRoomInternal(long roomId, long roomtypesId,
- String name, boolean ispublic, String comment,
- Long numberOfPartizipants, List<Integer> organisations,
- Boolean appointment, Boolean isDemoRoom, Integer
demoTime,
- Boolean isModeratedRoom, List<Map<String, Object>>
roomModerators,
- Boolean allowUserQuestions, Boolean isAudioOnly,
Boolean allowFontStyles, Boolean isClosed,
- String redirectURL, String conferencePin,
- Long ownerId, Boolean waitForRecording, boolean
allowRecording,
- Boolean hideTopBar, Boolean hideChat, Boolean
hideActivitiesAndActions, Boolean hideFilesExplorer,
- Boolean hideActionsMenu, Boolean hideScreenSharing,
Boolean hideWhiteboard,
- Boolean showMicrophoneStatus, Boolean chatModerated,
boolean chatOpened, boolean filesOpened
- , boolean autoVideoSelect, boolean sipEnabled) {
- try {
- log.debug("*** updateRoom numberOfPartizipants: "
- + numberOfPartizipants);
- Room r = roomDao.get(roomId);
- r.setComment(comment);
-
- r.setIspublic(ispublic);
- r.setNumberOfPartizipants(numberOfPartizipants);
- r.setName(name);
- r.setRoomtype(roomTypeDao.get(roomtypesId));
- r.setUpdated(new Date());
- r.setAllowUserQuestions(allowUserQuestions);
- r.setAudioOnly(isAudioOnly);
- r.setAllowFontStyles(allowFontStyles);
-
- r.setIsDemoRoom(isDemoRoom);
- r.setDemoTime(demoTime);
-
- r.setAppointment(appointment);
-
- r.setModerated(isModeratedRoom);
- r.setHideTopBar(hideTopBar);
-
- r.setIsClosed(isClosed);
- r.setRedirectURL(redirectURL);
- r.setOwnerId(ownerId);
- r.setWaitForRecording(waitForRecording);
- r.setAllowRecording(allowRecording);
-
- r.setChatHidden(hideChat);
- r.setActivitiesHidden(hideActivitiesAndActions);
- r.setHideActionsMenu(hideActionsMenu);
- r.setHideFilesExplorer(hideFilesExplorer);
- r.setHideScreenSharing(hideScreenSharing);
- r.setHideWhiteboard(hideWhiteboard);
- r.setShowMicrophoneStatus(showMicrophoneStatus);
- r.setChatModerated(chatModerated);
- r.setChatOpened(chatOpened);
- r.setFilesOpened(filesOpened);
- r.setAutoVideoSelect(autoVideoSelect);
- r.setPin(conferencePin);
- r.setSipEnabled(sipEnabled);
- r = roomDao.update(r, ownerId);
-
- if (organisations != null) {
- Long t =
this.updateRoomOrganisations(organisations, r);
- if (t == null) {
- return null;
- }
- }
- if (roomModerators != null) {
- r.setModerators(getModerators(roomModerators,
r.getId()));
- r = roomDao.update(r, null);
- }
-
- return r.getId();
- } catch (Exception ex2) {
- log.error("[updateRoom] ", ex2);
- }
- return null;
- }
-
- @SuppressWarnings("rawtypes")
- private boolean checkRoomAlreadyInOrg(Long orgid, List organisations)
- throws Exception {
- for (Iterator it = organisations.iterator(); it.hasNext();) {
- RoomOrganisation rOrganisation = (RoomOrganisation)
it.next();
- if (rOrganisation.getOrganisation().getId()
- .equals(orgid))
- return true;
- }
- return false;
- }
-
- private boolean checkRoomShouldByDeleted(long orgId, List<Integer>
organisations) throws Exception {
- for (Iterator<Integer> it = organisations.iterator();
it.hasNext();) {
- Integer key = it.next();
- Long storedOrgId = key.longValue();
- if (storedOrgId.equals(orgId))
- return true;
- }
- return false;
- }
-
- private Long updateRoomOrganisations(List<Integer> organisations, Room
room) throws Exception {
- List<RoomOrganisation> roomOrganisations =
getOrganisationsByRoom(room.getId());
-
- List<Long> roomsToAdd = new LinkedList<Long>();
- List<Long> roomsToDel = new LinkedList<Long>();
-
- for (Iterator<Integer> it = organisations.iterator();
it.hasNext();) {
- Integer key = it.next();
- Long orgIdToAdd = key.longValue();
- if (!this.checkRoomAlreadyInOrg(orgIdToAdd,
roomOrganisations))
- roomsToAdd.add(orgIdToAdd);
- }
-
- for (Iterator<RoomOrganisation> it =
roomOrganisations.iterator(); it.hasNext();) {
- RoomOrganisation rOrganisation = it.next();
- Long orgIdToDel = rOrganisation.getOrganisation()
- .getId();
- if (!this.checkRoomShouldByDeleted(orgIdToDel,
organisations))
- roomsToDel.add(orgIdToDel);
- }
-
- // log.error("updateRoomOrganisations roomsToAdd:
"+roomsToAdd.size());
- // log.error("updateRoomOrganisations roomsToDel:
"+roomsToDel.size());
-
- for (Iterator<Long> it = roomsToAdd.iterator(); it.hasNext();) {
- Long orgIdToAdd = it.next();
- addRoomToOrganisation(room.getId(), orgIdToAdd);
- }
- for (Iterator<Long> it = roomsToDel.iterator(); it.hasNext();) {
- Long orgToDel = it.next();
-
deleteRoomFromOrganisationByRoomAndOrganisation(room.getId(), orgToDel);
- }
-
- return new Long(1);
- }
-
- /**
- * delete all Rooms_Organisations and Room by a given roomId
- *
- * @param roomId
- */
- public Long deleteRoomById(long roomId) {
- try {
- deleteAllRoomsOrganisationOfRoom(roomId);
- roomDao.delete(roomDao.get(roomId), -1L);
- return roomId;
- } catch (Exception ex2) {
- log.error("[deleteRoomById] ", ex2);
- }
- return null;
- }
-
- /**
- * delete all Rooms_Organisation by a roomId
- *
- * @param roomId
- */
- @SuppressWarnings("rawtypes")
- public void deleteAllRoomsOrganisationOfRoom(long roomId) {
- try {
- List ll = this.getRoomsOrganisationByRoomsId(roomId);
- for (Iterator it = ll.iterator(); it.hasNext();) {
- RoomOrganisation rOrg = (RoomOrganisation)
it.next();
- this.deleteRoomsOrganisation(rOrg);
- }
- } catch (Exception ex2) {
- log.error("[deleteAllRoomsOrganisationOfRoom] ", ex2);
- }
- }
-
- /**
- * Delete all room of a given Organisation
- *
- * @param organisationId
- */
- public void deleteAllRoomsOrganisationOfOrganisation(long
organisationId) {
- try {
- for (RoomOrganisation rOrg :
getRoomsOrganisationByOrganisationId(organisationId)) {
- this.deleteRoomsOrganisation(rOrg);
- }
- } catch (Exception ex2) {
- log.error("[deleteAllRoomsOfOrganisation] ", ex2);
- }
- }
-
- private Long deleteRoomFromOrganisationByRoomAndOrganisation(long
roomId, long organisationId) {
- try {
- RoomOrganisation rOrganisation =
getRoomsOrganisationByOrganisationIdAndRoomId(organisationId, roomId);
- return this.deleteRoomsOrganisation(rOrganisation);
- } catch (Exception ex2) {
-
log.error("[deleteRoomFromOrganisationByRoomAndOrganisation] ", ex2);
- }
- return null;
- }
-
- /**
- * delete a Rooms_Organisation-Object
- *
- * @param rOrg
- */
- public Long deleteRoomsOrganisation(RoomOrganisation rOrg) {
- try {
- rOrg.setDeleted(true);
- rOrg.setUpdated(new Date());
- if (rOrg.getId() == null) {
- em.persist(rOrg);
- } else {
- if (!em.contains(rOrg)) {
- em.merge(rOrg);
- }
- }
- return rOrg.getId();
- } catch (Exception ex2) {
- log.error("[deleteRoomsOrganisation] ", ex2);
- }
- return null;
- }
-
- //
--------------------------------------------------------------------------------------------
-
- public void closeRoom(Long roomId, Boolean status) {
- try {
-
- Room room = roomDao.get(roomId);
-
- room.setIsClosed(status);
-
- roomDao.update(room, -1L);
-
- } catch (Exception e) {
- log.error("Error updateRoomObject : ", e);
- }
- }
-
- /**
- * Get a Rooms-Object or NULL
- *
- * @param ownerId
- * @param roomtypesId
- * @param roomName
- * @return Rooms-Object or NULL
- */
- public Room getRoomByOwnerAndTypeId(Long ownerId, Long roomtypesId,
String roomName) {
- try {
-
- if (roomtypesId == null || roomtypesId == 0) {
- return null;
- }
- log.debug("getRoomByOwnerAndTypeId : " + ownerId + " ||
" + roomtypesId);
- Room room = null;
- TypedQuery<Room> query =
em.createNamedQuery("getRoomByOwnerAndTypeId", Room.class);
- query.setParameter("ownerId", ownerId);
- query.setParameter("roomtypesId", roomtypesId);
- List<Room> ll = query.getResultList();
- if (ll.size() > 0) {
- room = ll.get(0);
- }
-
- if (room != null) {
- return room;
- } else {
- log.debug("Could not find room " + ownerId + "
|| " + roomtypesId);
-
- Long roomId = addRoom(roomName, roomtypesId,
- "My Rooms of ownerId " +
ownerId,
- (roomtypesId == 1) ? 25L :
150L, // numberOfPartizipants
- false, // ispublic
- null, // organisations
- false, // appointment
- false, // isDemoRoom
- null, // demoTime
- false, // isModeratedRoom
- null, // roomModerators
- true, // allowUserQuestions
- false, // isAudioOnly
- true, // allowFontStyle
- false, // isClosed
- "", // redirectURL
- "", // conferencePin
- ownerId, null,
- true, // allowRecording
- 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
- );
-
- if (roomId != null) {
- return roomDao.get(roomId);
- }
- }
- } catch (Exception ex2) {
- log.error("[getRoomByOwnerAndTypeId] ", ex2);
- }
- return null;
- }
-
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1695467&r1=1695466&r2=1695467&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
Wed Aug 12 10:16:26 2015
@@ -30,7 +30,6 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.room.RoomModeratorsDao;
-import org.apache.openmeetings.db.dao.room.RoomTypeDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
@@ -42,7 +41,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomModerator;
import org.apache.openmeetings.db.entity.room.RoomOrganisation;
-import org.apache.openmeetings.db.entity.room.RoomType;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
@@ -70,8 +68,6 @@ public class ConferenceService {
@Autowired
private RoomDao roomDao;
@Autowired
- private RoomTypeDao roomTypeDao;
- @Autowired
private RoomModeratorsDao roomModeratorsDao;
@Autowired
private TimezoneUtil timezoneUtil;
@@ -332,33 +328,6 @@ public class ConferenceService {
return null;
}
- /**
- *
- * @param SID
- * @return - all room types available
- */
- public List<RoomType> getRoomTypes(String SID) {
- Long userId = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- return roomTypeDao.get();
- }
- return null;
- }
-
- /**
- *
- * @param SID
- * @param roomId
- * @return - room with the id given
- */
- public Room getRoomById(String SID, long roomId) {
- Long userId = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- return roomDao.get(roomId);
- }
- return null;
- }
-
public Room getRoomWithCurrentUsersById(String SID, long roomId) {
Room room = null;
Long userId = sessiondataDao.checkSession(SID);
@@ -370,22 +339,6 @@ public class ConferenceService {
}
/**
- *
- * @param SID
- * @param externalUserId
- * @param externalUserType
- * @param roomtypesId
- * @return - room with the given external id
- */
- public Room getRoomByExternalId(String SID, Long externalUserId, String
externalUserType, long roomtypesId) {
- Long userId = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- return roomManager.getRoomByExternalId(externalUserId,
externalUserType, roomtypesId);
- }
- return null;
- }
-
- /**
* gets a list of all available rooms
*
* @param SID
@@ -437,20 +390,6 @@ public class ConferenceService {
}
/**
- *
- * @param SID
- * @param roomId
- * @return - id of the room being deleted
- */
- public Long deleteRoom(String SID, long roomId) {
- Long userId = sessiondataDao.checkSession(SID);
- if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
- return roomManager.deleteRoomById(roomId);
- }
- return null;
- }
-
- /**
* return all participants of a room
*
* @param roomId
@@ -505,8 +444,7 @@ public class ConferenceService {
public Room getRoomByOwnerAndType(String SID, Long roomtypesId, String
roomName) {
Long userId = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- return roomManager.getRoomByOwnerAndTypeId(userId,
- roomtypesId, roomName);
+ return roomDao.getUserRoom(userId, roomtypesId,
roomName);
}
return null;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1695467&r1=1695466&r2=1695467&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
Wed Aug 12 10:16:26 2015
@@ -23,14 +23,11 @@ import static org.apache.openmeetings.ut
import java.util.Arrays;
import java.util.Date;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
-import org.apache.openmeetings.core.data.conference.RoomManager;
import org.apache.openmeetings.core.ldap.LdapLoginManagement;
import org.apache.openmeetings.core.mail.MailHandler;
import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
@@ -87,8 +84,6 @@ public class MainService implements IPen
@Autowired
private StateDao statemanagement;
@Autowired
- private RoomManager roomManager;
- @Autowired
private ConferenceLogDao conferenceLogDao;
@Autowired
private UserDao userDao;
@@ -452,30 +447,6 @@ public class MainService implements IPen
}
}
- public int closeRoom(String SID, Long room_id, Boolean status) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
-
- roomManager.closeRoom(room_id, status);
-
- if (status) {
- Map<String, String> message = new
HashMap<String, String>();
- message.put("message", "roomClosed");
-
scopeApplicationAdapter.sendMessageByRoomAndDomain(room_id, message);
- }
-
- return 1;
-
- }
-
- return 1;
- } catch (Exception err) {
- log.error("[closeRoom]", err);
- }
- return -1;
- }
-
public void resultReceived(IPendingServiceCall arg0) {
log.debug("[resultReceived]" + arg0);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1695467&r1=1695466&r2=1695467&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Wed Aug 12 10:16:26 2015
@@ -30,7 +30,6 @@ import java.util.Map;
import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.core.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.db.dao.label.LabelDao;
-import org.apache.openmeetings.db.dao.room.IRoomManager;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
@@ -60,8 +59,6 @@ public class MobileService {
@Autowired
private RoomDao roomDao;
@Autowired
- private IRoomManager roomManager;
- @Autowired
private LabelDao labelDao;
@Autowired
private ScopeApplicationAdapter scopeAdapter;
@@ -168,8 +165,8 @@ public class MobileService {
User u = userDao.get(c.getUserId());
//my rooms
List<Room> myl = new ArrayList<Room>();
- myl.add(roomManager.getRoomByOwnerAndTypeId(u.getId(), 1L,
labelDao.getString(1306L, u.getLanguageId())));
- myl.add(roomManager.getRoomByOwnerAndTypeId(u.getId(), 3L,
labelDao.getString(1307L, u.getLanguageId())));
+ myl.add(roomDao.getUserRoom(u.getId(), 1L,
labelDao.getString(1306L, u.getLanguageId())));
+ myl.add(roomDao.getUserRoom(u.getId(), 3L,
labelDao.getString(1307L, u.getLanguageId())));
myl.addAll(roomDao.getAppointedRoomsByUser(u.getId()));
for (Room r : myl) {
addRoom("my", null, false, result, r);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java?rev=1695467&r1=1695466&r2=1695467&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
Wed Aug 12 10:16:26 2015
@@ -56,7 +56,7 @@ public class AppointmentDao {
@Autowired
private AppointmentCategoryDao appointmentCategoryDaoImpl;
@Autowired
- private AppointmentReminderTypDao appointmentReminderTypDao;
+ private AppointmentReminderTypeDao reminderTypeDao;
@Autowired
private MeetingMemberDao meetingMemberDao;
@Autowired
Copied:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypeDao.java
(from r1695453,
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypeDao.java?p2=openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypeDao.java&p1=openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java&r1=1695453&r2=1695467&rev=1695467&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypeDao.java
Wed Aug 12 10:16:26 2015
@@ -36,8 +36,8 @@ import org.springframework.beans.factory
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class AppointmentReminderTypDao {
- private static final Logger log =
Red5LoggerFactory.getLogger(AppointmentReminderTypDao.class, webAppRootKey);
+public class AppointmentReminderTypeDao {
+ private static final Logger log =
Red5LoggerFactory.getLogger(AppointmentReminderTypeDao.class, webAppRootKey);
@PersistenceContext
private EntityManager em;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java?rev=1695467&r1=1695466&r2=1695467&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
Wed Aug 12 10:16:26 2015
@@ -54,9 +54,11 @@ public class RoomDao implements IDataPro
@Autowired
private SipDao sipDao;
@Autowired
- private UserDao usersDao;
+ private UserDao userDao;
@Autowired
private TimezoneUtil timezoneUtil;
+ @Autowired
+ private RoomTypeDao roomTypeDao;
public Room get(long id) {
TypedQuery<Room> q = em.createNamedQuery("getRoomById",
Room.class);
@@ -76,6 +78,10 @@ public class RoomDao implements IDataPro
return kq.getResultList();
}
+ public List<Room> get(List<Long> ids) {
+ return em.createNamedQuery("getRoomsByIds",
Room.class).setParameter("ids", ids).getResultList();
+ }
+
public List<Room> get(int start, int count) {
TypedQuery<Room> q = em.createNamedQuery("getNondeletedRooms",
Room.class);
q.setFirstResult(start);
@@ -124,7 +130,7 @@ public class RoomDao implements IDataPro
//TODO generalize with AppointmentDao
log.debug("getAppointedRoomsByUser : UserID - " + userId);
- TimeZone timeZone =
timezoneUtil.getTimeZone(usersDao.get(userId));
+ TimeZone timeZone =
timezoneUtil.getTimeZone(userDao.get(userId));
Calendar startCal = Calendar.getInstance(timeZone);
startCal.set(Calendar.MINUTE, 0);
@@ -186,4 +192,53 @@ public class RoomDao implements IDataPro
entity.setSipEnabled(false);
update(entity, userId);
}
+
+ public Room getUserRoom(Long ownerId, Long typeId, String name) {
+ if (typeId == null || typeId == 0) {
+ return null;
+ }
+ log.debug("getRoomByOwnerAndTypeId : " + ownerId + " || " +
typeId);
+ Room room = null;
+ List<Room> ll = em.createNamedQuery("getRoomByOwnerAndTypeId",
Room.class).setParameter("ownerId", ownerId).setParameter("roomtypesId",
typeId).getResultList();
+ if (ll.size() > 0) {
+ room = ll.get(0);
+ }
+
+ if (room == null) {
+ log.debug("Could not find room " + ownerId + " || " +
typeId);
+
+ room = new Room();
+ room.setName(name);
+ room.setRoomtype(roomTypeDao.get(typeId));
+ room.setComment("My Rooms of ownerId " + ownerId);
+ room.setNumberOfPartizipants(typeId == 1 ? 25L : 150L);
+ room.setAllowUserQuestions(true);
+ room.setAllowFontStyles(true);
+ room.setOwnerId(ownerId);
+ room.setAllowRecording(true);
+
+ room = update(room, ownerId);
+ if (room.getId() != null) {
+ return room;
+ }
+ return null;
+ } else {
+ return room;
+ }
+ }
+
+ public Room getExternal(long typeId, String externalType, Long
externalId) {
+ log.debug("getExternal : " + externalId + " - " + externalType
+ " - " + typeId);
+ List<Room> ll = em.createNamedQuery("getRoomByExternalId",
Room.class)
+ .setParameter("externalRoomId", externalId)
+ .setParameter("externalRoomType", externalType)
+ .setParameter("roomtypesId", typeId)
+ .getResultList();
+ if (ll.size() > 0) {
+ return ll.get(0);
+ } else {
+ log.error("Could not find room " + externalId);
+ return null;
+ }
+ }
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java?rev=1695467&r1=1695466&r2=1695467&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java
Wed Aug 12 10:16:26 2015
@@ -47,4 +47,15 @@ public class RoomOrganisationDao {
return entity;
}
+ public RoomOrganisation get(long organisationId, long roomId) {
+ List<RoomOrganisation> ll =
em.createNamedQuery("getRoomsOrganisationByOrganisationIdAndRoomId",
RoomOrganisation.class)
+ .setParameter("roomId", roomId)
+ .setParameter("organisationId", organisationId)
+ .getResultList();
+
+ if (ll.size() > 0) {
+ return ll.get(0);
+ }
+ return null;
+ }
}
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=1695467&r1=1695466&r2=1695467&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
Wed Aug 12 10:16:26 2015
@@ -24,6 +24,10 @@ import java.util.Date;
import java.util.List;
import java.util.TimeZone;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypeDao;
+import org.apache.openmeetings.db.dao.room.RoomTypeDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.dto.room.RoomDTO;
import org.apache.openmeetings.db.dto.user.UserDTO;
import org.apache.openmeetings.db.entity.calendar.Appointment;
@@ -43,8 +47,9 @@ public class AppointmentDTO {
private AppointmentReminderTypeDTO reminder;
private RoomDTO room;
private String icalId;
- private List<MeetingMemberDTO> meetingMembers;
+ private List<MeetingMemberDTO> meetingMembers = new ArrayList<>();
private Long languageId;
+ private String password;
private boolean passwordProtected;
private boolean connectedEvent;
private boolean reminderEmailSend;
@@ -68,9 +73,10 @@ public class AppointmentDTO {
reminder = new AppointmentReminderTypeDTO(a.getRemind());
room = new RoomDTO(a.getRoom());
icalId = a.getIcalId();
- meetingMembers = new ArrayList<>();
- for(MeetingMember mm: a.getMeetingMembers()) {
- meetingMembers.add(new MeetingMemberDTO(mm));
+ if (a.getMeetingMembers() != null) {
+ for(MeetingMember mm : a.getMeetingMembers()) {
+ meetingMembers.add(new MeetingMemberDTO(mm));
+ }
}
languageId = a.getLanguageId();
passwordProtected = a.isPasswordProtected();
@@ -78,6 +84,33 @@ public class AppointmentDTO {
reminderEmailSend = a.isReminderEmailSend();
}
+ public Appointment get(UserDao userDao, AppointmentDao appointmentDao,
AppointmentReminderTypeDao remindDao, RoomTypeDao roomTypeDao) {
+ Appointment a = id == null ? new Appointment() :
appointmentDao.get(id);
+ a.setId(id);
+ a.setTitle(title);
+ a.setLocation(location);
+ a.setStart(start.getTime());
+ a.setEnd(end.getTime());
+ a.setDescription(description);
+ a.setOwner(owner.get(userDao));
+ a.setInserted(inserted);
+ a.setUpdated(updated);
+ a.setDeleted(deleted);
+ a.setRemind(reminder.get(remindDao));
+ a.setRoom(room.get(roomTypeDao));
+ a.setIcalId(icalId);
+ a.setMeetingMembers(new ArrayList<MeetingMember>());
+ for(MeetingMemberDTO mm : meetingMembers) {
+ //TODO FIXME a.getMeetingMembers().add(mm.get());
+ }
+ //MeetingMember
+ a.setLanguageId(languageId);
+ a.setPasswordProtected(passwordProtected);
+ a.setConnectedEvent(connectedEvent);
+ a.setReminderEmailSend(reminderEmailSend);
+ return a;
+ }
+
public Long getId() {
return id;
}
@@ -221,4 +254,20 @@ public class AppointmentDTO {
public void setReminderEmailSend(boolean reminderEmailSend) {
this.reminderEmailSend = reminderEmailSend;
}
+
+ public static List<AppointmentDTO> list(List<Appointment> list) {
+ List<AppointmentDTO> result = new ArrayList<>(list.size());
+ for (Appointment a : list) {
+ result.add(new AppointmentDTO(a));
+ }
+ return result;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
}
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=1695467&r1=1695466&r2=1695467&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
Wed Aug 12 10:16:26 2015
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.db.dto.calendar;
+import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypeDao;
import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType;
public class AppointmentReminderTypeDTO {
@@ -31,6 +32,10 @@ public class AppointmentReminderTypeDTO
this.name = t.getName();
}
+ public AppointmentReminderType get(AppointmentReminderTypeDao
remindDao) {
+ return remindDao.get(id);
+ }
+
public Long getId() {
return id;
}
Added:
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=1695467&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java
(added)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java
Wed Aug 12 10:16:26 2015
@@ -0,0 +1,200 @@
+/*
+ * 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.room;
+
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
+import java.security.NoSuchAlgorithmException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.room.Invitation;
+import org.apache.openmeetings.db.entity.room.Invitation.Valid;
+import org.apache.openmeetings.db.entity.user.User.Type;
+import org.apache.openmeetings.util.crypt.MD5;
+import org.apache.openmeetings.util.crypt.ManageCryptStyle;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
+public class InvitationDTO {
+ private static final Logger log =
Red5LoggerFactory.getLogger(InvitationDTO.class, webAppRootKey);
+ private static ThreadLocal<SimpleDateFormat> SDF = new
ThreadLocal<SimpleDateFormat>() {
+ protected SimpleDateFormat initialValue() {
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ };
+ };
+
+ private String email;
+ private String firstname;
+ private String lastname;
+ private String message;
+ private String subject;
+ private Long roomId;
+ private boolean passwordProtected;
+ private String password;
+ private Valid valid;
+ private String validFrom;
+ private String validTo;
+ private long languageId;
+
+ public String getEmail() {
+ return email;
+ }
+ public void setEmail(String email) {
+ this.email = email;
+ }
+ public String getFirstname() {
+ return firstname;
+ }
+ public void setFirstname(String firstname) {
+ this.firstname = firstname;
+ }
+ public String getLastname() {
+ return lastname;
+ }
+ public void setLastname(String lastname) {
+ this.lastname = lastname;
+ }
+ public String getMessage() {
+ return message;
+ }
+ public void setMessage(String message) {
+ this.message = message;
+ }
+ public String getSubject() {
+ return subject;
+ }
+ public void setSubject(String subject) {
+ this.subject = subject;
+ }
+ public Long getRoomId() {
+ return roomId;
+ }
+ public void setRoomId(Long roomId) {
+ this.roomId = roomId;
+ }
+ public boolean isPasswordProtected() {
+ return passwordProtected;
+ }
+ public void setPasswordProtected(boolean passwordProtected) {
+ this.passwordProtected = passwordProtected;
+ }
+ public String getPassword() {
+ return password;
+ }
+ public void setPassword(String password) {
+ this.password = password;
+ }
+ public Valid getValid() {
+ return valid;
+ }
+ public void setValid(Valid valid) {
+ this.valid = valid;
+ }
+ /**
+ * Method to get valid from date-time in format YYYY-MM-dd HH:mm:ss
+ *
+ * @return date-time in format YYYY-MM-dd HH:mm:ss
+ */
+ public String getValidFrom() {
+ return validFrom;
+ }
+ /**
+ * Method to set valid from date-time in format YYYY-MM-dd HH:mm:ss
+ *
+ * @param validFrom date-time in format YYYY-MM-dd HH:mm:ss
+ */
+ public void setValidFrom(String validFrom) {
+ this.validFrom = validFrom;
+ }
+ /**
+ * Method to get valid to date-time in format YYYY-MM-dd HH:mm:ss
+ *
+ * @return date-time in format YYYY-MM-dd HH:mm:ss
+ */
+ public String getValidTo() {
+ return validTo;
+ }
+ /**
+ * Method to set valid to date-time in format YYYY-MM-dd HH:mm:ss
+ *
+ * @param validFrom date-time in format YYYY-MM-dd HH:mm:ss
+ */
+ public void setValidTo(String validTo) {
+ this.validTo = validTo;
+ }
+ public long getLanguageId() {
+ return languageId;
+ }
+ public void setLanguageId(long languageId) {
+ this.languageId = languageId;
+ }
+
+ public Invitation get(Long userId, UserDao userDao, RoomDao roomDao) {
+ Invitation i = new Invitation();
+ String hashRaw = "HASH" + (System.currentTimeMillis());
+ try {
+ i.setHash(MD5.do_checksum(hashRaw));
+ } catch (NoSuchAlgorithmException e) {
+ //FIXME TODO need to throw other exception
+ log.error("Unexpected error while creating invitation",
e);
+ throw new RuntimeException(e);
+ }
+ i.setPasswordProtected(passwordProtected);
+ if (passwordProtected) {
+
i.setPassword(ManageCryptStyle.getInstanceOfCrypt().createPassPhrase(password));
+ }
+
+ i.setUsed(false);
+ i.setValid(valid);
+
+ try {
+ // valid period of Invitation
+ switch (valid) {
+ case Period:
+ i.setValidFrom(new
Date(SDF.get().parse(validFrom).getTime() - (5 * 60 * 1000)));
+ i.setValidTo(SDF.get().parse(validTo));
+ break;
+ case Endless:
+ case OneTime:
+ default:
+ break;
+ }
+ } catch (ParseException e) {
+ //FIXME TODO need to throw other exception
+ log.error("Unexpected error while creating invitation",
e);
+ throw new RuntimeException(e);
+ }
+
+ i.setDeleted(false);
+
+ i.setInvitedBy(userDao.get(userId));
+ i.setInvitee(userDao.getContact(email, firstname, lastname,
userId));
+ if (Type.contact == i.getInvitee().getType()) {
+ i.getInvitee().setLanguageId(languageId);
+ }
+ i.setRoom(roomDao.get(roomId));
+ i.setInserted(new Date());
+ i.setAppointment(null);
+ return i;
+ }
+}
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=1695467&r1=1695466&r2=1695467&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
Wed Aug 12 10:16:26 2015
@@ -21,6 +21,7 @@ package org.apache.openmeetings.db.dto.r
import java.util.ArrayList;
import java.util.List;
+import org.apache.openmeetings.db.dao.room.RoomTypeDao;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomType;
@@ -28,15 +29,20 @@ public class RoomDTO {
private Long id;
private String name;
private String comment;
- private RoomType roomtype;
+ private RoomType type;
private Long numberOfPartizipants = new Long(4);
private boolean appointment;
private String confno;
private boolean isPublic;
private boolean demo;
private Integer demoTime;
+ private Long externalId;
+ private String externalType;
+ private String redirectUrl;
private boolean moderated;
private boolean allowUserQuestions;
+ private boolean allowRecording;
+ private boolean waitForRecording;
private boolean audioOnly;
private boolean topBarHidden;
private boolean chatHidden;
@@ -53,25 +59,60 @@ public class RoomDTO {
id = r.getId();
name = r.getName();
comment = r.getComment();
- roomtype = r.getRoomtype();
+ type = r.getRoomtype();
numberOfPartizipants = r.getNumberOfPartizipants();
appointment = r.isAppointment();
confno = r.getConfno();
- isPublic = Boolean.TRUE.equals(r.getIspublic());
- demo = Boolean.TRUE.equals(r.getIsDemoRoom());
+ isPublic = r.getIspublic();
+ demo = r.getIsDemoRoom();
demoTime = r.getDemoTime();
+ externalId = r.getExternalId();
+ externalType = r.getExternalType();
+ redirectUrl = r.getRedirectURL();
moderated = r.isModerated();
- allowUserQuestions =
Boolean.TRUE.equals(r.getAllowUserQuestions());
+ allowUserQuestions = r.getAllowUserQuestions();
+ allowRecording = r.isAllowRecording();
+ waitForRecording = r.getWaitForRecording();
audioOnly = r.isAudioOnly();
- topBarHidden = Boolean.TRUE.equals(r.getHideTopBar());
+ topBarHidden = r.getHideTopBar();
chatHidden = r.isChatHidden();
activitiesHidden = r.isActivitiesHidden();
- filesExplorerHidden =
Boolean.TRUE.equals(r.getHideFilesExplorer());
- actionsMenuHidden = Boolean.TRUE.equals(r.getHideActionsMenu());
- screenSharingHidden =
Boolean.TRUE.equals(r.getHideScreenSharing());
- whiteboardHidden = Boolean.TRUE.equals(r.getHideWhiteboard());
+ filesExplorerHidden = r.getHideFilesExplorer();
+ actionsMenuHidden = r.getHideActionsMenu();
+ screenSharingHidden = r.getHideScreenSharing();
+ whiteboardHidden = r.getHideWhiteboard();
+ }
+
+ public Room get(RoomTypeDao roomTypeDao) {
+ Room r = new Room();
+ r.setId(id);
+ r.setName(name);
+ r.setComment(comment);
+ r.setRoomtype(roomTypeDao.get(type.getId()));
+ r.setNumberOfPartizipants(numberOfPartizipants);
+ r.setAppointment(appointment);
+ r.setConfno(confno);
+ r.setIspublic(isPublic);
+ r.setIsDemoRoom(demo);
+ r.setDemoTime(demoTime);
+ r.setExternalId(externalId);
+ r.setExternalType(externalType);
+ r.setRedirectURL(redirectUrl);
+ r.setModerated(moderated);
+ r.setAllowUserQuestions(allowUserQuestions);
+ r.setAllowRecording(allowRecording);
+ r.setWaitForRecording(waitForRecording);
+ r.setAudioOnly(audioOnly);
+ r.setHideTopBar(topBarHidden);
+ r.setChatHidden(chatHidden);
+ r.setActivitiesHidden(activitiesHidden);
+ r.setHideFilesExplorer(filesExplorerHidden);
+ r.setHideActionsMenu(actionsMenuHidden);
+ r.setHideScreenSharing(screenSharingHidden);
+ r.setHideWhiteboard(whiteboardHidden);
+ return r;
}
-
+
public Long getId() {
return id;
}
@@ -96,12 +137,12 @@ public class RoomDTO {
this.comment = comment;
}
- public RoomType getRoomtype() {
- return roomtype;
+ public RoomType getType() {
+ return type;
}
- public void setRoomtype(RoomType roomtype) {
- this.roomtype = roomtype;
+ public void setType(RoomType type) {
+ this.type = type;
}
public Long getNumberOfPartizipants() {
@@ -128,16 +169,6 @@ public class RoomDTO {
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;
- }
-
public boolean isDemo() {
return demo;
}
@@ -170,6 +201,22 @@ public class RoomDTO {
this.allowUserQuestions = allowUserQuestions;
}
+ public boolean isAllowRecording() {
+ return allowRecording;
+ }
+
+ public void setAllowRecording(boolean allowRecording) {
+ this.allowRecording = allowRecording;
+ }
+
+ public boolean isWaitForRecording() {
+ return waitForRecording;
+ }
+
+ public void setWaitForRecording(boolean waitForRecording) {
+ this.waitForRecording = waitForRecording;
+ }
+
public boolean isAudioOnly() {
return audioOnly;
}
@@ -241,4 +288,38 @@ public class RoomDTO {
public void setPublic(boolean isPublic) {
this.isPublic = isPublic;
}
+
+ public Long getExternalId() {
+ return externalId;
+ }
+
+ public void setExternalId(Long externalId) {
+ this.externalId = externalId;
+ }
+
+ public String getExternalType() {
+ return externalType;
+ }
+
+ public void setExternalType(String externalType) {
+ this.externalType = externalType;
+ }
+
+ public String getRedirectUrl() {
+ return redirectUrl;
+ }
+
+ public void setRedirectUrl(String redirectUrl) {
+ this.redirectUrl = redirectUrl;
+ }
+
+ public static List<RoomDTO> list(List<Room> l) {
+ List<RoomDTO> rList = new ArrayList<>();
+ if (l != null) {
+ for (Room r : l) {
+ rList.add(new RoomDTO(r));
+ }
+ }
+ return rList;
+ }
}
Added:
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=1695467&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java
(added)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java
Wed Aug 12 10:16:26 2015
@@ -0,0 +1,72 @@
+/*
+ * 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.room;
+
+public class RoomOptionsDTO {
+ private Long roomId;
+ private Long recordingId;
+ private boolean moderator;
+ private boolean showAudioVideoTest;
+ private boolean showNickNameDialog;
+ private boolean allowSameURLMultipleTimes;
+ private boolean allowRecording;
+
+ public Long getRoomId() {
+ return roomId;
+ }
+ public void setRoomId(Long roomId) {
+ this.roomId = roomId;
+ }
+ public Long getRecordingId() {
+ return recordingId;
+ }
+ public void setRecordingId(Long recordingId) {
+ this.recordingId = recordingId;
+ }
+ public boolean isModerator() {
+ return moderator;
+ }
+ public void setModerator(boolean moderator) {
+ this.moderator = moderator;
+ }
+ public boolean isShowAudioVideoTest() {
+ return showAudioVideoTest;
+ }
+ public void setShowAudioVideoTest(boolean showAudioVideoTest) {
+ this.showAudioVideoTest = showAudioVideoTest;
+ }
+ public boolean isShowNickNameDialog() {
+ return showNickNameDialog;
+ }
+ public void setShowNickNameDialog(boolean showNickNameDialog) {
+ this.showNickNameDialog = showNickNameDialog;
+ }
+ public boolean isAllowSameURLMultipleTimes() {
+ return allowSameURLMultipleTimes;
+ }
+ public void setAllowSameURLMultipleTimes(boolean
allowSameURLMultipleTimes) {
+ this.allowSameURLMultipleTimes = allowSameURLMultipleTimes;
+ }
+ public boolean isAllowRecording() {
+ return allowRecording;
+ }
+ public void setAllowRecording(boolean allowRecording) {
+ this.allowRecording = allowRecording;
+ }
+}
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=1695467&r1=1695466&r2=1695467&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
Wed Aug 12 10:16:26 2015
@@ -18,6 +18,9 @@
*/
package org.apache.openmeetings.db.dto.server;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.openmeetings.db.entity.server.Server;
/**
@@ -29,24 +32,48 @@ import org.apache.openmeetings.db.entity
*
*/
public class ServerDTO {
-
private Long id;
+ private String name;
private String address;
private int port;
- private String protocol;
+ private String user;
+ private String password;
private String webapp;
+ private String protocol;
+ private boolean active;
+ private String comment;
- public ServerDTO(Server server) {
- if (server == null) {
+ public ServerDTO(Server s) {
+ if (s == null) {
return;
}
- id = server.getId();
- address = server.getAddress();
- port = server.getPort();
- protocol = server.getProtocol();
- webapp = server.getWebapp();
+ id = s.getId();
+ name = s.getName();
+ address = s.getAddress();
+ port = s.getPort();
+ user = s.getUser();
+ password = s.getPass();
+ webapp = s.getWebapp();
+ protocol = s.getProtocol();
+ active = s.isActive();
+ comment = s.getComment();
+ }
+
+ public Server get() {
+ Server s = new Server();
+ s.setId(id);
+ s.setName(name);
+ s.setAddress(address);
+ s.setPort(port);
+ s.setUser(user);
+ s.setPass(password);
+ s.setWebapp(webapp);
+ s.setProtocol(protocol);
+ s.setActive(active);
+ s.setComment(comment);
+ return s;
}
-
+
public Long getId() {
return id;
}
@@ -86,10 +113,59 @@ public class ServerDTO {
public void setWebapp(String webapp) {
this.webapp = webapp;
}
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getUser() {
+ return user;
+ }
+
+ public void setUser(String user) {
+ this.user = user;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public boolean isActive() {
+ return active;
+ }
+
+ public void setActive(boolean active) {
+ this.active = active;
+ }
+
+ public String getComment() {
+ return comment;
+ }
+
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
@Override
public String toString() {
return "id "+id+" address "+address+" port "+port+" protocol
"+protocol;
}
+ public static List<ServerDTO> list(List<Server> l) {
+ List<ServerDTO> list = new ArrayList<>();
+ if (l != null) {
+ for (Server s : l) {
+ list.add(new ServerDTO(s));
+ }
+ }
+ return list;
+ }
}
Added:
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=1695467&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
(added)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
Wed Aug 12 10:16:26 2015
@@ -0,0 +1,72 @@
+/*
+ * 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.user;
+
+public class ExternalUserDTO {
+ private String login;
+ private String firstname;
+ private String lastname;
+ private String profilePictureUrl;
+ private String email;
+ private String externalId;
+ private String externalType;
+
+ public String getLogin() {
+ return login;
+ }
+ public void setLogin(String login) {
+ this.login = login;
+ }
+ public String getFirstname() {
+ return firstname;
+ }
+ public void setFirstname(String firstname) {
+ this.firstname = firstname;
+ }
+ public String getLastname() {
+ return lastname;
+ }
+ public void setLastname(String lastname) {
+ this.lastname = lastname;
+ }
+ public String getProfilePictureUrl() {
+ return profilePictureUrl;
+ }
+ public void setProfilePictureUrl(String profilePictureUrl) {
+ this.profilePictureUrl = profilePictureUrl;
+ }
+ public String getEmail() {
+ return email;
+ }
+ public void setEmail(String email) {
+ this.email = email;
+ }
+ public String getExternalId() {
+ return externalId;
+ }
+ public void setExternalId(String externalId) {
+ this.externalId = externalId;
+ }
+ public String getExternalType() {
+ return externalType;
+ }
+ public void setExternalType(String externalType) {
+ this.externalType = externalType;
+ }
+}
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=1695467&r1=1695466&r2=1695467&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
Wed Aug 12 10:16:26 2015
@@ -20,6 +20,7 @@ package org.apache.openmeetings.db.dto.u
import java.util.Set;
+import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.Address;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
@@ -55,6 +56,20 @@ public class UserDTO {
externalType = u.getExternalType();
}
+ public User get(UserDao userDao) {
+ User u = id == null ? new User() : userDao.get(id);
+ u.setFirstname(firstname);
+ u.setLastname(lastname);
+ u.setRights(rights);
+ u.setLanguageId(languageId);
+ u.setAddress(address);
+ u.setTimeZoneId(timeZoneId);
+ u.setExternalId(externalId);
+ u.setExternalType(externalType);
+ u.setType(type);
+ return u;
+ }
+
public Long getId() {
return id;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1695467&r1=1695466&r2=1695467&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
Wed Aug 12 10:16:26 2015
@@ -70,6 +70,7 @@ import org.simpleframework.xml.Root;
+ "AND rt.id = :roomtypesId AND c.deleted = false"),
@NamedQuery(name = "getPublicRoomsOrdered", query = "SELECT r from Room
r WHERE r.ispublic= true AND r.deleted= false AND r.appointment = false ORDER
BY r.name ASC"),
@NamedQuery(name = "getRoomById", query = "SELECT r FROM Room r WHERE
r.deleted = false AND r.id = :id"),
+ @NamedQuery(name = "getRoomsByIds", query = "SELECT r FROM Room r WHERE
r.deleted = false AND r.id IN :ids"),
@NamedQuery(name = "getSipRoomIdsByIds", query = "SELECT r.id FROM Room
r WHERE r.deleted = false AND r.sipEnabled = true AND r.id IN :ids"),
@NamedQuery(name = "countRooms", query = "SELECT COUNT(r) FROM Room r
WHERE r.deleted = false"),
@NamedQuery(name = "getBackupRooms", query = "SELECT r FROM Room r
ORDER BY r.id"),
@@ -130,15 +131,15 @@ public class Room implements IDataProvid
// Vars to simulate external Room
@Column(name = "externalRoomId")
@Element(data = true, required = false)
- private Long externalRoomId;
+ private Long externalId;
@Column(name = "externalRoomType")
@Element(data = true, required = false)
- private String externalRoomType;
+ private String externalType;
@Column(name = "isdemoroom")
@Element(data = true, required = false)
- private Boolean isDemoRoom;
+ private boolean isDemoRoom;
@Column(name = "demo_time")
@Element(data = true, required = false)
@@ -152,7 +153,7 @@ public class Room implements IDataProvid
@Column(name = "allow_user_questions")
@Element(data = true, required = false)
- private Boolean allowUserQuestions;
+ private boolean allowUserQuestions;
@Column(name = "is_audio_only")
@Element(name = "isAudioOnly", data = true, required = false)
@@ -164,7 +165,7 @@ public class Room implements IDataProvid
@Column(name = "is_closed")
@Element(data = true, required = false)
- private Boolean isClosed;
+ private boolean isClosed;
@Column(name = "redirect_url")
@Element(data = true, required = false)
@@ -176,7 +177,7 @@ public class Room implements IDataProvid
@Column(name = "wait_for_recording")
@Element(data = true, required = false)
- private Boolean waitForRecording; // Show warning that user has to start
+ private boolean waitForRecording; // Show warning that user has to start
// recording
@Column(name = "allow_recording")
@@ -187,51 +188,51 @@ public class Room implements IDataProvid
*/
@Column(name = "hide_top_bar")
@Element(data = true, required = false)
- private Boolean hideTopBar = false;
+ private boolean hideTopBar;
@Column(name = "hide_chat")
@Element(name = "hideChat", data = true, required = false)
- private boolean chatHidden = false;
+ private boolean chatHidden;
@Column(name = "hide_activities_and_actions")
@Element(name = "hideActivitiesAndActions", data = true, required =
false)
- private boolean activitiesHidden = false;
+ private boolean activitiesHidden;
@Column(name = "hide_files_explorer")
@Element(data = true, required = false)
- private Boolean hideFilesExplorer = false;
+ private boolean hideFilesExplorer;
@Column(name = "hide_actions_menu")
@Element(data = true, required = false)
- private Boolean hideActionsMenu = false;
+ private boolean hideActionsMenu;
@Column(name = "hide_screen_sharing")
@Element(data = true, required = false)
- private Boolean hideScreenSharing = false;
+ private boolean hideScreenSharing;
@Column(name = "hide_whiteboard")
@Element(data = true, required = false)
- private Boolean hideWhiteboard = false;
+ private boolean hideWhiteboard;
@Column(name = "show_microphone_status")
@Element(data = true, required = false)
- private Boolean showMicrophoneStatus = false;
+ private boolean showMicrophoneStatus;
@Column(name = "chat_moderated")
@Element(data = true, required = false)
- private boolean chatModerated = false;
+ private boolean chatModerated;
@Column(name = "chat_opened")
@Element(data = true, required = false)
- private boolean chatOpened = false;
+ private boolean chatOpened;
@Column(name = "files_opened")
@Element(data = true, required = false)
- private boolean filesOpened = false;
+ private boolean filesOpened;
@Column(name = "auto_video_select")
@Element(data = true, required = false)
- private boolean autoVideoSelect = false;
+ private boolean autoVideoSelect;
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@JoinColumn(name = "roomId")
@@ -348,11 +349,11 @@ public class Room implements IDataProvid
this.appointment = appointment;
}
- public Boolean getIsDemoRoom() {
+ public boolean getIsDemoRoom() {
return isDemoRoom;
}
- public void setIsDemoRoom(Boolean isDemoRoom) {
+ public void setIsDemoRoom(boolean isDemoRoom) {
this.isDemoRoom = isDemoRoom;
}
@@ -372,27 +373,27 @@ public class Room implements IDataProvid
this.moderated = moderated;
}
- public Long getExternalRoomId() {
- return externalRoomId;
+ public Long getExternalId() {
+ return externalId;
}
- public void setExternalRoomId(Long externalRoomId) {
- this.externalRoomId = externalRoomId;
+ public void setExternalId(Long externalId) {
+ this.externalId = externalId;
}
- public String getExternalRoomType() {
- return externalRoomType;
+ public String getExternalType() {
+ return externalType;
}
- public void setExternalRoomType(String externalRoomType) {
- this.externalRoomType = externalRoomType;
+ public void setExternalType(String externalType) {
+ this.externalType = externalType;
}
- public Boolean getAllowUserQuestions() {
+ public boolean getAllowUserQuestions() {
return allowUserQuestions;
}
- public void setAllowUserQuestions(Boolean allowUserQuestions) {
+ public void setAllowUserQuestions(boolean allowUserQuestions) {
this.allowUserQuestions = allowUserQuestions;
}
@@ -412,11 +413,11 @@ public class Room implements IDataProvid
this.allowFontStyles = allowFontStyles;
}
- public Boolean getIsClosed() {
+ public boolean getIsClosed() {
return isClosed;
}
- public void setIsClosed(Boolean isClosed) {
+ public void setIsClosed(boolean isClosed) {
this.isClosed = isClosed;
}
@@ -436,11 +437,11 @@ public class Room implements IDataProvid
this.ownerId = ownerId;
}
- public Boolean getWaitForRecording() {
+ public boolean getWaitForRecording() {
return waitForRecording;
}
- public void setWaitForRecording(Boolean waitForRecording) {
+ public void setWaitForRecording(boolean waitForRecording) {
this.waitForRecording = waitForRecording;
}
@@ -452,11 +453,11 @@ public class Room implements IDataProvid
this.allowRecording = allowRecording;
}
- public Boolean getHideTopBar() {
+ public boolean getHideTopBar() {
return hideTopBar;
}
- public void setHideTopBar(Boolean hideTopBar) {
+ public void setHideTopBar(boolean hideTopBar) {
this.hideTopBar = hideTopBar;
}
@@ -476,43 +477,43 @@ public class Room implements IDataProvid
this.activitiesHidden = activitiesHidden;
}
- public Boolean getHideFilesExplorer() {
+ public boolean getHideFilesExplorer() {
return hideFilesExplorer;
}
- public void setHideFilesExplorer(Boolean hideFilesExplorer) {
+ public void setHideFilesExplorer(boolean hideFilesExplorer) {
this.hideFilesExplorer = hideFilesExplorer;
}
- public Boolean getHideActionsMenu() {
+ public boolean getHideActionsMenu() {
return hideActionsMenu;
}
- public void setHideActionsMenu(Boolean hideActionsMenu) {
+ public void setHideActionsMenu(boolean hideActionsMenu) {
this.hideActionsMenu = hideActionsMenu;
}
- public Boolean getHideScreenSharing() {
+ public boolean getHideScreenSharing() {
return hideScreenSharing;
}
- public void setHideScreenSharing(Boolean hideScreenSharing) {
+ public void setHideScreenSharing(boolean hideScreenSharing) {
this.hideScreenSharing = hideScreenSharing;
}
- public Boolean getHideWhiteboard() {
+ public boolean getHideWhiteboard() {
return hideWhiteboard;
}
- public void setHideWhiteboard(Boolean hideWhiteboard) {
+ public void setHideWhiteboard(boolean hideWhiteboard) {
this.hideWhiteboard = hideWhiteboard;
}
- public Boolean getShowMicrophoneStatus() {
+ public boolean getShowMicrophoneStatus() {
return showMicrophoneStatus;
}
- public void setShowMicrophoneStatus(Boolean showMicrophoneStatus) {
+ public void setShowMicrophoneStatus(boolean showMicrophoneStatus) {
this.showMicrophoneStatus = showMicrophoneStatus;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java?rev=1695467&r1=1695466&r2=1695467&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java
Wed Aug 12 10:16:26 2015
@@ -18,24 +18,24 @@
*/
package org.apache.openmeetings.backup;
-import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypeDao;
import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType;
import org.simpleframework.xml.stream.InputNode;
import org.simpleframework.xml.stream.OutputNode;
public class AppointmentReminderTypeConverter extends
OmConverter<AppointmentReminderType> {
- private AppointmentReminderTypDao appointmentReminderTypDaoImpl;
+ private AppointmentReminderTypeDao reminderTypeDao;
public AppointmentReminderTypeConverter() {
//default constructor is for export
}
- public AppointmentReminderTypeConverter(AppointmentReminderTypDao
appointmentReminderTypDaoImpl) {
- this.appointmentReminderTypDaoImpl =
appointmentReminderTypDaoImpl;
+ public AppointmentReminderTypeConverter(AppointmentReminderTypeDao
reminderTypeDao) {
+ this.reminderTypeDao = reminderTypeDao;
}
public AppointmentReminderType read(InputNode node) throws Exception {
- return appointmentReminderTypDaoImpl.get(getlongValue(node));
+ return reminderTypeDao.get(getlongValue(node));
}
public void write(OutputNode node, AppointmentReminderType value)
throws Exception {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1695467&r1=1695466&r2=1695467&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Wed Aug 12 10:16:26 2015
@@ -59,7 +59,7 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
-import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypeDao;
import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
@@ -139,7 +139,7 @@ public class BackupImport {
@Autowired
private AppointmentCategoryDao appointmentCategoryDaoImpl;
@Autowired
- private AppointmentReminderTypDao appointmentReminderTypDaoImpl;
+ private AppointmentReminderTypeDao reminderTypeDao;
@Autowired
private UserDao usersDao;
@Autowired
@@ -404,7 +404,7 @@ public class BackupImport {
registry.bind(AppointmentCategory.class, new
AppointmentCategoryConverter(appointmentCategoryDaoImpl));
registry.bind(User.class, new UserConverter(usersDao,
usersMap));
- registry.bind(AppointmentReminderType.class, new
AppointmentReminderTypeConverter(appointmentReminderTypDaoImpl));
+ registry.bind(AppointmentReminderType.class, new
AppointmentReminderTypeConverter(reminderTypeDao));
registry.bind(Room.class, new RoomConverter(roomDao,
roomsMap));
registry.bind(Date.class, DateConverter.class);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1695467&r1=1695466&r2=1695467&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
Wed Aug 12 10:16:26 2015
@@ -58,7 +58,7 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.db.dao.basic.ErrorDao;
import org.apache.openmeetings.db.dao.basic.NavigationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
-import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypeDao;
import org.apache.openmeetings.db.dao.room.PollDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.room.RoomTypeDao;
@@ -103,7 +103,7 @@ public class ImportInitvalues {
@Autowired
private AppointmentCategoryDao appointmentCategoryDaoImpl;
@Autowired
- private AppointmentReminderTypDao appointmentReminderTypDaoImpl;
+ private AppointmentReminderTypeDao reminderTypeDao;
@Autowired
private PollDao pollManager;
@Autowired
@@ -514,6 +514,7 @@ public class ImportInitvalues {
r = roomDao.update(r, null);
return r;
}
+
public void loadDefaultRooms(boolean createRooms) {
if (createRooms) {
// hardcoded IDs (they are not intended to be changed)
@@ -612,9 +613,9 @@ public class ImportInitvalues {
public void loadInitAppointmentReminderTypes() {
log.debug("ImportInitValues.loadInitAppointmentReminderTypes");
- appointmentReminderTypDaoImpl.add(-1L, "do not send
notification", 1568);
- appointmentReminderTypDaoImpl.add(-1L, "simple email", 1569);
- appointmentReminderTypDaoImpl.add(-1L, "iCal email", 1570);
+ reminderTypeDao.add(-1L, "do not send notification", 1568);
+ reminderTypeDao.add(-1L, "simple email", 1569);
+ reminderTypeDao.add(-1L, "iCal email", 1570);
}
public void loadInitialOAuthServers() throws Exception {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml?rev=1695467&r1=1695466&r2=1695467&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
Wed Aug 12 10:16:26 2015
@@ -251,6 +251,12 @@
<td> 3.0.x </td>
</tr>
<tr>
+ <td> allow.oauth.register </td>
+ <td> 1 </td>
+ <td> Is user register available via
OAuth </td>
+ <td> 3.0.x </td>
+ </tr>
+ <tr>
<td> application.base.url </td>
<td> http://localhost:5080/openmeetings
</td>
<td> Base URL your OPenmeetings
installation will be accessible at. </td>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java?rev=1695467&r1=1695466&r2=1695467&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
Wed Aug 12 10:16:26 2015
@@ -33,7 +33,7 @@ import java.util.TimeZone;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
-import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypeDao;
import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.dao.room.IInvitationManager;
@@ -62,7 +62,7 @@ public class AppointmentLogic {
@Autowired
private AppointmentCategoryDao appointmentCategoryDao;
@Autowired
- private AppointmentReminderTypDao appointmentReminderTypDao;
+ private AppointmentReminderTypeDao reminderTypeDao;
@Autowired
private ConfigurationDao configurationDao;
@Autowired
@@ -212,7 +212,7 @@ public class AppointmentLogic {
a.setIsMonthly(isMonthly);
a.setIsYearly(isYearly);
a.setCategory(appointmentCategoryDao.get(categoryId));
- a.setRemind(appointmentReminderTypDao.get(remind));
+ a.setRemind(reminderTypeDao.get(remind));
if (roomId > 0) {
a.setRoom(roomDao.get(roomId));
} else {
