Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java Wed Jun 3 10:59:16 2015 @@ -112,13 +112,13 @@ public class UserService implements IUse * get user by id, admin only * * @param SID - * @param user_id + * @param userId * @return User with the id given */ - public User getUserById(String SID, long user_id) { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - return userDao.get(user_id); + public User getUserById(String SID, long userId) { + Long authUserId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(authUserId))) { + return userDao.get(userId); } return null; } @@ -129,8 +129,8 @@ public class UserService implements IUse * @param SID * @return all availible Salutations */ - public List<Salutation> getUserSalutations(String SID, long language_id) { - return salutationmanagement.getUserSalutations(language_id); + public List<Salutation> getSalutations(String SID) { + return salutationmanagement.get(); } /** @@ -143,8 +143,8 @@ public class UserService implements IUse * @return whole user-list */ public List<User> getUserList(String SID, int start, int max, String orderby, boolean asc) { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) { return userDao.get("", start, max, orderby + (asc ? " ASC" : " DESC")); } return null; @@ -163,9 +163,9 @@ public class UserService implements IUse */ public Boolean kickUserByStreamId(String SID, String streamid, long serverId) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // admins only - if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) { if (serverId == 0) { Client rcl = sessionManager.getClientByStreamId(streamid, null); @@ -173,8 +173,8 @@ public class UserService implements IUse return true; } String scopeName = "hibernate"; - if (rcl.getRoom_id() != null) { - scopeName = rcl.getRoom_id().toString(); + if (rcl.getRoomId() != null) { + scopeName = rcl.getRoomId().toString(); } IScope currentScope = scopeApplicationAdapter.getRoomScope(scopeName); @@ -205,16 +205,16 @@ public class UserService implements IUse public User updateUserSelfTimeZone(String SID, String jname) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - User us = userDao.get(users_id); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + User us = userDao.get(userId); us.setTimeZoneId(timezoneUtil.getTimezoneByInternalJName(jname).getID()); us.setForceTimeZoneCheck(false); - us.setUpdatetime(new Date()); + us.setUpdated(new Date()); - userDao.update(us, users_id); + userDao.update(us, userId); return us; } @@ -226,10 +226,10 @@ public class UserService implements IUse public List<UserContact> getPendingUserContacts(String SID) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - List<UserContact> uList = userContactsDao.getContactRequestsByUserAndStatus(users_id, true); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + List<UserContact> uList = userContactsDao.getContactRequestsByUserAndStatus(userId, true); return uList; } @@ -241,10 +241,10 @@ public class UserService implements IUse public List<UserContact> getUserContacts(String SID) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - List<UserContact> uList = userContactsDao.getContactsByUserAndStatus(users_id, false); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + List<UserContact> uList = userContactsDao.getContactsByUserAndStatus(userId, false); return uList; } @@ -256,9 +256,9 @@ public class UserService implements IUse public Integer removeContactUser(String SID, Long userContactId) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { UserContact userContacts = userContactsDao.get(userContactId); if (userContacts == null) { @@ -273,15 +273,15 @@ public class UserService implements IUse return null; } - public Boolean checkUserIsInContactList(String SID, Long user_id) { + public Boolean checkUserIsInContactList(String SID, Long userId) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long authUserId = sessiondataDao.checkSession(SID); // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - List<UserContact> uList = userContactsDao.getContactsByUserAndStatus(users_id, false); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(authUserId))) { + List<UserContact> uList = userContactsDao.getContactsByUserAndStatus(authUserId, false); for (UserContact userContact : uList) { - if (userContact.getContact().getId().equals(user_id)) { + if (userContact.getContact().getId().equals(userId)) { return true; } } @@ -294,13 +294,13 @@ public class UserService implements IUse return null; } - public void shareCalendarUserContact(String SID, Long userContactId, Boolean shareCalendar) { + public void shareCalendarUserContact(String SID, Long contactId, Boolean shareCalendar) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - UserContact userContacts = userContactsDao.get(userContactId); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + UserContact userContacts = userContactsDao.get(contactId); userContacts.setShareCalendar(shareCalendar); @@ -325,17 +325,17 @@ public class UserService implements IUse */ public Boolean kickUserByPublicSID(String SID, String publicSID) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { Client rcl = sessionManager.getClientByPublicSID(publicSID, false, null); if (rcl == null) { return true; } String scopeName = "hibernate"; - if (rcl.getRoom_id() != null) { - scopeName = rcl.getRoom_id().toString(); + if (rcl.getRoomId() != null) { + scopeName = rcl.getRoomId().toString(); } IScope currentScope = this.scopeApplicationAdapter .getRoomScope(scopeName);
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java Wed Jun 3 10:59:16 2015 @@ -80,7 +80,7 @@ public class WhiteBoardService implement String streamid = current.getClient().getId(); Client currentClient = this.sessionManager .getClientByStreamId(streamid, null); - Long room_id = currentClient.getRoom_id(); + Long room_id = currentClient.getRoomId(); Long whiteBoardId = this.whiteBoardObjectListManagerById .getNewWhiteboardId(room_id); @@ -99,7 +99,7 @@ public class WhiteBoardService implement String streamid = current.getClient().getId(); Client currentClient = this.sessionManager .getClientByStreamId(streamid, null); - Long room_id = currentClient.getRoom_id(); + Long room_id = currentClient.getRoomId(); WhiteboardObjectList whiteboardObjectList = this.whiteBoardObjectListManagerById .getWhiteBoardObjectListByRoomId(room_id); @@ -141,7 +141,7 @@ public class WhiteBoardService implement String streamid = current.getClient().getId(); Client currentClient = this.sessionManager .getClientByStreamId(streamid, null); - Long room_id = currentClient.getRoom_id(); + Long room_id = currentClient.getRoomId(); log.debug("getRoomItems: " + room_id); WhiteboardObjectList whiteboardObjectList = this.whiteBoardObjectListManagerById @@ -355,7 +355,7 @@ public class WhiteBoardService implement String streamid = current.getClient().getId(); Client currentClient = this.sessionManager .getClientByStreamId(streamid, null); - Long room_id = currentClient.getRoom_id(); + Long room_id = currentClient.getRoomId(); WhiteboardSyncLockObject wSyncLockObject = new WhiteboardSyncLockObject(); wSyncLockObject.setAddtime(new Date()); @@ -366,7 +366,7 @@ public class WhiteBoardService implement .getWhiteBoardSyncListByRoomid(room_id); wSyncLockObject.setCurrentLoadingItem(true); - wSyncLockObject.setStarttime(new Date()); + wSyncLockObject.setInserted(new Date()); syncListRoom.put(currentClient.getPublicSID(), wSyncLockObject); this.whiteBoardObjectListManager.setWhiteBoardSyncListByRoomid( @@ -390,7 +390,7 @@ public class WhiteBoardService implement String streamid = current.getClient().getId(); Client currentClient = this.sessionManager .getClientByStreamId(streamid, null); - Long room_id = currentClient.getRoom_id(); + Long room_id = currentClient.getRoomId(); Map<String, WhiteboardSyncLockObject> syncListRoom = this.whiteBoardObjectListManager .getWhiteBoardSyncListByRoomid(room_id); @@ -454,12 +454,12 @@ public class WhiteBoardService implement String streamid = current.getClient().getId(); Client currentClient = this.sessionManager .getClientByStreamId(streamid, null); - Long room_id = currentClient.getRoom_id(); + Long room_id = currentClient.getRoomId(); WhiteboardSyncLockObject wSyncLockObject = new WhiteboardSyncLockObject(); wSyncLockObject.setAddtime(new Date()); wSyncLockObject.setPublicSID(currentClient.getPublicSID()); - wSyncLockObject.setStarttime(new Date()); + wSyncLockObject.setInserted(new Date()); Map<String, WhiteboardSyncLockObject> syncListImage = this.whiteBoardObjectListManager .getWhiteBoardObjectSyncListByRoomAndObjectId(room_id, @@ -489,7 +489,7 @@ public class WhiteBoardService implement String streamid = current.getClient().getId(); Client currentClient = this.sessionManager .getClientByStreamId(streamid, null); - Long room_id = currentClient.getRoom_id(); + Long room_id = currentClient.getRoomId(); Map<String, WhiteboardSyncLockObject> syncListImage = this.whiteBoardObjectListManager .getWhiteBoardObjectSyncListByRoomAndObjectId(room_id, @@ -542,7 +542,7 @@ public class WhiteBoardService implement Client currentClient) { try { - Long room_id = currentClient.getRoom_id(); + Long room_id = currentClient.getRoomId(); // TODO: Maybe we should also check all rooms, independent from the // current room_id if there is any user registered Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Wed Jun 3 10:59:16 2015 @@ -176,15 +176,15 @@ public class ScopeApplicationAdapter ext if (map.containsKey("screenClient")) { //TODO add check for room rights String parentSid = (String)map.get("parentSid"); - rcm.setRoom_id(Long.parseLong(conn.getScope().getName())); + rcm.setRoomId(Long.parseLong(conn.getScope().getName())); rcm.setScreenClient(true); SessionVariablesUtil.setIsScreenClient(conn.getClient()); - rcm.setUser_id(((Integer)map.get("userId")).longValue()); - SessionVariablesUtil.setUserId(conn.getClient(), rcm.getUser_id()); + rcm.setUserId(((Integer)map.get("userId")).longValue()); + SessionVariablesUtil.setUserId(conn.getClient(), rcm.getUserId()); rcm.setStreamPublishName(parentSid); - User u = usersDao.get(rcm.getUser_id() < 0 ? -rcm.getUser_id() : rcm.getUser_id()); + User u = usersDao.get(rcm.getUserId() < 0 ? -rcm.getUserId() : rcm.getUserId()); rcm.setUsername(u.getLogin()); rcm.setFirstname(u.getFirstname()); rcm.setLastname(u.getLastname()); @@ -194,10 +194,8 @@ public class ScopeApplicationAdapter ext // Log the User conferenceLogDao.addConferenceLog("ClientConnect", - rcm.getUser_id(), streamId, null, rcm.getUserip(), - rcm.getScope(), rcm.getExternalUserId(), - rcm.getExternalUserType(), rcm.getEmail(), - rcm.getFirstname(), rcm.getLastname()); + rcm.getUserId(), streamId, null, rcm.getUserip(), + rcm.getScope()); return true; } @@ -268,7 +266,7 @@ public class ScopeApplicationAdapter ext Client currentClient = sessionManager.getClientByStreamId(streamid, null); - for (Client rcl : sessionManager.getClientListByRoomAll(currentClient.getRoom_id())) { + for (Client rcl : sessionManager.getClientListByRoomAll(currentClient.getRoomId())) { if (rcl.isStartStreaming()) { screenSharerList.add(rcl); } @@ -299,7 +297,7 @@ public class ScopeApplicationAdapter ext if (client != null) { boolean startRecording = Boolean.valueOf("" + map.get("startRecording")); boolean startStreaming = Boolean.valueOf("" + map.get("startStreaming")); - boolean startPublishing = Boolean.valueOf("" + map.get("startPublishing")) && (0 == sessionManager.getPublishingCount(client.getRoom_id())); + boolean startPublishing = Boolean.valueOf("" + map.get("startPublishing")) && (0 == sessionManager.getPublishingCount(client.getRoomId())); boolean alreadyStreaming = client.isStartStreaming(); if (startStreaming) { @@ -499,19 +497,15 @@ public class ScopeApplicationAdapter ext public void roomLeaveByScope(Client currentClient, IScope currentScope, boolean removeUserFromSessionList) { try { log.debug("currentClient " + currentClient); - Long room_id = currentClient.getRoom_id(); + Long roomId = currentClient.getRoomId(); // Log the User conferenceLogDao.addConferenceLog("roomLeave", - currentClient.getUser_id(), currentClient.getStreamid(), - room_id, currentClient.getUserip(), "", - currentClient.getExternalUserId(), - currentClient.getExternalUserType(), - currentClient.getEmail(), currentClient.getFirstname(), - currentClient.getLastname()); + currentClient.getUserId(), currentClient.getStreamid(), + roomId, currentClient.getUserip(), ""); // Remove User from Sync List's - if (room_id != null) { + if (roomId != null) { whiteBoardService.removeUserFromAllLists(currentScope, currentClient); } @@ -798,13 +792,13 @@ public class ScopeApplicationAdapter ext if (currentClient == null) { return -1L; } - Long room_id = currentClient.getRoom_id(); + Long roomId = currentClient.getRoomId(); currentClient.setIsMod(true); // Put the mod-flag to true for this client sessionManager.updateClientByStreamId(currentClient.getStreamid(), currentClient, false, null); - List<Client> currentMods = sessionManager.getCurrentModeratorByRoom(room_id); + List<Client> currentMods = sessionManager.getCurrentModeratorByRoom(roomId); //Send message to all users sendMessageToCurrentScope("setNewModeratorByList", currentMods, true); @@ -840,13 +834,13 @@ public class ScopeApplicationAdapter ext if (currentClient == null) { return -1L; } - Long room_id = currentClient.getRoom_id(); + Long roomId = currentClient.getRoomId(); currentClient.setIsMod(false); // Put the mod-flag to true for this client sessionManager.updateClientByStreamId(currentClient.getStreamid(), currentClient, false, null); - List<Client> currentMods = sessionManager.getCurrentModeratorByRoom(room_id); + List<Client> currentMods = sessionManager.getCurrentModeratorByRoom(roomId); sendMessageToCurrentScope("setNewModeratorByList", currentMods, true); } catch (Exception err) { @@ -975,13 +969,13 @@ public class ScopeApplicationAdapter ext Client currentClient = sessionManager.getClientByPublicSID(publicSID, false, null); - List<Client> currentModList = sessionManager.getCurrentModeratorByRoom(currentClient.getRoom_id()); + List<Client> currentModList = sessionManager.getCurrentModeratorByRoom(currentClient.getRoomId()); if (currentModList.size() > 0) { return 2L; } else { // No moderator in this room at the moment - Room room = roomDao.get(currentClient.getRoom_id()); + Room room = roomDao.get(currentClient.getRoomId()); return room.isModerated() ? 3L : 1L; } @@ -1024,14 +1018,14 @@ public class ScopeApplicationAdapter ext * @param newMessage * @param vWidth * @param vHeight - * @param room_id + * @param roomId * @param publicSID * @param interviewPodId * @return RoomClient being updated in case of no errors, null otherwise */ public Client setUserAVSettings(String avsettings, Object newMessage, Integer vWidth, Integer vHeight, - long room_id, String publicSID, Integer interviewPodId) { + long roomId, String publicSID, Integer interviewPodId) { try { IConnection current = Red5.getConnectionLocal(); IClient c = current.getClient(); @@ -1040,12 +1034,12 @@ public class ScopeApplicationAdapter ext Client parentClient = sessionManager.getClientByPublicSID(publicSID, false, null); Client currentClient = sessionManager.getClientByStreamId(streamid, null); currentClient.setAvsettings(avsettings); - currentClient.setRoom_id(room_id); + currentClient.setRoomId(roomId); currentClient.setPublicSID(publicSID); currentClient.setVWidth(vWidth); currentClient.setVHeight(vHeight); currentClient.setInterviewPodId(interviewPodId); - currentClient.setUser_id(parentClient.getUser_id()); + currentClient.setUserId(parentClient.getUserId()); currentClient.setLastname(parentClient.getLastname()); currentClient.setFirstname(parentClient.getFirstname()); currentClient.setPicture_uri(parentClient.getPicture_uri()); @@ -1067,17 +1061,17 @@ public class ScopeApplicationAdapter ext /* * checks if the user is allowed to apply for Moderation */ - public Boolean checkRoomValues(Long room_id) { + public Boolean checkRoomValues(Long roomId) { try { // appointed meeting or moderated Room? - Room room = roomDao.get(room_id); + Room room = roomDao.get(roomId); // not really - default logic if (!room.isAppointment() && room.isModerated()) { // if this is a Moderated Room then the Room can be only // locked off by the Moderator Bit - List<Client> clientModeratorListRoom = sessionManager.getCurrentModeratorByRoom(room_id); + List<Client> clientModeratorListRoom = sessionManager.getCurrentModeratorByRoom(roomId); // If there is no Moderator yet and we are asking for it // then deny it @@ -1122,32 +1116,32 @@ public class ScopeApplicationAdapter ext * current conference room<br/> * <br/> * - * @param room_id - id of the room + * @param roomId - id of the room * @param becomeModerator - is user will become moderator * @param isSuperModerator - is user super moderator - * @param organization_id - organization id of the user + * @param organizationId - organization id of the user * @param colorObj - some color * @return RoomStatus object */ - public synchronized RoomStatus setRoomValues(Long room_id, Boolean becomeModerator, Boolean isSuperModerator, - Long organization_id, String colorObj) { + public synchronized RoomStatus setRoomValues(Long roomId, Boolean becomeModerator, Boolean isSuperModerator, + Long organizationId, String colorObj) { try { log.debug("----------- setRoomValues"); IConnection current = Red5.getConnectionLocal(); String streamid = current.getClient().getId(); Client currentClient = sessionManager.getClientByStreamId(streamid, null); - currentClient.setRoom_id(room_id); + currentClient.setRoomId(roomId); currentClient.setRoomEnter(new Date()); currentClient.setUsercolor(colorObj); // Inject externalUserId if nothing is set yet if (currentClient.getExternalUserId() == null) { - if (currentClient.getUser_id() != null) { - User us = usersDao.get(currentClient.getUser_id()); + if (currentClient.getUserId() != null) { + User us = usersDao.get(currentClient.getUserId()); if (us != null) { - currentClient.setExternalUserId(us.getExternalUserId()); - currentClient.setExternalUserType(us.getExternalUserType()); + currentClient.setExternalUserId(us.getExternalId()); + currentClient.setExternalUserType(us.getExternalType()); } } } @@ -1157,22 +1151,18 @@ public class ScopeApplicationAdapter ext sessionManager.updateClientByStreamId(streamid, currentClient, true, null); - Room room = roomDao.get(room_id); + Room room = roomDao.get(roomId); if (room.getShowMicrophoneStatus()) { currentClient.setCanGiveAudio(true); } // Log the User conferenceLogDao.addConferenceLog("roomEnter", - currentClient.getUser_id(), streamid, room_id, - currentClient.getUserip(), "", - currentClient.getExternalUserId(), - currentClient.getExternalUserType(), - currentClient.getEmail(), currentClient.getFirstname(), - currentClient.getLastname()); + currentClient.getUserId(), streamid, roomId, + currentClient.getUserip(), ""); // Check for Moderation LogicalRoom ENTER - List<Client> clientListRoom = sessionManager.getClientListByRoom(room_id); + List<Client> clientListRoom = sessionManager.getClientListByRoom(roomId); // Return Object RoomStatus roomStatus = new RoomStatus(); @@ -1188,7 +1178,7 @@ public class ScopeApplicationAdapter ext // if this is a Moderated Room then the Room can be only // locked off by the Moderator Bit // List<RoomClient> clientModeratorListRoom = - // this.sessionManager.getCurrentModeratorByRoom(room_id); + // this.sessionManager.getCurrentModeratorByRoom(roomId); // If there is no Moderator yet we have to check if the // current User has the Bit set to true to @@ -1204,7 +1194,7 @@ public class ScopeApplicationAdapter ext // Update the Client List sessionManager.updateClientByStreamId(streamid, currentClient, false, null); - List<Client> modRoomList = sessionManager.getCurrentModeratorByRoom(currentClient.getRoom_id()); + List<Client> modRoomList = sessionManager.getCurrentModeratorByRoom(currentClient.getRoomId()); //Sync message to everybody sendMessageToCurrentScope("setNewModeratorByList", modRoomList, false); @@ -1217,7 +1207,7 @@ public class ScopeApplicationAdapter ext } else { // If this is a normal Room Moderator rules : first come, first draw ;-) log.debug("setRoomValues : Room" - + room_id + + roomId + " not appointed! Moderator rules : first come, first draw ;-)"); if (clientListRoom.size() == 1) { log.debug("Room is empty so set this user to be moderation role"); @@ -1231,7 +1221,7 @@ public class ScopeApplicationAdapter ext // Update the Client List sessionManager.updateClientByStreamId(streamid, currentClient, false, null); - List<Client> modRoomList = sessionManager.getCurrentModeratorByRoom(currentClient.getRoom_id()); + List<Client> modRoomList = sessionManager.getCurrentModeratorByRoom(currentClient.getRoomId()); // There is a need to send an extra Event here, // cause at this moment there could be @@ -1253,9 +1243,9 @@ public class ScopeApplicationAdapter ext } else { // If this is an Appointment then the Moderator will be set to the Invitor - Appointment ment = appointmentDao.getAppointmentByRoom(room_id); + Appointment ment = appointmentDao.getAppointmentByRoom(roomId); - Long userIdInRoomClient = currentClient.getUser_id(); + Long userIdInRoomClient = currentClient.getUserId(); boolean found = false; boolean moderator_set = false; @@ -1271,7 +1261,7 @@ public class ScopeApplicationAdapter ext // Update the Client List sessionManager.updateClientByStreamId(streamid, currentClient, false, null); - List<Client> modRoomList = sessionManager.getCurrentModeratorByRoom(currentClient.getRoom_id()); + List<Client> modRoomList = sessionManager.getCurrentModeratorByRoom(currentClient.getRoomId()); // There is a need to send an extra Event here, cause at this moment // there could be already somebody in the Room waiting @@ -1316,7 +1306,7 @@ public class ScopeApplicationAdapter ext // Update the Client List sessionManager.updateClientByStreamId(streamid, currentClient, false, null); - List<Client> modRoomList = sessionManager.getCurrentModeratorByRoom(currentClient.getRoom_id()); + List<Client> modRoomList = sessionManager.getCurrentModeratorByRoom(currentClient.getRoomId()); // There is a need to send an extra Event here, cause at // this moment there could be @@ -1387,8 +1377,8 @@ public class ScopeApplicationAdapter ext User us = usersDao.get(userId); if (us != null) { - currentClient.setExternalUserId(us.getExternalUserId()); - currentClient.setExternalUserType(us.getExternalUserType()); + currentClient.setExternalUserId(us.getExternalId()); + currentClient.setExternalUserType(us.getExternalType()); if (us.getPictureuri() != null) { // set Picture-URI currentClient.setPicture_uri(us.getPictureuri()); @@ -1421,7 +1411,7 @@ public class ScopeApplicationAdapter ext Client currentClient = sessionManager.getClientByStreamId(streamid, null); currentClient.setUsername(username); - currentClient.setUser_id(userId); + currentClient.setUserId(userId); SessionVariablesUtil.setUserId(current.getClient(), userId); currentClient.setUserObject(userId, username, firstname, lastname); @@ -1432,8 +1422,8 @@ public class ScopeApplicationAdapter ext User user = usersDao.get(userId); if (user != null) { - currentClient.setExternalUserId(user.getExternalUserId()); - currentClient.setExternalUserType(user.getExternalUserType()); + currentClient.setExternalUserId(user.getExternalId()); + currentClient.setExternalUserType(user.getExternalType()); } // only fill this value from User-Record @@ -1455,22 +1445,22 @@ public class ScopeApplicationAdapter ext /** * used by the Screen-Sharing Servlet to trigger events * - * @param room_id + * @param roomId * @param message * @return the list of room clients */ - public HashMap<String, Client> sendMessageByRoomAndDomain(Long room_id, Object message) { + public HashMap<String, Client> sendMessageByRoomAndDomain(Long roomId, Object message) { HashMap<String, Client> roomClientList = new HashMap<String, Client>(); try { - log.debug("sendMessageByRoomAndDomain " + room_id); + log.debug("sendMessageByRoomAndDomain " + roomId); IScope globalScope = getContext().getGlobalScope(); IScope webAppKeyScope = globalScope.getScope(OpenmeetingsVariables.webAppRootKey); log.debug("webAppKeyScope " + webAppKeyScope); - IScope scopeHibernate = webAppKeyScope.getScope(room_id.toString()); + IScope scopeHibernate = webAppKeyScope.getScope(roomId.toString()); new MessageSender(scopeHibernate, "newMessageByRoomAndDomain", message) { @Override @@ -1489,8 +1479,8 @@ public class ScopeApplicationAdapter ext try { IConnection current = Red5.getConnectionLocal(); Client currentClient = sessionManager.getClientByStreamId(current.getClient().getId(), null); - Long room_id = currentClient.getRoom_id(); - return sessionManager.getCurrentModeratorByRoom(room_id); + Long roomId = currentClient.getRoomId(); + return sessionManager.getCurrentModeratorByRoom(roomId); } catch (Exception err) { log.error("[getCurrentModerator]", err); } @@ -1526,7 +1516,7 @@ public class ScopeApplicationAdapter ext return; } - Long room_id = currentClient.getRoom_id(); + Long roomId = currentClient.getRoomId(); // log.debug("***** sendVars: " + whiteboardObj); @@ -1559,14 +1549,14 @@ public class ScopeApplicationAdapter ext whiteboardTempObj.put(3, tempActionObject); whiteboardManagement.addWhiteBoardObjectById( - room_id, whiteboardTempObj, whiteboardId); + roomId, whiteboardTempObj, whiteboardId); } } else { whiteboardManagement.addWhiteBoardObjectById( - room_id, whiteboardObj, whiteboardId); + roomId, whiteboardObj, whiteboardId); } @@ -1609,7 +1599,6 @@ public class ScopeApplicationAdapter ext try { IConnection current = Red5.getConnectionLocal(); Client currentClient = sessionManager.getClientByStreamId(current.getClient().getId(), null); - // Long room_id = currentClient.getRoom_id(); log.debug("***** id: " + currentClient.getStreamid()); @@ -1946,8 +1935,8 @@ public class ScopeApplicationAdapter ext } // default Scope Name String scopeName = "hibernate"; - if (currentClient.getRoom_id() != null) { - scopeName = currentClient.getRoom_id().toString(); + if (currentClient.getRoomId() != null) { + scopeName = currentClient.getRoomId().toString(); } IScope scopeHibernate = webAppKeyScope.getScope(scopeName); @@ -1955,7 +1944,7 @@ public class ScopeApplicationAdapter ext // log.debug("scopeHibernate "+scopeHibernate); if (scopeHibernate != null) { - // Notify the clients of the same scope (room) with user_id + // Notify the clients of the same scope (room) with userId for (IConnection conn : webAppKeyScope.getScope(scopeName).getClientConnections()) { IClient client = conn.getClient(); @@ -1979,13 +1968,13 @@ public class ScopeApplicationAdapter ext } } - public synchronized void sendMessageWithClientByPublicSIDOrUser(Object message, String publicSID, Long user_id) { + public synchronized void sendMessageWithClientByPublicSIDOrUser(Object message, String publicSID, Long userId) { try { // Get Room Id to send it to the correct Scope Client currentClient = sessionManager.getClientByPublicSID(publicSID, false, null); if (currentClient == null) { - currentClient = sessionManager.getClientByUserId(user_id); + currentClient = sessionManager.getClientByUserId(userId); } Set<IConnection> conset = null; @@ -1998,8 +1987,8 @@ public class ScopeApplicationAdapter ext } else { // default Scope Name String scopeName = "hibernate"; - if (currentClient.getRoom_id() != null) { - scopeName = currentClient.getRoom_id().toString(); + if (currentClient.getRoomId() != null) { + scopeName = currentClient.getRoomId().toString(); } IScope globalScope = getContext().getGlobalScope(); @@ -2011,7 +2000,7 @@ public class ScopeApplicationAdapter ext } } - // Notify the clients of the same scope (room) with user_id + // Notify the clients of the same scope (room) with userId for (IConnection conn : conset) { if (conn != null) { @@ -2028,7 +2017,7 @@ public class ScopeApplicationAdapter ext // log.debug("IS EQUAL "); ((IServiceCapableConnection) conn).invoke("newMessageByRoomAndDomain", new Object[] { message }, this); log.debug("sendMessageWithClientByPublicSID RPC:newMessageByRoomAndDomain" + message); - } else if (user_id != 0 && SessionVariablesUtil.getUserId(client).equals(user_id)) { + } else if (userId != 0 && SessionVariablesUtil.getUserId(client).equals(userId)) { ((IServiceCapableConnection) conn).invoke("newMessageByRoomAndDomain", new Object[] { message }, this); log.debug("sendMessageWithClientByPublicSID RPC:newMessageByRoomAndDomain" + message); } @@ -2208,7 +2197,7 @@ public class ScopeApplicationAdapter ext IConnection current = Red5.getConnectionLocal(); Client currentClient = sessionManager.getClientByStreamId(current.getClient().getId(), null); - return sessionManager.getClientListByRoom(currentClient.getRoom_id()); + return sessionManager.getClientListByRoom(currentClient.getRoomId()); } catch (Exception err) { log.debug("[getClientListScope]", err); } @@ -2282,7 +2271,7 @@ public class ScopeApplicationAdapter ext IConnection current = Red5.getConnectionLocal(); String streamid = current.getClient().getId(); Client client = sessionManager.getClientByStreamId(streamid, null); - Long roomId = client.getRoom_id(); + Long roomId = client.getRoomId(); Integer count = roomManager.getSipConferenceMembersNumber(roomId); String newNumber = getSipTransportLastname(roomId, count); log.debug("getSipConferenceMembersNumber: " + newNumber); @@ -2290,7 +2279,7 @@ public class ScopeApplicationAdapter ext client.setLastname(newNumber); sessionManager.updateClientByStreamId(streamid, client, false, null); log.debug("updateSipTransport: {}, {}, {}, {}, {}", new Object[]{client.getPublicSID(), - client.getRoom_id(), client.getFirstname(), client.getLastname(), client.getAvsettings()}); + client.getRoomId(), client.getFirstname(), client.getLastname(), client.getAvsettings()}); sendMessageWithClient(new String[]{"personal",client.getFirstname(),client.getLastname()}); } return count != null && count > 0 ? count - 1 : 0; @@ -2305,7 +2294,7 @@ public class ScopeApplicationAdapter ext String streamid = current.getClient().getId(); Client currentClient = sessionManager.getClientByStreamId(streamid, null); try { - String sipNumber = getSipNumber(currentClient.getRoom_id()); + String sipNumber = getSipNumber(currentClient.getRoomId()); log.debug("asterisk -rx \"originate Local/" + number + "@rooms-out extension " + sipNumber + "@rooms-originate\""); Runtime.getRuntime().exec(new String[] { "asterisk", "-rx", "originate Local/" + number + "@rooms-out extension " + sipNumber + "@rooms-originate" }); } catch (IOException e) { @@ -2313,16 +2302,16 @@ public class ScopeApplicationAdapter ext } } - public synchronized String getSipNumber(Long room_id) { - Room r = roomDao.get(room_id); + public synchronized String getSipNumber(Long roomId) { + Room r = roomDao.get(roomId); if(r != null && r.getConfno() != null) { - log.debug("getSipNumber: room_id: {}, sipNumber: {}", new Object[]{room_id, r.getConfno()}); + log.debug("getSipNumber: roomId: {}, sipNumber: {}", new Object[]{roomId, r.getConfno()}); return r.getConfno(); } return null; } - public void setSipTransport(Long room_id, String publicSID, String broadCastId) { + public void setSipTransport(Long roomId, String publicSID, String broadCastId) { log.debug("----------- setSipTransport"); IConnection current = Red5.getConnectionLocal(); IClient c = current.getClient(); @@ -2330,10 +2319,10 @@ public class ScopeApplicationAdapter ext // Notify all clients of the same scope (room) Client currentClient = sessionManager.getClientByStreamId(streamid, null); currentClient.setSipTransport(true); - currentClient.setRoom_id(room_id); + currentClient.setRoomId(roomId); currentClient.setRoomEnter(new Date()); currentClient.setFirstname("SIP Transport"); - currentClient.setLastname(getSipTransportLastname(room_id)); + currentClient.setLastname(getSipTransportLastname(roomId)); currentClient.setBroadCastID(Long.parseLong(broadCastId)); currentClient.setIsBroadcasting(true); currentClient.setPublicSID(publicSID); Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java Wed Jun 3 10:59:16 2015 @@ -109,7 +109,7 @@ public class HashMapStore implements ICl public List<Client> getClientsByUserId(Server server, Long userId) { List<Client> clientList = new ArrayList<Client>(); for (Client cl : clientsByStreamId.values()) { - if (cl.getUser_id().equals(userId)) { + if (cl.getUserId().equals(userId)) { clientList.add(cl); } } @@ -119,7 +119,7 @@ public class HashMapStore implements ICl public List<Client> getClientsByRoomId(Long roomId) { List<Client> clientList = new ArrayList<Client>(); for (Client cl : clientsByStreamId.values()) { - if (cl.getRoom_id() != null && cl.getRoom_id().equals(roomId)) { + if (cl.getRoomId() != null && cl.getRoomId().equals(roomId)) { clientList.add(cl); } } @@ -177,7 +177,7 @@ public class HashMapStore implements ICl public List<Long> getRoomsIdsByServer(Server server) { HashSet<Long> rooms = new HashSet<Long>(); for (Client cl : clientsByStreamId.values()) { - Long roomId = cl.getRoom_id(); + Long roomId = cl.getRoomId(); if (roomId != null && roomId > 0 && !rooms.contains(roomId)) { rooms.add(roomId); } Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java Wed Jun 3 10:59:16 2015 @@ -62,7 +62,7 @@ public class ConfigurationDao implements private static final Logger log = Red5LoggerFactory.getLogger(ConfigurationDao.class, webAppRootKey); public static final long DEFAULT_MAX_UPLOAD_SIZE = 1024 * 1024 * 1024; // 1GB public static final String DEFAULT_APP_NAME = "OpenMeetings"; - public final static String[] searchFields = {"conf_key", "conf_value"}; + public final static String[] searchFields = {"key", "value"}; @PersistenceContext private EntityManager em; @@ -85,7 +85,7 @@ public class ConfigurationDao implements public Configuration forceGet(String confKey) { try { List<Configuration> list = em.createNamedQuery("forceGetConfigurationByKey", Configuration.class) - .setParameter("conf_key", confKey).getResultList(); + .setParameter("key", confKey).getResultList(); return list.isEmpty() ? null : list.get(0); } catch (Exception e) { log.error("[forceGet]: ", e); @@ -97,7 +97,7 @@ public class ConfigurationDao implements List<Configuration> result = new ArrayList<Configuration>(); for (String key : keys) { //iteration is necessary to fill list with all values List<Configuration> r = em.createNamedQuery("getConfigurationsByKeys", Configuration.class) - .setParameter("conf_keys", Arrays.asList(key)) + .setParameter("keys", Arrays.asList(key)) .getResultList(); result.add(r.isEmpty() ? null : r.get(0)); } @@ -120,9 +120,9 @@ public class ConfigurationDao implements List<Configuration> list = get(key); if (list == null || list.isEmpty() || list.get(0) == null) { - log.warn("Could not find key in configuration CONF_KEY: " + key); + log.warn("Could not find key in configurations: " + key); } else { - String val = list.get(0).getConf_value(); + String val = list.get(0).getValue(); // Use the custom value as default value if (val != null) { defaultValue = val; @@ -141,7 +141,7 @@ public class ConfigurationDao implements return c.newInstance(defaultValue); } catch (Exception err) { - log.error("cannot be cast to return type, you have misconfigured your configuration CONF_KEY: " + key, err); + log.error("cannot be cast to return type, you have misconfigured your configurations: " + key, err); return null; } } @@ -171,8 +171,8 @@ public class ConfigurationDao implements */ public Configuration add(String key, String value, Long userId, String comment) { Configuration c = new Configuration(); - c.setConf_key(key); - c.setConf_value(value); + c.setKey(key); + c.setValue(value); c.setComment(comment); return update(c, userId); } @@ -197,7 +197,7 @@ public class ConfigurationDao implements return null; } return em.createNamedQuery("getConfigurationById", Configuration.class) - .setParameter("configuration_id", id).getSingleResult(); + .setParameter("id", id).getSingleResult(); } public List<Configuration> get(int start, int count) { @@ -226,10 +226,10 @@ public class ConfigurationDao implements } public Configuration update(Configuration entity, Long userId, boolean deleted) { - String key = entity.getConf_key(); - String value = entity.getConf_value(); + String key = entity.getKey(); + String value = entity.getValue(); if (entity.getId() == null || entity.getId() <= 0) { - entity.setStarttime(new Date()); + entity.setInserted(new Date()); entity.setDeleted(deleted); em.persist(entity); } else { @@ -237,7 +237,7 @@ public class ConfigurationDao implements entity.setUser(userDao.get(userId)); } entity.setDeleted(deleted); - entity.setUpdatetime(new Date()); + entity.setUpdated(new Date()); entity = em.merge(entity); } if (CONFIG_CRYPT_KEY.equals(key)) { @@ -252,7 +252,7 @@ public class ConfigurationDao implements } public void delete(Configuration entity, Long userId) { - entity.setUpdatetime(new Date()); + entity.setUpdated(new Date()); this.update(entity, userId, true); } Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java Wed Jun 3 10:59:16 2015 @@ -45,12 +45,11 @@ public class ErrorDao { try { ErrorType eType = new ErrorType(); eType.setId(id); - eType.setStarttime(new Date()); + eType.setInserted(new Date()); eType.setDeleted(false); - eType.setFieldvalues_id(labelId); + eType.setLabelId(labelId); eType = em.merge(eType); - Long newerrortype_id = eType.getId(); - return newerrortype_id; + return eType.getId(); } catch (Exception ex2) { log.error("[addErrorType]: ", ex2); } @@ -83,10 +82,10 @@ public class ErrorDao { try { ErrorValue eValue = new ErrorValue(); eValue.setId(id); - eValue.setErrortype_id(typeId); + eValue.setTypeId(typeId); eValue.setDeleted(false); - eValue.setStarttime(new Date()); - eValue.setFieldvalues_id(labelId); + eValue.setInserted(new Date()); + eValue.setLabelId(labelId); eValue = em.merge(eValue); return eValue.getId(); } catch (Exception ex2) { @@ -98,27 +97,25 @@ public class ErrorDao { public Long getErrorValueById(Long typeId, Long labelId) { try { ErrorValue eValue = new ErrorValue(); - eValue.setErrortype_id(typeId); - eValue.setStarttime(new Date()); - eValue.setFieldvalues_id(labelId); + eValue.setTypeId(typeId); + eValue.setInserted(new Date()); + eValue.setLabelId(labelId); eValue = em.merge(eValue); - Long newerrorvalues_id = eValue.getId(); - return newerrorvalues_id; + return eValue.getId(); } catch (Exception ex2) { log.error("[getErrorValueById]: ", ex2); } return null; } - public Long updateErrorValues(Long errortype_id, Long labelId) { + public Long updateErrorValues(Long typeId, Long labelId) { try { ErrorValue eValue = new ErrorValue(); - eValue.setErrortype_id(errortype_id); - eValue.setStarttime(new Date()); - eValue.setFieldvalues_id(labelId); + eValue.setTypeId(typeId); + eValue.setInserted(new Date()); + eValue.setLabelId(labelId); eValue = em.merge(eValue); - Long newerrorvalues_id = eValue.getId(); - return newerrorvalues_id; + return eValue.getId(); } catch (Exception ex2) { log.error("[addErrorType]: ", ex2); } Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java Wed Jun 3 10:59:16 2015 @@ -53,35 +53,35 @@ public class NavigationDao { } - public List<Naviglobal> getMainMenu(boolean admin, long USER_ID) { + public List<Naviglobal> getMainMenu(boolean admin) { return em.createNamedQuery("getNavigation", Naviglobal.class) - .setParameter("level_id", admin ? 3L : 1L) + .setParameter("levelId", admin ? 3L : 1L) .getResultList(); } - public void addGlobalStructure(String action, int naviorder, long fieldvalues_id, boolean isleaf, boolean isopen, long level_id, - String name, boolean deleted, Long tooltip_fieldvalues_id) { + public void addGlobalStructure(String action, int naviorder, long labelId, boolean isleaf, boolean isopen, long levelId, + String name, boolean deleted, Long tooltipLabelId) { Naviglobal ng = new Naviglobal(); ng.setAction(action); ng.setComment(""); ng.setIcon(""); ng.setNaviorder(naviorder); - ng.setFieldvalues_id(fieldvalues_id); + ng.setLabelId(labelId); ng.setIsleaf(isleaf); ng.setIsopen(isopen); ng.setDeleted(deleted); - ng.setLevel_id(level_id); + ng.setLevelId(levelId); ng.setName(name); - ng.setStarttime(new Date()); - ng.setTooltip_fieldvalues_id(tooltip_fieldvalues_id); + ng.setInserted(new Date()); + ng.setTooltipLabelId(tooltipLabelId); // CriteriaBuilder crit = em.getCriteriaBuilder(); em.persist(ng); } - public void addMainStructure(String action, String params, int naviorder, long fieldvalues_id, boolean isleaf, boolean isopen, - long level_id, String name, long global_id, boolean deleted, Long tooltip_fieldvalues_id) { - Naviglobal ng = getGlobalMenuEntry(global_id); + public void addMainStructure(String action, String params, int naviorder, long labelId, boolean isleaf, boolean isopen, + long levelId, String name, long globalId, boolean deleted, Long tooltipLabelId) { + Naviglobal ng = getGlobalMenuEntry(globalId); List<Navimain> mainEntries = ng.getMainnavi(); mainEntries = (mainEntries == null) ? new ArrayList<Navimain>() : mainEntries; @@ -90,16 +90,16 @@ public class NavigationDao { nm.setParams(params); nm.setComment(""); nm.setIcon(""); - nm.setFieldvalues_id(fieldvalues_id); + nm.setLabelId(labelId); nm.setIsleaf(isleaf); nm.setNaviorder(naviorder); nm.setIsopen(isopen); - nm.setLevel_id(level_id); + nm.setLevelId(levelId); nm.setName(name); nm.setDeleted(deleted); - nm.setGlobal_id(global_id); - nm.setStarttime(new Date()); - nm.setTooltip_fieldvalues_id(tooltip_fieldvalues_id); + nm.setGlobalId(globalId); + nm.setInserted(new Date()); + nm.setTooltipLabelId(tooltipLabelId); mainEntries.add(nm); ng.setMainnavi(mainEntries); Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentCategoryDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentCategoryDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentCategoryDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentCategoryDao.java Wed Jun 3 10:59:16 2015 @@ -72,7 +72,7 @@ public class AppointmentCategoryDao { AppointmentCategory ac = get(categoryId); ac.setName(name); - ac.setUpdatetime(new Date()); + ac.setUpdated(new Date()); if (ac.getId() == null) { em.persist(ac); @@ -89,21 +89,20 @@ public class AppointmentCategoryDao { return null; } - public Long addAppointmentCategory(Long user_id, String name, String comment) { + public Long addAppointmentCategory(Long userId, String name, String comment) { try { AppointmentCategory ac = new AppointmentCategory(); ac.setName(name); - ac.setStarttime(new Date()); + ac.setInserted(new Date()); ac.setDeleted(false); - ac.setUser(usersDao.get(user_id)); + ac.setUser(usersDao.get(userId)); ac.setComment(comment); ac = em.merge(ac); - Long category_id = ac.getId(); - return category_id; + return ac.getId(); } catch (Exception ex2) { log.error("[addAppointmentCategory]: ", ex2); } @@ -121,7 +120,7 @@ public class AppointmentCategoryDao { log.debug("Already deleted / Could not find: " + categoryId); return categoryId; } - ac.setUpdatetime(new Date()); + ac.setUpdated(new Date()); ac.setDeleted(true); if (ac.getId() == null) { em.persist(ac); 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=1683280&r1=1683279&r2=1683280&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 Jun 3 10:59:16 2015 @@ -197,14 +197,14 @@ public class AppointmentDao { log.debug("Start " + start + " End " + end); TypedQuery<Appointment> query = em.createNamedQuery("appointmentsInRange", Appointment.class); - query.setParameter("starttime", start); - query.setParameter("endtime", end); + query.setParameter("start", start); + query.setParameter("end", end); query.setParameter("userId", userId); List<Appointment> listAppoints = new ArrayList<Appointment>(query.getResultList()); TypedQuery<Appointment> q1 = em.createNamedQuery("joinedAppointmentsInRange", Appointment.class); - q1.setParameter("starttime", start); - q1.setParameter("endtime", end); + q1.setParameter("start", start); + q1.setParameter("end", end); q1.setParameter("userId", userId); for (Appointment a : q1.getResultList()) { a.setConnectedEvent(true); //TODO need to be reviewed @@ -216,8 +216,8 @@ public class AppointmentDao { public List<Appointment> getAppointmentsInRange(Calendar start, Calendar end) { TypedQuery<Appointment> q = em.createNamedQuery("appointmentsInRangeRemind", Appointment.class); - q.setParameter("starttime", start.getTime()); - q.setParameter("endtime", end.getTime()); + q.setParameter("start", start.getTime()); + q.setParameter("end", end.getTime()); return q.getResultList(); } @@ -276,8 +276,8 @@ public class AppointmentDao { query.setParameter("userId", userId); - query.setParameter("starttime", startCal.getTime()); - query.setParameter("endtime", endCal.getTime()); + query.setParameter("start", startCal.getTime()); + query.setParameter("end", endCal.getTime()); List<Appointment> listAppoints = query.getResultList(); return listAppoints; Modified: 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/AppointmentReminderTypDao.java?rev=1683280&r1=1683279&r2=1683280&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/AppointmentReminderTypDao.java Wed Jun 3 10:59:16 2015 @@ -66,7 +66,7 @@ public class AppointmentReminderTypDao { AppointmentReminderType ac = get(typId); ac.setName(name); - ac.setUpdatetime(new Date()); + ac.setUpdated(new Date()); if (ac.getId() == null) { em.persist(ac); @@ -83,21 +83,20 @@ public class AppointmentReminderTypDao { return null; } - public Long add(Long user_id, String name, long fieldvalues_id) { + public Long add(Long userId, String name, long labelId) { try { AppointmentReminderType ac = new AppointmentReminderType(); ac.setName(name); - ac.setStarttime(new Date()); + ac.setInserted(new Date()); ac.setDeleted(false); - ac.setUser(usersDao.get(user_id)); - ac.setFieldvalues_id(fieldvalues_id); + ac.setUser(usersDao.get(userId)); + ac.setLabelId(labelId); ac = em.merge(ac); - Long category_id = ac.getId(); - return category_id; + return ac.getId(); } catch (Exception ex2) { log.error("[add]: ", ex2); } @@ -115,7 +114,7 @@ public class AppointmentReminderTypDao { log.debug("Already deleted / Could not find: " + typId); return typId; } - ac.setUpdatetime(new Date()); + ac.setUpdated(new Date()); ac.setDeleted(true); if (ac.getId() == null) { @@ -133,14 +132,10 @@ public class AppointmentReminderTypDao { return null; } - public List<AppointmentReminderType> getList(long language_id) { + public List<AppointmentReminderType> get() { log.debug("getList"); try { - TypedQuery<AppointmentReminderType> query = em.createNamedQuery("getAppointmentReminderTypes", AppointmentReminderType.class); - - List<AppointmentReminderType> listAppointmentReminderTyp = query.getResultList(); - - return listAppointmentReminderTyp; + return em.createNamedQuery("getAppointmentReminderTypes", AppointmentReminderType.class).getResultList(); } catch (Exception ex2) { log.error("[getList]: " + ex2); } Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java Wed Jun 3 10:59:16 2015 @@ -47,12 +47,12 @@ public class FileExplorerItemDao { private EntityManager em; public Long add(String fileName, String fileHash, - Long parentFileExplorerItemId, Long ownerId, Long room_id, + Long parentFileExplorerItemId, Long ownerId, Long roomId, Long insertedBy, Boolean isFolder, Boolean isImage, Boolean isPresentation, String wmlFilePath, Boolean isStoredWmlFile, Boolean isChart, Long externalFileId, String externalType) { - log.debug(".add(): adding file " + fileName+ " roomID: "+room_id); + log.debug(".add(): adding file " + fileName+ " roomID: "+roomId); try { FileExplorerItem fileItem = new FileExplorerItem(); fileItem.setFileName(fileName); @@ -60,7 +60,7 @@ public class FileExplorerItemDao { fileItem.setDeleted(false); fileItem.setParentItemId(parentFileExplorerItemId); fileItem.setOwnerId(ownerId); - fileItem.setRoomId(room_id); + fileItem.setRoomId(roomId); fileItem.setInserted(new Date()); fileItem.setInsertedBy(insertedBy); Type t = null; @@ -109,11 +109,11 @@ public class FileExplorerItemDao { return null; } - public List<FileExplorerItem> getFileExplorerItemsByRoomAndOwner(Long room_id, Long ownerId) { + public List<FileExplorerItem> getFileExplorerItemsByRoomAndOwner(Long roomId, Long ownerId) { log.debug(".getFileExplorerItemsByRoomAndOwner() started"); try { TypedQuery<FileExplorerItem> query = em.createNamedQuery("getFilesByRoomAndOwner", FileExplorerItem.class); - query.setParameter("room_id",room_id); + query.setParameter("roomId",roomId); query.setParameter("ownerId",ownerId); List<FileExplorerItem> fileExplorerList = query.getResultList(); @@ -125,10 +125,10 @@ public class FileExplorerItemDao { return null; } - public List<FileExplorerItem> getByRoom(Long room_id) { - log.debug("getFileExplorerItemsByRoom room_id :: "+room_id); + public List<FileExplorerItem> getByRoom(Long roomId) { + log.debug("getFileExplorerItemsByRoom roomId :: "+roomId); TypedQuery<FileExplorerItem> query = em.createNamedQuery("getFilesByRoom", FileExplorerItem.class); - query.setParameter("roomId",room_id); + query.setParameter("roomId",roomId); return query.getResultList(); } @@ -296,7 +296,7 @@ public class FileExplorerItemDao { * @param newParentFileExplorerItemId * @param isOwner */ - public void moveFile(Long fileId, Long parentId, Long room_id, Boolean isOwner, Long ownerId) { + public void moveFile(Long fileId, Long parentId, Long roomId, Boolean isOwner, Long ownerId) { log.debug(".moveFile() started"); try { @@ -311,7 +311,7 @@ public class FileExplorerItemDao { } else { // move to public room folder fId.setOwnerId(null); - fId.setRoomId(room_id); + fId.setRoomId(roomId); } } else { fId.setOwnerId(null); Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java Wed Jun 3 10:59:16 2015 @@ -99,12 +99,12 @@ public class LabelDao implements IDataPr labelCache.put(l, new ArrayList<StringLabel>()); } - public List<Map<String, Object>> getStrings(Long language_id, int start, int count) { + public List<Map<String, Object>> getStrings(Long languageId, int start, int count) { List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(); for (int i = 0; i < count; ++i) { Map<String, Object> map = new HashMap<String, Object>(); map.put("id", start + i); - map.put("value", getString(start + i, language_id)); + map.put("value", getString(start + i, languageId)); result.add(map); } return result; Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java Wed Jun 3 10:59:16 2015 @@ -41,9 +41,7 @@ public class ConferenceLogDao { private ConferenceLogTypeDao conferenceLogTypeDao; public Long addConferenceLog(String eventType, Long userId, String streamid, - Long room_id, String userip, String scopeName, - String externalUserId, String externalUserType, String email, - String firstname, String lastname) { + Long roomId, String userip, String scopeName) { try { ConferenceLogType confLogType = conferenceLogTypeDao.getConferenceLogTypeByEventName(eventType); @@ -58,13 +56,8 @@ public class ConferenceLogDao { confLog.setUserId(userId); confLog.setStreamid(streamid); confLog.setScopeName(scopeName); - confLog.setRoom_id(room_id); + confLog.setRoomId(roomId); confLog.setUserip(userip); - confLog.setExternalUserId(externalUserId); - confLog.setExternalUserType(externalUserType); - confLog.setFirstname(firstname); - confLog.setLastname(lastname); - confLog.setEmail(email); confLog = em.merge(confLog); Long confLogId = confLog.getId(); Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java Wed Jun 3 10:59:16 2015 @@ -171,7 +171,7 @@ public class FlvRecordingDao { public List<FlvRecording> getFlvRecordingRootByPublic(Long orgId) { TypedQuery<FlvRecording> q = em.createNamedQuery(orgId == null ? "getRecordingsPublic" : "getRecordingsByOrganization", FlvRecording.class); if (orgId != null) { - q.setParameter("organization_id", orgId); + q.setParameter("organizationId", orgId); } return q.getResultList(); } @@ -180,10 +180,10 @@ public class FlvRecordingDao { return em.createNamedQuery("getRecordingsByOwner", FlvRecording.class).setParameter("ownerId", ownerId).getResultList(); } - public List<FlvRecording> getFlvRecordingByRoomId(Long room_id) { + public List<FlvRecording> getFlvRecordingByRoomId(Long roomId) { try { TypedQuery<FlvRecording> query = em.createNamedQuery("getRecordingsByRoom", FlvRecording.class); - query.setParameter("roomId", room_id); + query.setParameter("roomId", roomId); List<FlvRecording> flvRecordingList = query.getResultList(); Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.java Wed Jun 3 10:59:16 2015 @@ -145,13 +145,13 @@ public class ClientDao { public List<Client> getClientsByUserId(Server server, Long userId) { TypedQuery<Client> q = em.createNamedQuery("getClientsByUserId", Client.class); q.setParameter("server", server); - q.setParameter("user_id", userId); + q.setParameter("userId", userId); return q.getResultList(); } public List<Client> getClientsByRoomId(Long roomId) { TypedQuery<Client> q = em.createNamedQuery("getClientsByRoomId", Client.class); - q.setParameter("room_id", roomId); + q.setParameter("roomId", roomId); return q.getResultList(); } Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java Wed Jun 3 10:59:16 2015 @@ -35,12 +35,12 @@ public interface IInvitationManager { Invitation getInvitation(Invitation _invitation, User inveetee, Room room , boolean isPasswordProtected, String invitationpass, Valid valid, - User createdBy, Long language_id, Date gmtTimeStart, Date gmtTimeEnd + User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd , Appointment appointment); Invitation getInvitation(User inveetee, Room room , boolean isPasswordProtected, String invitationpass, Valid valid, - User createdBy, Long language_id, Date gmtTimeStart, Date gmtTimeEnd + User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd , Appointment appointment); void sendInvitionLink(Invitation i, MessageType type, String subject, String message, boolean ical) throws Exception ; @@ -49,5 +49,5 @@ public interface IInvitationManager { Object getInvitationByHashCode(String hashCode, boolean hidePass); - boolean sendInvitationReminderSMS(String phone, String subject, long language_id); + boolean sendInvitationReminderSMS(String phone, String subject, long languageId); } Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java Wed Jun 3 10:59:16 2015 @@ -52,7 +52,7 @@ public class PollDao { public Long addPollType(Long labelId, Boolean isNumeric) { log.debug("Adding poll type: " + labelId + ", " + isNumeric); PollType pt = new PollType(); - pt.setLabel(labelId); + pt.setLabelId(labelId); pt.setNumeric(isNumeric); em.persist(pt); @@ -80,11 +80,11 @@ public class PollDao { return p; } - public boolean close(Long room_id){ + public boolean close(Long roomId){ try { log.debug(" :: closePoll :: "); Query q = em.createNamedQuery("closePoll"); - q.setParameter("rooms_id", room_id); + q.setParameter("roomId", roomId); q.setParameter("archived", true); return q.executeUpdate() > 0; } catch (Exception err) { @@ -110,11 +110,11 @@ public class PollDao { return list.isEmpty() ? null : list.get(0); } - public RoomPoll getPoll(Long room_id) { + public RoomPoll getPoll(Long roomId) { try { - log.debug(" :: getPoll :: " + room_id); + log.debug(" :: getPoll :: " + roomId); TypedQuery<RoomPoll> q = em.createNamedQuery("getPoll", RoomPoll.class); - q.setParameter("room_id", room_id); + q.setParameter("roomId", roomId); q.setParameter("archived", false); return q.getSingleResult(); } catch (NoResultException nre) { @@ -137,11 +137,11 @@ public class PollDao { return null; } - public List<RoomPoll> getArchived(Long room_id) { + public List<RoomPoll> getArchived(Long roomId) { try { - log.debug(" :: getPoll :: " + room_id); + log.debug(" :: getPoll :: " + roomId); TypedQuery<RoomPoll> q = em.createNamedQuery("getArchivedPollList",RoomPoll.class); - q.setParameter("room_id", room_id); + q.setParameter("roomId", roomId); q.setParameter("archived", true); return q.getResultList(); } catch (NoResultException nre) { @@ -152,11 +152,11 @@ public class PollDao { return null; } - public boolean hasPoll(Long room_id) { + public boolean hasPoll(Long roomId) { try { - log.debug(" :: hasPoll :: " + room_id); + log.debug(" :: hasPoll :: " + roomId); TypedQuery<Long> q = em.createNamedQuery("hasPoll", Long.class); - q.setParameter("room_id", room_id); + q.setParameter("roomId", roomId); q.setParameter("archived", false); return q.getSingleResult() > 0; } catch (NoResultException nre) { @@ -167,11 +167,11 @@ public class PollDao { return false; } - public boolean hasVoted(Long room_id, Long userid) { + public boolean hasVoted(Long roomId, Long userid) { try { - log.debug(" :: hasVoted :: " + room_id + ", " + userid); + log.debug(" :: hasVoted :: " + roomId + ", " + userid); TypedQuery<RoomPollAnswer> q = em.createNamedQuery("hasVoted", RoomPollAnswer.class); - q.setParameter("room_id", room_id); + q.setParameter("roomId", roomId); q.setParameter("userid", userid); q.getSingleResult(); return true; 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=1683280&r1=1683279&r2=1683280&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 Jun 3 10:59:16 2015 @@ -138,8 +138,8 @@ public class RoomDao implements IDataPro return em.createNamedQuery("appointedRoomsInRangeByUser", Room.class) .setParameter("userId", userId) - .setParameter("starttime", startCal.getTime()) - .setParameter("endtime", endCal.getTime()) + .setParameter("start", startCal.getTime()) + .setParameter("end", endCal.getTime()) .getResultList(); } @@ -161,10 +161,10 @@ public class RoomDao implements IDataPro public Room update(Room entity, Long userId) { if (entity.getId() == null) { - entity.setStarttime(new Date()); + entity.setInserted(new Date()); em.persist(entity); } else { - entity.setUpdatetime(new Date()); + entity.setUpdated(new Date()); } if (entity.isSipEnabled() && isSipEnabled()) { String sipNumber = getSipNumber(entity.getId()); Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java Wed Jun 3 10:59:16 2015 @@ -56,10 +56,10 @@ public class RoomModeratorsDao { public RoomModerator update(RoomModerator rm, Long userId) { if (rm.getId() == 0) { - rm.setStarttime(new Date()); + rm.setInserted(new Date()); em.persist(rm); } else { - rm.setUpdatetime(new Date()); + rm.setUpdated(new Date()); rm = em.merge(rm); } return rm; 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=1683280&r1=1683279&r2=1683280&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 Jun 3 10:59:16 2015 @@ -38,10 +38,10 @@ public class RoomOrganisationDao { public RoomOrganisation update(RoomOrganisation entity, Long userId) { if (entity.getId() == null) { - entity.setStarttime(new Date()); + entity.setInserted(new Date()); em.persist(entity); } else { - entity.setUpdatetime(new Date()); + entity.setUpdated(new Date()); entity = em.merge(entity); } return entity; Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomTypeDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomTypeDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomTypeDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomTypeDao.java Wed Jun 3 10:59:16 2015 @@ -43,10 +43,8 @@ public class RoomTypeDao { * * @return List of RoomTypes */ - public List<RoomType> getAll(long langId) { - TypedQuery<RoomType> query = em.createNamedQuery("getAllRoomTypes", RoomType.class); - List<RoomType> ll = query.getResultList(); - return ll; + public List<RoomType> get() { + return em.createNamedQuery("getAllRoomTypes", RoomType.class).getResultList(); } public RoomType get(long id) { @@ -65,16 +63,15 @@ public class RoomTypeDao { * @param name * @return ID of new created roomtype or null */ - public Long addRoomType(String name, long fieldvalues_id, boolean deleted) { + public Long addRoomType(String name, long labelId, boolean deleted) { try { RoomType rtype = new RoomType(); rtype.setName(name); - rtype.setStarttime(new Date()); + rtype.setInserted(new Date()); rtype.setDeleted(deleted); - rtype.setFieldvalues_id(fieldvalues_id); + rtype.setLabelId(labelId); rtype = em.merge(rtype); - long returnId = rtype.getId(); - return returnId; + return rtype.getId(); } catch (Exception ex2) { log.error("[addRoomType] ", ex2); } Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java Wed Jun 3 10:59:16 2015 @@ -155,12 +155,12 @@ public interface ISessionManager { * needed cause it is invoked internally AFTER the current user has been * already removed from the ClientList to see if the Room is empty again and * the PollList can be removed - * @param room_id + * @param roomId * @return */ - public abstract List<Client> getClientListByRoom(Long room_id); + public abstract List<Client> getClientListByRoom(Long roomId); - public abstract Collection<Client> getClientListByRoomAll(Long room_id); + public abstract Collection<Client> getClientListByRoomAll(Long roomId); /** * get the current Moderator in this room @@ -168,7 +168,7 @@ public interface ISessionManager { * @param roomname * @return */ - public abstract List<Client> getCurrentModeratorByRoom(Long room_id); + public abstract List<Client> getCurrentModeratorByRoom(Long roomId); /** * Get list of current client sessions Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java Wed Jun 3 10:59:16 2015 @@ -40,9 +40,9 @@ public class SOAPLoginDao { @PersistenceContext private EntityManager em; - public String addSOAPLogin(String sessionHash, Long room_id, + public String addSOAPLogin(String sessionHash, Long roomId, boolean becomemoderator, boolean showAudioVideoTest, - boolean allowSameURLMultipleTimes, Long recording_id, + boolean allowSameURLMultipleTimes, Long recordingId, boolean showNickNameDialog, String landingZone, boolean allowRecording) { try { @@ -53,10 +53,10 @@ public class SOAPLoginDao { SOAPLogin soapLogin = new SOAPLogin(); soapLogin.setCreated(new Date()); soapLogin.setUsed(false); - soapLogin.setRoom_id(room_id); + soapLogin.setRoomId(roomId); soapLogin.setAllowSameURLMultipleTimes(allowSameURLMultipleTimes); soapLogin.setHash(hash); - soapLogin.setRoomRecordingId(recording_id); + soapLogin.setRecordingId(recordingId); soapLogin.setSessionHash(sessionHash); soapLogin.setBecomemoderator(becomemoderator); soapLogin.setShowAudioVideoTest(showAudioVideoTest);
