Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java Fri Nov 6 06:18:44 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,16 +31,11 @@ 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.RoomTypeDao; import org.apache.openmeetings.db.dao.room.SipDao; import org.apache.openmeetings.db.dao.server.ISessionManager; -import org.apache.openmeetings.db.dao.user.OrganisationDao; -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; @@ -57,51 +48,18 @@ 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 private EntityManager em; @Autowired - private OrganisationDao orgDao; - @Autowired - private UserDao usersDao; - @Autowired private ISessionManager sessionManager; @Autowired private RoomDao roomDao; @Autowired private SipDao sipDao; - @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 roomtypes_id) { - log.debug("getRoombyExternalId : " + externalRoomId + " - " - + externalRoomType + " - " + roomtypes_id); - try { - TypedQuery<Room> query = em.createNamedQuery("getRoomByExternalId", Room.class); - query.setParameter("externalRoomId", externalRoomId); - query.setParameter("externalRoomType", externalRoomType); - query.setParameter("roomtypes_id", roomtypes_id); - 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 { @@ -127,7 +85,7 @@ public class RoomManager implements IRoo asc); for (Room room : rooms) { - room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id())); + room.setCurrentusers(sessionManager.getClientListByRoom(room.getId())); } sResult.setResult(rooms); @@ -144,7 +102,7 @@ public class RoomManager implements IRoo asc); for (Room room : rooms) { - room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id())); + room.setCurrentusers(sessionManager.getClientListByRoom(room.getId())); } return rooms; @@ -160,7 +118,7 @@ public class RoomManager implements IRoo orderby, asc, externalRoomType); for (Room room : rooms) { - room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id())); + room.setCurrentusers(sessionManager.getClientListByRoom(room.getId())); } return rooms; @@ -371,280 +329,21 @@ 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.setRoomModeratorsId(roomModeratorsId); - rm.setRoomId(roomId); - rm.setUser(usersDao.get(userId)); - rm.setIsSuperModerator(isSuperModerator); - - result.add(rm); - } - return result; - } - - /** - * adds a new Record to the table rooms - * @param name - * @param roomtypes_id - * @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 roomtypes_id, - 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.setStarttime(new Date()); - r.setNumberOfPartizipants(numberOfPartizipants); - r.setRoomtype(roomTypeDao.get(roomtypes_id)); - r.setIspublic(ispublic); - r.setAllowUserQuestions(allowUserQuestions); - r.setIsAudioOnly(isAudioOnly); - r.setAllowFontStyles(allowFontStyles); - - r.setAppointment(appointment); - - r.setIsDemoRoom(isDemoRoom); - r.setDemoTime(demoTime); - - r.setIsModeratedRoom(isModeratedRoom); - r.setHideTopBar(hideTopBar); - - r.setDeleted(false); - - r.setIsClosed(isClosed); - r.setRedirectURL(redirectURL); - - r.setOwnerId(ownerId); - - r.setWaitForRecording(waitForRecording); - r.setAllowRecording(allowRecording); - - r.setHideChat(hideChat); - r.setHideActivitiesAndActions(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.getRooms_id())); - r = roomDao.update(r, ownerId); - } - - return r.getRooms_id(); - } catch (Exception ex2) { - log.error("[addRoom] ", ex2); - } - return null; - } - /** - * adds/check a new Record to the table rooms with external fields + * get List of RoomGroup by group and roomtype * - * @param name - * @param roomtypes_id - * @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 roomtypes_id, 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.setStarttime(new Date()); - r.setNumberOfPartizipants(numberOfPartizipants); - r.setRoomtype(roomTypeDao.get(roomtypes_id)); - r.setIspublic(ispublic); - - r.setAllowUserQuestions(allowUserQuestions); - r.setIsAudioOnly(isAudioOnly); - r.setAllowFontStyles(allowFontStyles); - - r.setAppointment(appointment); - - r.setIsDemoRoom(isDemoRoom); - r.setDemoTime(demoTime); - - r.setIsModeratedRoom(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.getRooms_id(); - - if (organisations != null) { - Long t = this.updateRoomOrganisations(organisations, r); - if (t == null) { - return null; - } - } - - if (roomModerators != null) { - r.setModerators(getModerators(roomModerators, r.getRooms_id())); - 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 rooms_id - * @param organisation_id - * @return the id of the newly created Rooms_Organisation or NULL - */ - public Long addRoomToOrganisation(long rooms_id, - long organisation_id) { - try { - RoomOrganisation rOrganisation = new RoomOrganisation(); - rOrganisation.setRoom(roomDao.get(rooms_id)); - log.debug("addRoomToOrganisation rooms '" - + rOrganisation.getRoom().getName() + "'"); - rOrganisation.setStarttime(new Date()); - rOrganisation.setOrganisation(orgDao.get(organisation_id)); - rOrganisation.setDeleted(false); - - rOrganisation = em.merge(rOrganisation); - long returnId = rOrganisation.getRooms_organisation_id(); - return returnId; - } catch (Exception ex2) { - log.error("[addRoomToOrganisation] ", ex2); - } - return null; - } - - /** - * - * @param rooms_organisation_id + * @param groupId + * @param typeId * @return */ - public RoomOrganisation getRoomsOrganisationById( - long rooms_organisation_id) { + public List<RoomOrganisation> getRoomGroupByGroupIdAndRoomType(long groupId, long typeId) { try { - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery<RoomOrganisation> cq = cb - .createQuery(RoomOrganisation.class); - Root<RoomOrganisation> c = cq.from(RoomOrganisation.class); - Predicate condition = cb.equal(c.get("rooms_organisation_id"), - rooms_organisation_id); - cq.where(condition); - TypedQuery<RoomOrganisation> q = em.createQuery(cq); - List<RoomOrganisation> ll = q.getResultList(); - - if (ll.size() > 0) { - return ll.get(0); - } - } catch (Exception ex2) { - log.error("[getRoomsByOrganisation] ", ex2); - } - return null; - } - - /** - * get List of Rooms_Organisation by organisation and roomtype - * - * @param user_level - * @param organisation_id - * @param roomtypes_id - * @return - */ - public List<RoomOrganisation> getRoomsOrganisationByOrganisationIdAndRoomType(long organisation_id, long roomtypes_id) { - try { - TypedQuery<RoomOrganisation> q = em. - createNamedQuery("getRoomsOrganisationByOrganisationIdAndRoomType", RoomOrganisation.class); - q.setParameter("roomtypes_id", roomtypes_id); - q.setParameter("organisation_id", organisation_id); - q.setParameter("deleted", true); + TypedQuery<RoomOrganisation> q = em.createNamedQuery("getRoomGroupByGroupIdAndRoomType", RoomOrganisation.class); + q.setParameter("type", Room.Type.get(typeId)); + q.setParameter("groupId", groupId); return q.getResultList(); } catch (Exception ex2) { - log.error("[getRoomsByOrganisation] ", ex2); + log.error("[getRoomGroupByGroupIdAndRoomType] ", ex2); } return null; } @@ -743,361 +442,4 @@ public class RoomManager implements IRoo } return null; } - - public RoomOrganisation getRoomsOrganisationByOrganisationIdAndRoomId( - long organisation_id, long rooms_id) { - try { - TypedQuery<RoomOrganisation> q = em. - createNamedQuery("getRoomsOrganisationByOrganisationIdAndRoomId", RoomOrganisation.class); - - q.setParameter("rooms_id", rooms_id); - q.setParameter("organisation_id", organisation_id); - q.setParameter("deleted", true); - List<RoomOrganisation> ll = q.getResultList(); - - if (ll.size() > 0) { - return ll.get(0); - } - } catch (Exception ex2) { - log.error("[getRoomsOrganisationByOrganisationIdAndRoomId] ", ex2); - } - return null; - } - - /** - * - * @param organisation_id - * @return - */ - public List<RoomOrganisation> getRoomsOrganisationByRoomsId(long rooms_id) { - try { - TypedQuery<RoomOrganisation> q = em.createNamedQuery("getRoomsOrganisationByRoomsId", RoomOrganisation.class); - q.setParameter("rooms_id", rooms_id); - q.setParameter("deleted", true); - return q.getResultList(); - } catch (Exception ex2) { - log.error("[getRoomsByOrganisation] ", ex2); - } - return null; - } - - public Long updateRoomInternal(long rooms_id, long roomtypes_id, - 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(rooms_id); - r.setComment(comment); - - r.setIspublic(ispublic); - r.setNumberOfPartizipants(numberOfPartizipants); - r.setName(name); - r.setRoomtype(roomTypeDao.get(roomtypes_id)); - r.setUpdatetime(new Date()); - r.setAllowUserQuestions(allowUserQuestions); - r.setIsAudioOnly(isAudioOnly); - r.setAllowFontStyles(allowFontStyles); - - r.setIsDemoRoom(isDemoRoom); - r.setDemoTime(demoTime); - - r.setAppointment(appointment); - - r.setIsModeratedRoom(isModeratedRoom); - r.setHideTopBar(hideTopBar); - - r.setIsClosed(isClosed); - r.setRedirectURL(redirectURL); - r.setOwnerId(ownerId); - r.setWaitForRecording(waitForRecording); - r.setAllowRecording(allowRecording); - - r.setHideChat(hideChat); - r.setHideActivitiesAndActions(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.getRooms_id())); - r = roomDao.update(r, null); - } - - return r.getRooms_id(); - } 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().getOrganisation_id() - .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.getRooms_id()); - - 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() - .getOrganisation_id(); - 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.getRooms_id(), orgIdToAdd); - } - for (Iterator<Long> it = roomsToDel.iterator(); it.hasNext();) { - Long orgToDel = it.next(); - deleteRoomFromOrganisationByRoomAndOrganisation(room.getRooms_id(), orgToDel); - } - - return new Long(1); - } - - /** - * delete all Rooms_Organisations and Room by a given room_id - * - * @param rooms_id - */ - public Long deleteRoomById(long rooms_id) { - try { - deleteAllRoomsOrganisationOfRoom(rooms_id); - roomDao.delete(roomDao.get(rooms_id), -1L); - return rooms_id; - } catch (Exception ex2) { - log.error("[deleteRoomById] ", ex2); - } - return null; - } - - /** - * delete all Rooms_Organisation by a rooms_id - * - * @param rooms_id - */ - @SuppressWarnings("rawtypes") - public void deleteAllRoomsOrganisationOfRoom(long rooms_id) { - try { - List ll = this.getRoomsOrganisationByRoomsId(rooms_id); - 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 organisation_id - */ - public void deleteAllRoomsOrganisationOfOrganisation(long organisation_id) { - try { - for (RoomOrganisation rOrg : getRoomsOrganisationByOrganisationId(organisation_id)) { - this.deleteRoomsOrganisation(rOrg); - } - } catch (Exception ex2) { - log.error("[deleteAllRoomsOfOrganisation] ", ex2); - } - } - - /** - * Delete a Rooms_Organisation by its id - * - * @param rooms_organisation_id - */ - public Long deleteRoomsOrganisationByID(long rooms_organisation_id) { - try { - RoomOrganisation rOrg = this - .getRoomsOrganisationById(rooms_organisation_id); - return this.deleteRoomsOrganisation(rOrg); - } catch (Exception ex2) { - log.error("[deleteRoomsOrganisationByID] ", ex2); - } - return null; - } - - private Long deleteRoomFromOrganisationByRoomAndOrganisation(long rooms_id, - long organisation_id) { - try { - RoomOrganisation rOrganisation = this - .getRoomsOrganisationByOrganisationIdAndRoomId( - organisation_id, rooms_id); - 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.setUpdatetime(new Date()); - if (rOrg.getRooms_organisation_id() == null) { - em.persist(rOrg); - } else { - if (!em.contains(rOrg)) { - em.merge(rOrg); - } - } - return rOrg.getRooms_organisation_id(); - } catch (Exception ex2) { - log.error("[deleteRoomsOrganisation] ", ex2); - } - return null; - } - - // -------------------------------------------------------------------------------------------- - - public void closeRoom(Long rooms_id, Boolean status) { - try { - - Room room = roomDao.get(rooms_id); - - room.setIsClosed(status); - - roomDao.update(room, -1L); - - } catch (Exception e) { - log.error("Error updateRoomObject : ", e); - } - } - - /** - * Get a Rooms-Object or NULL - * - * @param rooms_id - * @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 rooms_id = 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 (rooms_id != null) { - return roomDao.get(rooms_id); - } - } - } catch (Exception ex2) { - log.error("[getRoomByOwnerAndTypeId] ", ex2); - } - return null; - } - }
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java Fri Nov 6 06:18:44 2015 @@ -31,6 +31,7 @@ import org.apache.openmeetings.core.conv import org.apache.openmeetings.core.converter.GenerateThumbs; import org.apache.openmeetings.db.dao.file.FileExplorerItemDao; import org.apache.openmeetings.db.entity.file.FileExplorerItem; +import org.apache.openmeetings.db.entity.file.FileItem.Type; import org.apache.openmeetings.core.documents.GeneratePDF; import org.apache.openmeetings.util.OmFileHelper; import org.apache.openmeetings.util.OpenmeetingsVariables; @@ -125,11 +126,10 @@ public class FileProcessor { fileHashName = newFileSystemName + ".flv"; } - FileExplorerItem fileExplorerItem = fileExplorerItemDao.getFileExplorerItemsById(parentFolderId); + FileExplorerItem fileExplorerItem = fileExplorerItemDao.get(parentFolderId); if (fileExplorerItem != null) { - if (fileExplorerItem.getIsFolder() == null - || !fileExplorerItem.getIsFolder()) { + if (Type.Folder != fileExplorerItem.getType()) { parentFolderId = 0L; } } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java Fri Nov 6 06:18:44 2015 @@ -23,10 +23,12 @@ import static org.apache.openmeetings.ut import java.io.File; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; import java.util.Locale; import org.apache.openmeetings.db.dao.file.FileExplorerItemDao; import org.apache.openmeetings.db.entity.file.FileExplorerItem; +import org.apache.openmeetings.db.entity.file.FileItem.Type; import org.apache.openmeetings.util.OmFileHelper; import org.apache.openmeetings.util.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; @@ -46,7 +48,7 @@ public class FileUtils { long fileSize = 0; File base = OmFileHelper.getUploadFilesDir(); - if (fileExplorerItem.getIsImage()) { + if (Type.Image == fileExplorerItem.getType()) { File tFile = new File(base, fileExplorerItem.getFileHash()); if (tFile.exists()) { @@ -60,7 +62,7 @@ public class FileUtils { } - if (fileExplorerItem.getIsPresentation()) { + if (Type.Presentation == fileExplorerItem.getType()) { File tFolder = new File(base, fileExplorerItem.getFileHash()); @@ -71,11 +73,9 @@ public class FileUtils { } log.debug("calling [1] FileExplorerItemDaoImpl.updateFileOrFolder()"); - fileExplorerItemDao.updateFileOrFolder(fileExplorerItem); + fileExplorerItemDao.update(fileExplorerItem); - FileExplorerItem[] childElements = fileExplorerItemDao - .getFileExplorerItemsByParent(fileExplorerItem - .getFileExplorerItemId()); + List<FileExplorerItem> childElements = fileExplorerItemDao.getByParent(fileExplorerItem.getId()); for (FileExplorerItem childExplorerItem : childElements) { @@ -92,23 +92,21 @@ public class FileUtils { } public void setFileToOwnerOrRoomByParent(FileExplorerItem fileExplorerItem, - Long users_id, Long room_id) { + Long users_id, Long roomId) { try { fileExplorerItem.setOwnerId(users_id); - fileExplorerItem.setRoom_id(room_id); + fileExplorerItem.setRoomId(roomId); log.debug("calling [2] FileExplorerItemDaoImpl.updateFileOrFolder()"); - fileExplorerItemDao.updateFileOrFolder(fileExplorerItem); + fileExplorerItemDao.update(fileExplorerItem); - FileExplorerItem[] childElements = fileExplorerItemDao - .getFileExplorerItemsByParent(fileExplorerItem - .getFileExplorerItemId()); + List<FileExplorerItem> childElements = fileExplorerItemDao.getByParent(fileExplorerItem.getId()); for (FileExplorerItem childExplorerItem : childElements) { this.setFileToOwnerOrRoomByParent(childExplorerItem, users_id, - room_id); + roomId); } Copied: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java (from r1712825, openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewConverterTask.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java?p2=openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java&p1=openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewConverterTask.java&r1=1712825&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewConverterTask.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java Fri Nov 6 06:18:44 2015 @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.core.data.flvrecord.converter; +package org.apache.openmeetings.core.data.record.converter; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; -import org.apache.openmeetings.core.converter.FlvInterviewConverter; +import org.apache.openmeetings.core.converter.InterviewConverter; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.task.TaskExecutor; -public class FlvInterviewConverterTask { - private static final Logger log = Red5LoggerFactory.getLogger(FlvInterviewConverterTask.class, webAppRootKey); +public class InterviewConverterTask { + private static final Logger log = Red5LoggerFactory.getLogger(InterviewConverterTask.class, webAppRootKey); @Autowired private TaskExecutor taskExecutor; @Autowired - private FlvInterviewConverter flvInterviewConverter; + private InterviewConverter flvInterviewConverter; public void startConversionThread(final Long flvRecordingId) { try { Copied: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/RecordingConverterTask.java (from r1712825, openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvRecorderConverterTask.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/RecordingConverterTask.java?p2=openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/RecordingConverterTask.java&p1=openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvRecorderConverterTask.java&r1=1712825&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvRecorderConverterTask.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/RecordingConverterTask.java Fri Nov 6 06:18:44 2015 @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.core.data.flvrecord.converter; +package org.apache.openmeetings.core.data.record.converter; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; -import org.apache.openmeetings.core.converter.FlvRecorderConverter; +import org.apache.openmeetings.core.converter.RecordingConverter; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.task.TaskExecutor; -public class FlvRecorderConverterTask { - private static final Logger log = Red5LoggerFactory.getLogger(FlvRecorderConverterTask.class, webAppRootKey); +public class RecordingConverterTask { + private static final Logger log = Red5LoggerFactory.getLogger(RecordingConverterTask.class, webAppRootKey); @Autowired private TaskExecutor taskExecutor; @Autowired - private FlvRecorderConverter flvRecorderConverter; + private RecordingConverter flvRecorderConverter; public void startConversionThread(final Long flvRecordingId) { try { Copied: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java (from r1712825, openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/StreamListener.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java?p2=openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java&p1=openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/StreamListener.java&r1=1712825&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/StreamListener.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java Fri Nov 6 06:18:44 2015 @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.core.data.flvrecord.listener; +package org.apache.openmeetings.core.data.record.listener; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import java.util.Date; -import org.apache.openmeetings.core.data.flvrecord.listener.async.BaseStreamWriter; -import org.apache.openmeetings.core.data.flvrecord.listener.async.CachedEvent; -import org.apache.openmeetings.core.data.flvrecord.listener.async.StreamAudioWriter; -import org.apache.openmeetings.core.data.flvrecord.listener.async.StreamVideoWriter; -import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao; -import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDeltaDao; +import org.apache.openmeetings.core.data.record.listener.async.BaseStreamWriter; +import org.apache.openmeetings.core.data.record.listener.async.CachedEvent; +import org.apache.openmeetings.core.data.record.listener.async.StreamAudioWriter; +import org.apache.openmeetings.core.data.record.listener.async.StreamVideoWriter; +import org.apache.openmeetings.db.dao.record.RecordingMetaDataDao; +import org.apache.openmeetings.db.dao.record.RecordingMetaDeltaDao; import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.scope.IScope; import org.red5.server.api.stream.IBroadcastStream; @@ -42,8 +42,8 @@ public class StreamListener implements I private final BaseStreamWriter streamWriter; public StreamListener(boolean isAudio, String streamName, IScope scope, Long metaDataId, - boolean isScreenData, boolean isInterview, FlvRecordingMetaDataDao metaDataDao - , FlvRecordingMetaDeltaDao metaDeltaDao) { + boolean isScreenData, boolean isInterview, RecordingMetaDataDao metaDataDao + , RecordingMetaDeltaDao metaDeltaDao) { streamWriter = isAudio ? new StreamAudioWriter(streamName, scope, metaDataId, isScreenData, isInterview, metaDataDao, metaDeltaDao) : new StreamVideoWriter(streamName, scope, metaDataId, isScreenData, isInterview, metaDataDao); Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java?rev=1712911&r1=1712825&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java Fri Nov 6 06:18:44 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.core.data.flvrecord.listener.async; +package org.apache.openmeetings.core.data.record.listener.async; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; @@ -27,9 +27,9 @@ import java.util.concurrent.BlockingQueu import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao; -import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData; -import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData.Status; +import org.apache.openmeetings.db.dao.record.RecordingMetaDataDao; +import org.apache.openmeetings.db.entity.record.RecordingMetaData; +import org.apache.openmeetings.db.entity.record.RecordingMetaData.Status; import org.apache.openmeetings.util.OmFileHelper; import org.red5.io.IStreamableFile; import org.red5.io.ITagWriter; @@ -68,10 +68,10 @@ public abstract class BaseStreamWriter i protected boolean isScreenData = false; protected String streamName = ""; - protected final FlvRecordingMetaDataDao metaDataDao; + protected final RecordingMetaDataDao metaDataDao; private final BlockingQueue<CachedEvent> queue = new LinkedBlockingQueue<CachedEvent>(); - public BaseStreamWriter(String streamName, IScope scope, Long metaDataId, boolean isScreenData, FlvRecordingMetaDataDao metaDataDao) { + public BaseStreamWriter(String streamName, IScope scope, Long metaDataId, boolean isScreenData, RecordingMetaDataDao metaDataDao) { startedSessionTimeDate = new Date(); this.isScreenData = isScreenData; this.streamName = streamName; @@ -83,7 +83,7 @@ public abstract class BaseStreamWriter i } catch (IOException ex) { log.error("##REC:: [BaseStreamWriter] Could not init Thread", ex); } - FlvRecordingMetaData metaData = metaDataDao.get(metaDataId); + RecordingMetaData metaData = metaDataDao.get(metaDataId); metaData.setStreamStatus(Status.STARTED); metaDataDao.update(metaData); @@ -174,7 +174,7 @@ public abstract class BaseStreamWriter i internalCloseStream(); // Write the complete Bit to the meta data, the converter task will wait for this bit! try { - FlvRecordingMetaData metaData = metaDataDao.get(metaDataId); + RecordingMetaData metaData = metaDataDao.get(metaDataId); log.debug("##REC:: Stream Status was: {} has been written for: {}", metaData.getStreamStatus(), metaDataId); metaData.setStreamStatus(Status.STOPPED); metaDataDao.update(metaData); Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/CachedEvent.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/CachedEvent.java?rev=1712911&r1=1712825&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/CachedEvent.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/CachedEvent.java Fri Nov 6 06:18:44 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.core.data.flvrecord.listener.async; +package org.apache.openmeetings.core.data.record.listener.async; import java.util.Date; Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java?rev=1712911&r1=1712825&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java Fri Nov 6 06:18:44 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.core.data.flvrecord.listener.async; +package org.apache.openmeetings.core.data.record.listener.async; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.red5.io.IoConstants.TYPE_AUDIO; @@ -25,10 +25,10 @@ import static org.red5.server.net.rtmp.e import java.util.Date; import org.apache.mina.core.buffer.IoBuffer; -import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao; -import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDeltaDao; -import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData; -import org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta; +import org.apache.openmeetings.db.dao.record.RecordingMetaDataDao; +import org.apache.openmeetings.db.dao.record.RecordingMetaDeltaDao; +import org.apache.openmeetings.db.entity.record.RecordingMetaData; +import org.apache.openmeetings.db.entity.record.RecordingMetaDelta; import org.red5.io.ITag; import org.red5.io.flv.impl.Tag; import org.red5.logging.Red5LoggerFactory; @@ -48,12 +48,12 @@ public class StreamAudioWriter extends B private long byteCount = 0; // Autowire is not possible - protected final FlvRecordingMetaDeltaDao metaDeltaDao; + protected final RecordingMetaDeltaDao metaDeltaDao; private boolean isInterview = false; public StreamAudioWriter(String streamName, IScope scope, Long metaDataId, boolean isScreenData, - boolean isInterview, FlvRecordingMetaDataDao metaDataDao, FlvRecordingMetaDeltaDao metaDeltaDao) { + boolean isInterview, RecordingMetaDataDao metaDataDao, RecordingMetaDeltaDao metaDeltaDao) { super(streamName, scope, metaDataId, isScreenData, metaDataDao); this.metaDeltaDao = metaDeltaDao; @@ -92,10 +92,10 @@ public class StreamAudioWriter extends B initialDelta = virtualTime.getTime() - startedSessionTimeDate.getTime(); - FlvRecordingMetaDelta metaDelta = new FlvRecordingMetaDelta(); + RecordingMetaDelta metaDelta = new RecordingMetaDelta(); metaDelta.setDeltaTime(initialDelta); - metaDelta.setFlvRecordingMetaDataId(metaDataId); + metaDelta.setMetaDataId(metaDataId); metaDelta.setTimeStamp(0); metaDelta.setDebugStatus("INIT AUDIO"); metaDelta.setStartPadding(true); @@ -117,12 +117,12 @@ public class StreamAudioWriter extends B metaDelta.setDeltaTimeStamp(deltaTimeStamp); metaDelta.setStartTimeStamp(startTimeStamp); - metaDeltaDao.addFlvRecordingMetaDelta(metaDelta); + metaDeltaDao.add(metaDelta); // That will be not bigger then long value startTimeStamp = streampacket.getTimestamp(); - FlvRecordingMetaData metaData = metaDataDao.get(metaDataId); + RecordingMetaData metaData = metaDataDao.get(metaDataId); metaData.setRecordStart(virtualTime); metaDataDao.update(metaData); } @@ -139,10 +139,10 @@ public class StreamAudioWriter extends B lastTimeStamp = timeStamp; if (deltaTime > 75) { - FlvRecordingMetaDelta metaDelta = new FlvRecordingMetaDelta(); + RecordingMetaDelta metaDelta = new RecordingMetaDelta(); metaDelta.setDeltaTime(deltaTime); - metaDelta.setFlvRecordingMetaDataId(metaDataId); + metaDelta.setMetaDataId(metaDataId); metaDelta.setTimeStamp(timeStamp); metaDelta.setDebugStatus("RUN AUDIO"); metaDelta.setStartPadding(false); @@ -167,7 +167,7 @@ public class StreamAudioWriter extends B metaDelta.setDeltaTimeStamp(deltaTimeStamp); metaDelta.setStartTimeStamp(startTimeStamp); - metaDeltaDao.addFlvRecordingMetaDelta(metaDelta); + metaDeltaDao.add(metaDelta); } log.trace("##REC:: timeStamp :: " + timeStamp); @@ -207,10 +207,10 @@ public class StreamAudioWriter extends B log.debug("##REC:: deltaTimePaddingEnd :: " + deltaTimePaddingEnd); - FlvRecordingMetaDelta metaDelta = new FlvRecordingMetaDelta(); + RecordingMetaDelta metaDelta = new RecordingMetaDelta(); metaDelta.setDeltaTime(deltaTimePaddingEnd); - metaDelta.setFlvRecordingMetaDataId(metaDataId); + metaDelta.setMetaDataId(metaDataId); metaDelta.setTimeStamp(lastTimeStamp); metaDelta.setDebugStatus("END AUDIO"); metaDelta.setStartPadding(false); @@ -220,7 +220,7 @@ public class StreamAudioWriter extends B metaDelta.setStartTime(startedSessionTimeDate); metaDelta.setCurrentTime(new Date()); - metaDeltaDao.addFlvRecordingMetaDelta(metaDelta); + metaDeltaDao.add(metaDelta); } catch (Exception err) { log.error("##REC:: [internalCloseStream]", err); } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java?rev=1712911&r1=1712825&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java Fri Nov 6 06:18:44 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.core.data.flvrecord.listener.async; +package org.apache.openmeetings.core.data.record.listener.async; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.red5.server.net.rtmp.event.VideoData.FrameType.KEYFRAME; @@ -24,8 +24,8 @@ import static org.red5.server.net.rtmp.e import java.util.Date; import org.apache.mina.core.buffer.IoBuffer; -import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao; -import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData; +import org.apache.openmeetings.db.dao.record.RecordingMetaDataDao; +import org.apache.openmeetings.db.entity.record.RecordingMetaData; import org.red5.io.ITag; import org.red5.io.flv.impl.Tag; import org.red5.logging.Red5LoggerFactory; @@ -37,7 +37,7 @@ public class StreamVideoWriter extends B private Date startedSessionScreenTimeDate = null; public StreamVideoWriter(String streamName, IScope scope, Long metaDataId, boolean isScreenData, - boolean isInterview, FlvRecordingMetaDataDao metaDataDao) { + boolean isInterview, RecordingMetaDataDao metaDataDao) { super(streamName, scope, metaDataId, isScreenData, metaDataDao); } @@ -66,7 +66,7 @@ public class StreamVideoWriter extends B if (startedSessionScreenTimeDate == null) { startedSessionScreenTimeDate = virtualTime; - FlvRecordingMetaData metaData = metaDataDao.get(metaDataId); + RecordingMetaData metaData = metaDataDao.get(metaDataId); metaData.setRecordStart(virtualTime); metaDataDao.update(metaData); } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java Fri Nov 6 06:18:44 2015 @@ -358,14 +358,14 @@ public class LdapLoginManagement { } u.setLastname(getAttr(config, entry, CONFIGKEY_LDAP_KEY_LASTNAME, LDAP_KEY_LASTNAME)); u.setFirstname(getAttr(config, entry, CONFIGKEY_LDAP_KEY_FIRSTNAME, LDAP_KEY_FIRSTNAME)); - u.getAdresses().setEmail(getAttr(config, entry, CONFIGKEY_LDAP_KEY_MAIL, LDAP_KEY_MAIL)); - u.getAdresses().setStreet(getAttr(config, entry, CONFIGKEY_LDAP_KEY_STREET, LDAP_KEY_STREET)); - u.getAdresses().setAdditionalname(getAttr(config, entry, CONFIGKEY_LDAP_KEY_ADDITIONAL_NAME, LDAP_KEY_ADDITIONAL_NAME)); - u.getAdresses().setFax(getAttr(config, entry, CONFIGKEY_LDAP_KEY_FAX, LDAP_KEY_FAX)); - u.getAdresses().setZip(getAttr(config, entry, CONFIGKEY_LDAP_KEY_ZIP, LDAP_KEY_ZIP)); - u.getAdresses().setStates(stateDao.getStateByName(getAttr(config, entry, CONFIGKEY_LDAP_KEY_COUNTRY, LDAP_KEY_COUNTRY))); - u.getAdresses().setTown(getAttr(config, entry, CONFIGKEY_LDAP_KEY_TOWN, LDAP_KEY_TOWN)); - u.getAdresses().setPhone(getAttr(config, entry, CONFIGKEY_LDAP_KEY_PHONE, LDAP_KEY_PHONE)); + u.getAddress().setEmail(getAttr(config, entry, CONFIGKEY_LDAP_KEY_MAIL, LDAP_KEY_MAIL)); + u.getAddress().setStreet(getAttr(config, entry, CONFIGKEY_LDAP_KEY_STREET, LDAP_KEY_STREET)); + u.getAddress().setAdditionalname(getAttr(config, entry, CONFIGKEY_LDAP_KEY_ADDITIONAL_NAME, LDAP_KEY_ADDITIONAL_NAME)); + u.getAddress().setFax(getAttr(config, entry, CONFIGKEY_LDAP_KEY_FAX, LDAP_KEY_FAX)); + u.getAddress().setZip(getAttr(config, entry, CONFIGKEY_LDAP_KEY_ZIP, LDAP_KEY_ZIP)); + u.getAddress().setState(stateDao.get(getAttr(config, entry, CONFIGKEY_LDAP_KEY_COUNTRY, LDAP_KEY_COUNTRY))); + u.getAddress().setTown(getAttr(config, entry, CONFIGKEY_LDAP_KEY_TOWN, LDAP_KEY_TOWN)); + u.getAddress().setPhone(getAttr(config, entry, CONFIGKEY_LDAP_KEY_PHONE, LDAP_KEY_PHONE)); String tz = getAttr(config, entry, CONFIGKEY_LDAP_TIMEZONE_NAME, LDAP_KEY_TIMEZONE); if (tz == null) { tz = config.getProperty(CONFIGKEY_LDAP_TIMEZONE_NAME, null); @@ -416,7 +416,7 @@ public class LdapLoginManagement { if (o == null) { o = new Organisation(); o.setName(name); - o = orgDao.update(o, u.getUser_id()); + o = orgDao.update(o, u.getId()); } else { for (Organisation_Users ou : u.getOrganisation_users()) { if (ou.getOrganisation().getName().equals(name)) { @@ -427,7 +427,7 @@ public class LdapLoginManagement { } if (!found) { u.getOrganisation_users().add(new Organisation_Users(o)); - userDao.update(u, u.getUser_id()); + userDao.update(u, u.getId()); log.debug("Going to add user to group:: " + name); } } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java Fri Nov 6 06:18:44 2015 @@ -101,7 +101,7 @@ public class ChatService implements IPen msg.add("false");// canvas.isrtl; msg.add("" + client.getUser_id()); Room room = roomDao.get(client.getRoom_id()); - msg.add("" + (room.getChatModerated() && !(client.getIsMod() || client.getIsSuperModerator()))); + msg.add("" + (room.isChatModerated() && !(client.getIsMod() || client.getIsSuperModerator()))); sendMessageWithClient(msg); } @@ -180,10 +180,10 @@ public class ChatService implements IPen if (rcl == null) { continue; } - if (rcl.getIsAVClient()) { + if (rcl.isAvClient()) { continue; } - if (rcl.getIsScreenClient()) { + if (rcl.isScreenClient()) { continue; } if (needModeration && Boolean.TRUE != rcl.getIsMod() && Boolean.TRUE != rcl.getIsSuperModerator()) { Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java Fri Nov 6 06:18:44 2015 @@ -182,7 +182,7 @@ public class ConferenceLibrary implement } FileExplorerItem fileExplorerItem = fileExplorerItemDao - .getFileExplorerItemsById(fileExplorerItemId); + .get(fileExplorerItemId); ArrayList roomItems = libraryWmlLoader.loadWmlFile(fileExplorerItem.getWmlFilePath()); @@ -217,7 +217,7 @@ public class ConferenceLibrary implement Client rcl = this.sessionManager .getClientByStreamId(conn.getClient() .getId(), null); - if ((rcl == null) || (rcl.getIsScreenClient())) { + if ((rcl == null) || (rcl.isScreenClient())) { continue; } else { ((IServiceCapableConnection) conn).invoke( Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java Fri Nov 6 06:18:44 2015 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.core.remote; -import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import java.util.ArrayList; @@ -27,11 +26,9 @@ import java.util.Iterator; import java.util.List; import org.apache.openmeetings.core.data.conference.RoomManager; -import org.apache.openmeetings.db.dao.basic.ConfigurationDao; 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.room.RoomModeratorDao; import org.apache.openmeetings.db.dao.server.ISessionManager; import org.apache.openmeetings.db.dao.server.SessiondataDao; import org.apache.openmeetings.db.dao.user.UserDao; @@ -39,10 +36,9 @@ import org.apache.openmeetings.db.dto.ba import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.room.Room; +import org.apache.openmeetings.db.entity.room.Room.Type; 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.entity.user.User; import org.apache.openmeetings.db.util.AuthLevelUtil; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -67,53 +63,11 @@ public class ConferenceService { @Autowired private RoomDao roomDao; @Autowired - private RoomTypeDao roomTypeDao; - @Autowired - private RoomModeratorsDao roomModeratorsDao; + private RoomModeratorDao roomModeratorsDao; @Autowired private ISessionManager sessionManager = null; - @Autowired - private ConfigurationDao cfgDao; - /** - * ( get a List of all available Rooms of this organization - * (non-appointments) - * - * @param SID - * @param organisation_id - * @return - all available Rooms of this organization - */ - public List<RoomOrganisation> getRoomsByOrganisationAndType(String SID, - long organisation_id, long roomtypes_id) { - try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - log.debug("getRoomsByOrganisationAndType"); - List<RoomOrganisation> roomOrgsList = roomManager.getRoomsOrganisationByOrganisationIdAndRoomType(organisation_id, roomtypes_id); - - List<RoomOrganisation> filtered = new ArrayList<RoomOrganisation>(); - - for (Iterator<RoomOrganisation> iter = roomOrgsList.iterator(); iter - .hasNext();) { - RoomOrganisation orgRoom = iter.next(); - - if (!orgRoom.getRoom().getAppointment()) { - orgRoom.getRoom().setCurrentusers( - this.getRoomClientsListByRoomId(orgRoom.getRoom() - .getRooms_id())); - filtered.add(orgRoom); - } - } - return filtered; - } - } catch (Exception err) { - log.error("[getRoomsByOrganisationAndType]", err); - } - return null; - } - - public List<RoomOrganisation> getRoomsByOrganisationWithoutType( - String SID, long organisation_id) { + public List<RoomOrganisation> getRoomsByOrganisationWithoutType(String SID, long organisation_id) { try { Long users_id = sessiondataDao.checkSession(SID); if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { @@ -121,7 +75,7 @@ public class ConferenceService { List<RoomOrganisation> roomOrgsList = roomManager.getRoomsOrganisationByOrganisationId(organisation_id); for (RoomOrganisation roomOrg : roomOrgsList) { - roomOrg.getRoom().setCurrentusers(sessionManager.getClientListByRoom(roomOrg.getRoom().getRooms_id())); + roomOrg.getRoom().setCurrentusers(sessionManager.getClientListByRoom(roomOrg.getRoom().getId())); } return roomOrgsList; @@ -160,14 +114,14 @@ public class ConferenceService { * @param roomtypes_id * @return - public rooms with given type, null in case of the error */ - public List<Room> getRoomsPublic(String SID, Long roomtypes_id) { + public List<Room> getRoomsPublic(String SID, String roomtype) { try { log.debug("getRoomsPublic"); Long users_id = sessiondataDao.checkSession(SID); if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - List<Room> roomList = roomDao.getPublicRooms(roomtypes_id); + List<Room> roomList = roomDao.getPublicRooms(Type.valueOf(roomtype)); // Filter : no appointed meetings List<Room> filtered = new ArrayList<Room>(); @@ -175,9 +129,9 @@ public class ConferenceService { for (Iterator<Room> iter = roomList.iterator(); iter.hasNext();) { Room rooms = iter.next(); - if (!rooms.getAppointment()) { + if (!rooms.isAppointment()) { rooms.setCurrentusers(this.getRoomClientsListByRoomId(rooms - .getRooms_id())); + .getId())); filtered.add(rooms); } } @@ -199,7 +153,7 @@ public class ConferenceService { List<Room> roomList = roomDao.getPublicRooms(); for (Room room : roomList) { - room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id())); + room.setCurrentusers(sessionManager.getClientListByRoom(room.getId())); } return roomList; @@ -229,19 +183,19 @@ public class ConferenceService { * * retrieving Appointment for Room * - * @param room_id + * @param roomId * @return - Appointment in case the room is appointment, null otherwise */ - public Appointment getAppointMentDataForRoom(Long room_id) { + public Appointment getAppointMentDataForRoom(Long roomId) { log.debug("getAppointMentDataForRoom"); - Room room = roomDao.get(room_id); + Room room = roomDao.get(roomId); - if (room.getAppointment() == false) + if (room.isAppointment() == false) return null; try { - Appointment ment = appointmentDao.getAppointmentByRoom(room_id); + Appointment ment = appointmentDao.getByRoom(roomId); return ment; } catch (Exception e) { @@ -253,66 +207,24 @@ public class ConferenceService { // -------------------------------------------------------------------------------------------- - /** - * - */ - // -------------------------------------------------------------------------------------------- - public List<Room> getAppointedMeetings(String SID, Long room_types_id) { - log.debug("ConferenceService.getAppointedMeetings"); - - Long users_id = sessiondataDao.checkSession(SID); - - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - - List<Appointment> points = appointmentDao.getTodaysAppointmentsbyRangeAndMember(users_id); - List<Room> result = new ArrayList<Room>(); - - if (points != null) { - for (int i = 0; i < points.size(); i++) { - Appointment ment = points.get(i); - - Long rooms_id = ment.getRoom().getRooms_id(); - Room rooom = roomDao.get(rooms_id); - - if (!rooom.getRoomtype().getRoomtypes_id() - .equals(room_types_id)) - continue; - - rooom.setCurrentusers(getRoomClientsListByRoomId(rooom - .getRooms_id())); - result.add(rooom); - } - } - - log.debug("Found " + result.size() + " rooms"); - return result; - - } else { - return null; - } - - } - - // -------------------------------------------------------------------------------------------- - public List<Room> getAppointedMeetingRoomsWithoutType(String SID) { log.debug("ConferenceService.getAppointedMeetings"); try { Long users_id = sessiondataDao.checkSession(SID); if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - List<Appointment> appointments = appointmentDao.getTodaysAppointmentsbyRangeAndMember(users_id); + List<Appointment> appointments = appointmentDao.getForToday(users_id); List<Room> result = new ArrayList<Room>(); if (appointments != null) { for (int i = 0; i < appointments.size(); i++) { Appointment ment = appointments.get(i); - Long rooms_id = ment.getRoom().getRooms_id(); + Long rooms_id = ment.getRoom().getId(); Room rooom = roomDao.get(rooms_id); rooom.setCurrentusers(this - .getRoomClientsListByRoomId(rooom.getRooms_id())); + .getRoomClientsListByRoomId(rooom.getId())); result.add(rooom); } } @@ -329,21 +241,6 @@ public class ConferenceService { /** * * @param SID - * @return - all room types available - */ - public List<RoomType> getRoomTypes(String SID) { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - User user = userDao.get(users_id); - return roomTypeDao.getAll(user == null - ? cfgDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1") : user.getLanguage_id()); - } - return null; - } - - /** - * - * @param SID * @param rooms_id * @return - room with the id given */ @@ -360,7 +257,7 @@ public class ConferenceService { Long users_id = sessiondataDao.checkSession(SID); if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { room = roomDao.get(rooms_id); - room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id())); + room.setCurrentusers(sessionManager.getClientListByRoom(room.getId())); } return room; } @@ -376,7 +273,8 @@ public class ConferenceService { public Room getRoomByExternalId(String SID, Long externalUserId, String externalUserType, long roomtypes_id) { Long users_id = sessiondataDao.checkSession(SID); if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - return roomManager.getRoomByExternalId(externalUserId, externalUserType, roomtypes_id); + //TODO FIXME roomtype + return roomDao.getExternal(Room.Type.get(roomtypes_id), externalUserType, externalUserId); } return null; } @@ -434,20 +332,6 @@ public class ConferenceService { } /** - * - * @param SID - * @param rooms_id - * @return - id of the room being deleted - */ - public Long deleteRoom(String SID, long rooms_id) { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { - return roomManager.deleteRoomById(rooms_id); - } - return null; - } - - /** * return all participants of a room * * @param room_id @@ -499,11 +383,11 @@ public class ConferenceService { return null; } - public Room getRoomByOwnerAndType(String SID, Long roomtypesId, String roomName) { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - return roomManager.getRoomByOwnerAndTypeId(users_id, - roomtypesId, roomName); + public Room getRoomByOwnerAndType(String SID, Long roomTypeId, String roomName) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + //TODO FIXME roomtype + return roomDao.getUserRoom(userId, Room.Type.get(roomTypeId), roomName); } return null; } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java Fri Nov 6 06:18:44 2015 @@ -22,8 +22,7 @@ import static org.apache.openmeetings.ut import org.apache.openmeetings.db.dao.basic.ErrorDao; import org.apache.openmeetings.db.dao.label.LabelDao; -import org.apache.openmeetings.db.dto.basic.ErrorResult; -import org.apache.openmeetings.db.entity.basic.ErrorType; +import org.apache.openmeetings.db.dto.basic.ServiceResult; import org.apache.openmeetings.db.entity.basic.ErrorValue; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -51,22 +50,19 @@ public class ErrorService { * @param errorid * @return - ErrorResult object with the id given */ - public ErrorResult getErrorByCode(String SID, Long errorid, Long langId) { + public ServiceResult getErrorByCode(String SID, Long errorid, Long langId) { if (errorid < 0) { log.debug("errorid, language_id: " + errorid + "|" + langId); ErrorValue eValues = errorDao.get(-1 * errorid); if (eValues != null) { - ErrorType eType = errorDao.getErrorType(eValues.getErrortype_id()); - log.debug("eValues.getFieldvalues_id() = " + eValues.getFieldvalues_id()); - log.debug("eValues.getErrorType() = " + eType); - String eValue = labelDao.getString(eValues.getFieldvalues_id(), langId); - String tValue = labelDao.getString(eType.getFieldvalues_id(), langId); + log.debug("eValues.getFieldvalues_id() = " + eValues.getLabelId()); + String eValue = labelDao.getString(eValues.getLabelId(), langId); if (eValue != null) { - return new ErrorResult(errorid, eValue, tValue); + return new ServiceResult(errorid, eValue, eValues.getType().name()); } } } else { - return new ErrorResult(errorid, "Error ... please check your input", "Error"); + return new ServiceResult(errorid, "Error ... please check your input", "Error"); } return null; } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java Fri Nov 6 06:18:44 2015 @@ -140,7 +140,7 @@ public class InvitationService implement if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { Invitation inv = (Invitation)invitationManager.getInvitationByHashCode(invitationHash, false); - inv.getInvitee().setLanguage_id(language_id); + inv.getInvitee().setLanguageId(language_id); invitationManager.sendInvitionLink(inv, MessageType.Create, subject, message, false); } else { return "Need User Privileges to perfom the Action"; Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java Fri Nov 6 06:18:44 2015 @@ -43,6 +43,7 @@ import org.apache.openmeetings.db.dao.us import org.apache.openmeetings.db.entity.basic.Configuration; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.calendar.MeetingMember; +import org.apache.openmeetings.db.entity.log.ConferenceLog; import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.room.RoomOrganisation; @@ -167,14 +168,14 @@ public class MainService implements IPen boolean allowed = false; Room r = roomDao.get(wicketroomid); if (r != null) { - if (r.getAppointment() != null && r.getAppointment()) { - Appointment a = appointmentDao.getAppointmentByRoom(wicketroomid); + if (r.isAppointment()) { + Appointment a = appointmentDao.getByRoom(wicketroomid); if (a != null && !a.isDeleted()) { - allowed = a.getOwner().getUser_id().equals(userId); + allowed = a.getOwner().getId().equals(userId); log.debug("[loginWicket] appointed room, isOwner ? " + allowed); if (!allowed) { for (MeetingMember mm : a.getMeetingMembers()) { - if (mm.getUser().getUser_id().equals(userId)) { + if (mm.getUser().getId().equals(userId)) { allowed = true; break; } @@ -197,7 +198,7 @@ public class MainService implements IPen if (!allowed) { for (RoomOrganisation ro : r.getRoomOrganisations()) { for (Organisation_Users ou : u.getOrganisation_users()) { - if (ro.getOrganisation().getOrganisation_id().equals(ou.getOrganisation().getOrganisation_id())) { + if (ro.getOrganisation().getId().equals(ou.getOrganisation().getId())) { allowed = true; break; } @@ -216,9 +217,9 @@ public class MainService implements IPen if (!u.getOrganisation_users().isEmpty()) { u.setSessionData(sessiondataDao.getSessionByHash(wicketSID)); - currentClient.setUser_id(u.getUser_id()); + currentClient.setUser_id(u.getId()); currentClient.setRoom_id(wicketroomid); - SessionVariablesUtil.setUserId(current.getClient(), u.getUser_id()); + SessionVariablesUtil.setUserId(current.getClient(), u.getId()); currentClient.setUsername(u.getLogin()); currentClient.setFirstname(u.getFirstname()); @@ -335,12 +336,8 @@ public class MainService implements IPen // Log the User conferenceLogDao.addConferenceLog( - "nicknameEnter", currentClient.getUser_id(), streamId, - null, currentClient.getUserip(), currentClient.getScope(), - currentClient.getExternalUserId(), - currentClient.getExternalUserType(), - currentClient.getEmail(), currentClient.getFirstname(), - currentClient.getLastname()); + ConferenceLog.Type.nicknameEnter, currentClient.getUser_id(), streamId, + null, currentClient.getUserip(), currentClient.getScope()); sessionManager.updateClientByStreamId(streamId, currentClient, false, null); scopeApplicationAdapter.sendMessageToCurrentScope("nickNameSet", currentClient, true); @@ -364,10 +361,10 @@ public class MainService implements IPen Long users_id = sessiondataDao.checkSession(SID); if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { Sessiondata sd = sessiondataDao.getSessionByHash(SID); - if (sd == null || sd.getSessionXml() == null) { + if (sd == null || sd.getXml() == null) { return new Long(-37); } else { - RemoteSessionObject userObject = RemoteSessionObject.fromXml(sd.getSessionXml()); + RemoteSessionObject userObject = RemoteSessionObject.fromXml(sd.getXml()); log.debug(userObject.toString()); @@ -398,7 +395,7 @@ public class MainService implements IPen , null, null, false, false, userObject.getExternalUserId() , userObject.getExternalUserType(), null, userObject.getPictureUrl()); - long userId = u.getUser_id(); + long userId = u.getId(); currentClient.setUser_id(userId); SessionVariablesUtil.setUserId(current.getClient(), userId); } else { @@ -406,8 +403,8 @@ public class MainService implements IPen userDao.update(user, users_id); - currentClient.setUser_id(user.getUser_id()); - SessionVariablesUtil.setUserId(current.getClient(), user.getUser_id()); + currentClient.setUser_id(user.getId()); + SessionVariablesUtil.setUserId(current.getClient(), user.getId()); } } @@ -531,30 +528,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/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java Fri Nov 6 06:18:44 2015 @@ -33,9 +33,10 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; +import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter; +import org.apache.openmeetings.core.remote.util.SessionVariablesUtil; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; 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; @@ -44,13 +45,12 @@ import org.apache.openmeetings.db.dao.us import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.room.Room; +import org.apache.openmeetings.db.entity.room.Room.Type; import org.apache.openmeetings.db.entity.server.Sessiondata; import org.apache.openmeetings.db.entity.user.Organisation; import org.apache.openmeetings.db.entity.user.Organisation_Users; import org.apache.openmeetings.db.entity.user.State; import org.apache.openmeetings.db.entity.user.User; -import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter; -import org.apache.openmeetings.core.remote.util.SessionVariablesUtil; import org.apache.openmeetings.util.CalendarPatterns; import org.apache.openmeetings.util.OmException; import org.apache.openmeetings.util.crypt.ManageCryptStyle; @@ -79,8 +79,6 @@ public class MobileService { @Autowired private RoomDao roomDao; @Autowired - private IRoomManager roomManager; - @Autowired private LabelDao labelDao; @Autowired private ScopeApplicationAdapter scopeAdapter; @@ -99,8 +97,8 @@ public class MobileService { public Map<Long, String> getStates() { Map<Long, String> result = new Hashtable<>(); - for (State s : stateDao.getStates()) { - result.put(s.getState_id(), s.getName()); + for (State s : stateDao.get()) { + result.put(s.getId(), s.getName()); } return result; } @@ -197,7 +195,7 @@ public class MobileService { private Map<String, Object> login(User u, Map<String, Object> result) { if (u != null) { Sessiondata sd = sessionDao.startsession(); - boolean bool = sessionDao.updateUser(sd.getSession_id(), u.getUser_id(), false, u.getLanguage_id()); + boolean bool = sessionDao.updateUser(sd.getSessionId(), u.getId(), false, u.getLanguageId()); if (!bool) { // invalid Session-Object result.put("status", -35); @@ -211,21 +209,21 @@ public class MobileService { } SessionVariablesUtil.initClient(conn.getClient(), false, c.getPublicSID()); - c.setUser_id(u.getUser_id()); + c.setUser_id(u.getId()); c.setFirstname(u.getFirstname()); c.setLastname(u.getLastname()); c.setMobile(true); sessionManager.updateClientByStreamId(streamId, c, false, null); - add(result, "sid", sd.getSession_id()); + add(result, "sid", sd.getSessionId()); add(result, "publicSid", c.getPublicSID()); add(result, "status", 0); - add(result, "userId", u.getUser_id()); + add(result, "userId", u.getId()); add(result, "firstname", u.getFirstname()); add(result, "lastname", u.getLastname()); add(result, "login", u.getLogin()); - add(result, "email", u.getAdresses() == null ? "" : u.getAdresses().getEmail()); - add(result, "language", u.getLanguage_id()); //TODO rights + add(result, "email", u.getAddress() == null ? "" : u.getAddress().getEmail()); + add(result, "language", u.getLanguageId()); //TODO rights } } return result; @@ -238,7 +236,7 @@ public class MobileService { for (IConnection conn : current.getScope().getClientConnections()) { if (conn != null && conn instanceof IServiceCapableConnection) { Client c = sessionManager.getClientByStreamId(conn.getClient().getId(), null); - if ((c.isMobile() || c.getIsAVClient()) && !Strings.isEmpty(c.getAvsettings()) && !Boolean.TRUE.equals(c.getIsScreenClient())) { + if ((c.isMobile() || c.isAvClient()) && !Strings.isEmpty(c.getAvsettings()) && !Boolean.TRUE.equals(c.isScreenClient())) { Map<String, Object> map = new Hashtable<String, Object>(); add(map, "streamId", c.getStreamid()); add(map, "broadCastId", c.getBroadCastID()); @@ -261,17 +259,17 @@ public class MobileService { private void addRoom(String type, String org, boolean first, List<Map<String, Object>> result, Room r) { Map<String, Object> room = new Hashtable<String, Object>(); - room.put("id", r.getRooms_id()); + room.put("id", r.getId()); room.put("name", r.getName()); room.put("type", type); - room.put("roomTypeId", r.getRoomtype().getRoomtypes_id()); + room.put("roomType", r.getType()); if (org != null) { room.put("org", org); } room.put("first", first); - room.put("users", sessionManager.getClientListByRoom(r.getRooms_id()).size()); + room.put("users", sessionManager.getClientListByRoom(r.getId()).size()); room.put("total", r.getNumberOfPartizipants()); - room.put("audioOnly", Boolean.TRUE.equals(r.getIsAudioOnly())); + room.put("audioOnly", Boolean.TRUE.equals(r.isAudioOnly())); result.add(room); } @@ -283,9 +281,9 @@ public class MobileService { User u = userDao.get(c.getUser_id()); //my rooms List<Room> myl = new ArrayList<Room>(); - myl.add(roomManager.getRoomByOwnerAndTypeId(u.getUser_id(), 1L, labelDao.getString(1306L, u.getLanguage_id()))); - myl.add(roomManager.getRoomByOwnerAndTypeId(u.getUser_id(), 3L, labelDao.getString(1307L, u.getLanguage_id()))); - myl.addAll(roomDao.getAppointedRoomsByUser(u.getUser_id())); + myl.add(roomDao.getUserRoom(u.getId(), Type.conference, labelDao.getString(1306L, u.getLanguageId()))); + myl.add(roomDao.getUserRoom(u.getId(), Type.conference, labelDao.getString(1306L, u.getLanguageId()))); + myl.addAll(roomDao.getAppointedRoomsByUser(u.getId())); for (Room r : myl) { addRoom("my", null, false, result, r); } @@ -294,7 +292,7 @@ public class MobileService { for (Organisation_Users ou : u.getOrganisation_users()) { Organisation org = ou.getOrganisation(); boolean first = true; - for (Room r : roomDao.getOrganisationRooms(org.getOrganisation_id())) { + for (Room r : roomDao.getOrganisationRooms(org.getId())) { addRoom("private", org.getName(), first, result, r); first = false; }
