You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2013/02/13 06:53:07 UTC

svn commit: r1445477 [1/4] - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings: axis/services/ data/basic/ data/basic/dao/ data/calendar/management/ data/conference/ data/flvrecord/converter/ data/record/ data/user/ data/user/dao/ documen...

Author: sebawagner
Date: Wed Feb 13 05:53:05 2013
New Revision: 1445477

URL: http://svn.apache.org/r1445477
Log:
Fix session and authUtil and some more variable names that are named wrong (cause of class-name-renaming), re-factor PollManager to use NamedQueries

Modified:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/NaviBuilder.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/FeedbackManager.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManager.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/BaseConverter.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/record/BatikMethods.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/OrganisationManager.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GeneratePDF.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateSWF.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/PollType.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPoll.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPollAnswers.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/quartz/scheduler/SessionClearJob.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConfigurationService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ErrorService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LdapConfigService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MeetingMemberService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/OrganisationService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PrintService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/rss/LoadAtomRssFeed.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/AbstractUploadController.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/CalendarServlet.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Export.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ExportToImage.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/templates/InvitationTemplate.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/templates/RegisterUserTemplate.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/templates/ResetPasswordTemplate.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/config/TestConfig.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/TestLabels.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/ImportHelper.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailThread.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/sms/SMSHandler.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/LanguageImport.java

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java Wed Feb 13 05:53:05 2013
@@ -70,7 +70,7 @@ public class CalendarWebService {
 	@Autowired
 	private AppointmentLogic appointmentLogic;
 	@Autowired
-	private SessiondataDao sessionManagement;
+	private SessiondataDao sessiondataDao;
 	@Autowired
 	private UserManager userManager;
 	@Autowired
@@ -78,7 +78,7 @@ public class CalendarWebService {
 	@Autowired
 	private RoomDao roomDao;
 	@Autowired
-	private AuthLevelUtil authLevelManagement;
+	private AuthLevelUtil authLevelUtil;
 	@Autowired
 	private AppointmentCategoryDao appointmentCategoryDaoImpl;
 	@Autowired
@@ -105,9 +105,9 @@ public class CalendarWebService {
 		log.debug("getAppointmentByRange : startdate - " + starttime
 				+ ", enddate - " + endtime);
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				return appointmentLogic.getAppointmentByRange(users_id,
 						starttime, endtime);
@@ -137,9 +137,9 @@ public class CalendarWebService {
 		log.debug("getAppointmentByRange : startdate - " + starttime
 				+ ", enddate - " + endtime);
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				return appointmentLogic.getAppointmentByRange(userId,
 						starttime, endtime);
@@ -161,9 +161,9 @@ public class CalendarWebService {
 
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				return appointmentLogic.getNextAppointment();
 			}
@@ -186,9 +186,9 @@ public class CalendarWebService {
 
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				return appointmentLogic.getNextAppointment();
 			}
@@ -214,9 +214,9 @@ public class CalendarWebService {
 
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				return appointmentLogic
 						.searchAppointmentByName(appointmentName);
@@ -292,12 +292,12 @@ public class CalendarWebService {
 		log.debug("saveAppointMent SID:" + SID + ", baseUrl : " + baseUrl);
 
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			log.debug("saveAppointMent users_id:" + users_id);
 
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				List<Map<String, String>> newList = new ArrayList<Map<String, String>>();
 
@@ -354,9 +354,9 @@ public class CalendarWebService {
 			Long languageId) {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				log.debug("appointmentId " + appointmentId);
 
@@ -440,10 +440,10 @@ public class CalendarWebService {
 			Boolean isPasswordProtected, String password) throws AxisFault {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 				// check if the appointment belongs to the current user
 				Appointment appointment = appointmentLogic
 						.getAppointMentById(appointmentId);
@@ -451,7 +451,7 @@ public class CalendarWebService {
 					throw new AxisFault(
 							"The Appointment cannot be updated by the given user");
 				}
-			} else if (authLevelManagement.checkUserLevel(user_level)) {
+			} else if (authLevelUtil.checkUserLevel(user_level)) {
 				// fine
 			} else {
 				throw new AxisFault(
@@ -527,15 +527,15 @@ public class CalendarWebService {
 			Long language_id) throws AxisFault {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				return appointmentLogic.deleteAppointment(appointmentId,
 						users_id, language_id);
 
-			} else if (authLevelManagement.checkUserLevel(user_level)) {
+			} else if (authLevelUtil.checkUserLevel(user_level)) {
 
 				Appointment appointment = appointmentLogic
 						.getAppointMentById(appointmentId);
@@ -568,9 +568,9 @@ public class CalendarWebService {
 	public Appointment getAppointmentByRoomId(String SID, Long room_id) {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				Appointment appointment = new Appointment();
 
@@ -603,10 +603,10 @@ public class CalendarWebService {
 
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				List<AppointmentCategory> res = appointmentCategoryDaoImpl
 						.getAppointmentCategoryList();
@@ -642,9 +642,9 @@ public class CalendarWebService {
 		log.debug("getAppointmentReminderTypList");
 
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				List<AppointmentReminderTyps> res = appointmentReminderTypDaoImpl
 						.getAppointmentReminderTypList();
@@ -698,9 +698,9 @@ public class CalendarWebService {
 			Long omTimeZoneId, String javaTimeZoneName) throws AxisFault {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 				
 				if (!requestUserId.equals(users_id)) {
 					UserContact userContacts = userContactsDaoImpl

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebService.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebService.java Wed Feb 13 05:53:05 2013
@@ -59,13 +59,13 @@ public class FileWebService {
 	private static final Logger log = Red5LoggerFactory.getLogger(
 			FileWebService.class, OpenmeetingsVariables.webAppRootKey);
 	@Autowired
-	private SessiondataDao sessionManagement;
+	private SessiondataDao sessiondataDao;
 	@Autowired
 	private UserManager userManager;
 	@Autowired
 	private FileExplorerItemDao fileExplorerItemDao;
 	@Autowired
-	private AuthLevelUtil authLevelManagement;
+	private AuthLevelUtil authLevelUtil;
 	@Autowired
 	private FileProcessor fileProcessor;
 	@Autowired
@@ -115,10 +115,10 @@ public class FileWebService {
 			String fileSystemName) throws AxisFault {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long User_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(User_level)) {
+			if (authLevelUtil.checkWebServiceLevel(User_level)) {
 
 				URL url = new URL(path);
 				URLConnection uc = url.openConnection();
@@ -201,10 +201,10 @@ public class FileWebService {
 			String fileSystemName) throws AxisFault {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long User_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(User_level)) {
+			if (authLevelUtil.checkWebServiceLevel(User_level)) {
 
 				URL url = new URL(path);
 				URLConnection uc = url.openConnection();
@@ -273,10 +273,10 @@ public class FileWebService {
 			Long externalFilesid, String externalType) throws AxisFault {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long User_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(User_level)) {
+			if (authLevelUtil.checkWebServiceLevel(User_level)) {
 
 				User userExternal = userManager.getUserByExternalIdAndType(
 						externalUserId, externalType);
@@ -340,10 +340,10 @@ public class FileWebService {
 			throws AxisFault {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long User_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(User_level)) {
+			if (authLevelUtil.checkWebServiceLevel(User_level)) {
 
 				log.debug("addFolder " + parentFileExplorerItemId);
 
@@ -398,9 +398,9 @@ public class FileWebService {
 	public Long addFolderSelf(String SID, Long parentFileExplorerItemId,
 			String fileName, Long room_id, Boolean isOwner) throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				log.debug("addFolder " + parentFileExplorerItemId);
 
@@ -454,10 +454,10 @@ public class FileWebService {
 
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long User_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(User_level)) {
+			if (authLevelUtil.checkWebServiceLevel(User_level)) {
 
 				fileExplorerItemDao.deleteFileExplorerItemByExternalIdAndType(
 						externalFilesid, externalType);
@@ -485,10 +485,10 @@ public class FileWebService {
 
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long User_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(User_level)) {
+			if (authLevelUtil.checkWebServiceLevel(User_level)) {
 
 				fileExplorerItemDao.deleteFileExplorerItem(fileExplorerItemId);
 
@@ -515,10 +515,10 @@ public class FileWebService {
 
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long User_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkUserLevel(User_level)) {
+			if (authLevelUtil.checkUserLevel(User_level)) {
 
 				// TODO: Check if user has access or not to the file
 
@@ -563,10 +563,10 @@ public class FileWebService {
 
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				File working_dir = new File(OmFileHelper.getUploadProfilesDir(), parentFolder);
 				log.debug("############# working_dir : " + working_dir);
@@ -609,11 +609,11 @@ public class FileWebService {
 
 		try {
 
-			Long webservice_users_id = sessionManagement.checkSession(SID);
+			Long webservice_users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager
 					.getUserLevelByID(webservice_users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				log.debug("room_id " + room_id);
 
@@ -680,10 +680,10 @@ public class FileWebService {
 
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				log.debug("room_id " + room_id);
 
@@ -757,11 +757,11 @@ public class FileWebService {
 
 		try {
 
-			Long webservice_users_id = sessionManagement.checkSession(SID);
+			Long webservice_users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager
 					.getUserLevelByID(webservice_users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				log.debug("parentFileExplorerItemId "
 						+ parentFileExplorerItemId);
@@ -807,10 +807,10 @@ public class FileWebService {
 
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				log.debug("parentFileExplorerItemId "
 						+ parentFileExplorerItemId);
@@ -852,11 +852,11 @@ public class FileWebService {
 
 		try {
 
-			Long webservice_users_id = sessionManagement.checkSession(SID);
+			Long webservice_users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager
 					.getUserLevelByID(webservice_users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				log.debug("deleteFileOrFolder " + fileExplorerItemId);
 
@@ -888,10 +888,10 @@ public class FileWebService {
 
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				// TODO: check if this user is allowed to change this file
 				/*
@@ -944,11 +944,11 @@ public class FileWebService {
 
 		try {
 
-			Long webservice_users_id = sessionManagement.checkSession(SID);
+			Long webservice_users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager
 					.getUserLevelByID(webservice_users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				log.debug("deleteFileOrFolder " + fileExplorerItemId);
 
@@ -1003,10 +1003,10 @@ public class FileWebService {
 
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 				
 				// A test is required that checks if the user is allowed to move the file
 

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java Wed Feb 13 05:53:05 2013
@@ -49,11 +49,11 @@ public class JabberWebService {
 			JabberWebService.class, OpenmeetingsVariables.webAppRootKey);
 
 	@Autowired
-	private AuthLevelUtil authLevelManagement;
+	private AuthLevelUtil authLevelUtil;
 	@Autowired
 	private UserManager userManager;
 	@Autowired
-	private SessiondataDao sessionManagement;
+	private SessiondataDao sessiondataDao;
 	@Autowired
 	private ConferenceService conferenceService;
 	@Autowired
@@ -61,7 +61,7 @@ public class JabberWebService {
 	@Autowired
 	private OmTimeZoneDao omTimeZoneDaoImpl;
 	@Autowired
-	private ConfigurationDao cfgManagement;
+	private ConfigurationDao configurationDao;
 
 	/**
 	 * Get List&lt;Rooms&gt; of all rooms available to the user.
@@ -81,7 +81,7 @@ public class JabberWebService {
 			result.addAll(pbl);
 		}
 
-		Long users_id = this.sessionManagement.checkSession(SID);
+		Long users_id = this.sessiondataDao.checkSession(SID);
 		User u = this.userManager.getUserById(users_id);
 		for (Organisation_Users ou : u.getOrganisation_users()) {
 			List<RoomOrganisation> rol = this.conferenceService
@@ -108,10 +108,10 @@ public class JabberWebService {
 	 * @return number of users as int
 	 */
 	public int getUserCount(String SID, Long roomId) {
-		Long users_id = this.sessionManagement.checkSession(SID);
+		Long users_id = this.sessiondataDao.checkSession(SID);
 		Long user_level = this.userManager.getUserLevelByID(users_id);
 
-		if (this.authLevelManagement.checkUserLevel(user_level)) {
+		if (this.authLevelUtil.checkUserLevel(user_level)) {
 			return conferenceService.getRoomClientsListByRoomId(roomId).size();
 		}
 		return -1;
@@ -127,14 +127,14 @@ public class JabberWebService {
 	 * @return hash to enter the room
 	 */
 	public String getInvitationHash(String SID, String username, Long room_id) {
-		Long users_id = this.sessionManagement.checkSession(SID);
+		Long users_id = this.sessiondataDao.checkSession(SID);
 		Long user_level = this.userManager.getUserLevelByID(users_id);
 		Invitations invitation = this.invitationManager.addInvitationLink(
 				user_level, username, username, username, username, username,
 				room_id, "", Boolean.valueOf(false), null, Integer.valueOf(3),
 				null, null, users_id, "", Long.valueOf(1L),
 				Boolean.valueOf(false), null, null, null, username
-				, omTimeZoneDaoImpl.getOmTimeZone(cfgManagement.getConfValue("default.timezone", String.class, "Europe/Berlin")));
+				, omTimeZoneDaoImpl.getOmTimeZone(configurationDao.getConfValue("default.timezone", String.class, "Europe/Berlin")));
 
 		return ((invitation == null) ? null : invitation.getHash());
 	}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java Wed Feb 13 05:53:05 2013
@@ -43,8 +43,8 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
 import org.apache.openmeetings.persistence.beans.invitation.Invitations;
 import org.apache.openmeetings.persistence.beans.room.Client;
-import org.apache.openmeetings.persistence.beans.room.RoomType;
 import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.persistence.beans.room.RoomType;
 import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.remote.ConferenceService;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
@@ -69,7 +69,7 @@ public class RoomWebService {
 	@Autowired
 	private AppointmentDao appointmentDao;
 	@Autowired
-	private SessiondataDao sessionManagement;
+	private SessiondataDao sessiondataDao;
 	@Autowired
 	private UserManager userManager;
 	@Autowired
@@ -81,7 +81,7 @@ public class RoomWebService {
 	@Autowired
 	private ScopeApplicationAdapter scopeApplicationAdapter;
 	@Autowired
-	private AuthLevelUtil authLevelManagement;
+	private AuthLevelUtil authLevelUtil;
 	@Autowired
 	private ConferenceService conferenceService;
 	@Autowired
@@ -108,10 +108,10 @@ public class RoomWebService {
 			throws AxisFault {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long User_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(User_level)) {
+			if (authLevelUtil.checkWebServiceLevel(User_level)) {
 
 				List<Room> roomList = roomManager.getPublicRooms(
 						User_level, roomtypes_id);
@@ -155,10 +155,10 @@ public class RoomWebService {
 			throws AxisFault {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return flvRecordingDao.deleteFlvRecording(flvRecordingId);
 			}
 
@@ -185,10 +185,10 @@ public class RoomWebService {
 			String externalUserId) throws AxisFault {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				List<FlvRecording> recordingList = flvRecordingDao
 						.getFlvRecordingByExternalUserId(externalUserId);
 
@@ -237,10 +237,10 @@ public class RoomWebService {
 			throws AxisFault {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				List<FlvRecording> recordingList = flvRecordingDao
 						.getFlvRecordingByExternalRoomTypeAndCreator(
 								externalRoomType, insertedBy);
@@ -287,10 +287,10 @@ public class RoomWebService {
 			String SID, String externalRoomType) throws AxisFault {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return flvRecordingDao
 						.getFlvRecordingByExternalRoomType(externalRoomType);
 
@@ -317,10 +317,10 @@ public class RoomWebService {
 			String externalRoomType) throws AxisFault {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				List<FlvRecording> recordingList = flvRecordingDao
 						.getFlvRecordingByExternalRoomType(externalRoomType);
 
@@ -365,10 +365,10 @@ public class RoomWebService {
 			throws AxisFault {
 		try {
 
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				List<FlvRecording> recordingList = flvRecordingDao
 						.getFlvRecordingByRoomId(roomId);
@@ -452,10 +452,10 @@ public class RoomWebService {
 			Integer roomId6, Integer roomId7, Integer roomId8, Integer roomId9,
 			Integer roomId10) throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				LinkedList<Integer> roomIds = new LinkedList<Integer>();
 
@@ -556,10 +556,10 @@ public class RoomWebService {
 	public RoomReturn getRoomWithClientObjectsById(String SID, long rooms_id)
 			throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				Room room = roomManager.getRoomById(user_level, rooms_id);
 
@@ -691,9 +691,9 @@ public class RoomWebService {
 			Integer filesPanelYPosition, Integer filesPanelHeight,
 			Integer filesPanelWidth) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return roomManager.addRoom(3L, name, roomtypes_id, comment,
 						numberOfPartizipants, ispublic, null, false, false,
 						null, false, null, true, false, false, true, "", "",
@@ -754,9 +754,9 @@ public class RoomWebService {
 			Boolean ispublic, Boolean appointment, Boolean isDemoRoom,
 			Integer demoTime, Boolean isModeratedRoom) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return roomManager.addRoom(3L, name, roomtypes_id, comment,
 						numberOfPartizipants, ispublic, null, appointment,
 						isDemoRoom, demoTime, isModeratedRoom, null, true,
@@ -823,9 +823,9 @@ public class RoomWebService {
 			Integer demoTime, Boolean isModeratedRoom,
 			Boolean allowUserQuestions) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return roomManager.addRoom(3L, name, roomtypes_id, comment,
 						numberOfPartizipants, ispublic, null, appointment,
 						isDemoRoom, demoTime, isModeratedRoom, null,
@@ -895,9 +895,9 @@ public class RoomWebService {
 			Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom,
 			Boolean allowUserQuestions, Boolean isAudioOnly) throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return roomManager.addRoom(3L, name, roomtypes_id, comment,
 						numberOfPartizipants, ispublic, null, appointment,
 						isDemoRoom, demoTime, isModeratedRoom, null,
@@ -987,9 +987,9 @@ public class RoomWebService {
 			Boolean hideActionsMenu, Boolean hideScreenSharing,
 			Boolean hideWhiteboard) throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return roomManager.addRoom(3L, name, roomtypes_id, comment,
 						numberOfPartizipants, ispublic, null, appointment,
 						isDemoRoom, demoTime, isModeratedRoom, null,
@@ -1059,9 +1059,9 @@ public class RoomWebService {
 			Integer demoTime, Boolean isModeratedRoom, Long externalRoomId,
 			String externalRoomType) throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				Room room = conferenceService.getRoomByExternalId(SID,
 						externalRoomId, externalRoomType, roomtypes_id);
 				Long roomId = null;
@@ -1126,9 +1126,9 @@ public class RoomWebService {
 			Integer filesPanelYPosition, Integer filesPanelHeight,
 			Integer filesPanelWidth, Boolean appointment) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return roomManager.updateRoomInternal(rooms_id,
 						roomtypes_id, name, ispublic, comment,
 						numberOfPartizipants, null, appointment, false, null,
@@ -1192,9 +1192,9 @@ public class RoomWebService {
 			Boolean ispublic, Boolean appointment, Boolean isDemoRoom,
 			Integer demoTime, Boolean isModeratedRoom) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return roomManager.updateRoomInternal(room_id, roomtypes_id,
 						name, ispublic, comment, numberOfPartizipants, null,
 						appointment, isDemoRoom, demoTime, isModeratedRoom,
@@ -1261,9 +1261,9 @@ public class RoomWebService {
 			Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom,
 			Boolean allowUserQuestions) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return roomManager.updateRoomInternal(room_id, roomtypes_id,
 						name, ispublic, comment, numberOfPartizipants, null,
 						appointment, isDemoRoom, demoTime, isModeratedRoom,
@@ -1353,9 +1353,9 @@ public class RoomWebService {
 			Boolean hideActionsMenu, Boolean hideScreenSharing,
 			Boolean hideWhiteboard) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return roomManager.updateRoomInternal(room_id, roomtypes_id,
 						name, ispublic, comment, numberOfPartizipants, null,
 						appointment, isDemoRoom, demoTime, isModeratedRoom,
@@ -1458,9 +1458,9 @@ public class RoomWebService {
 			Boolean ispublic, Boolean appointment, Boolean isDemoRoom,
 			Integer demoTime, Boolean isModeratedRoom, String externalRoomType) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return roomManager.addExternalRoom(name, roomtypes_id,
 						comment, numberOfPartizipants, ispublic, null,
 						appointment, isDemoRoom, demoTime, isModeratedRoom,
@@ -1519,9 +1519,9 @@ public class RoomWebService {
 			String externalRoomType, Boolean allowUserQuestions,
 			Boolean isAudioOnly) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return roomManager.addExternalRoom(name, roomtypes_id,
 						comment, numberOfPartizipants, ispublic, null,
 						appointment, isDemoRoom, demoTime, isModeratedRoom,
@@ -1585,9 +1585,9 @@ public class RoomWebService {
 			Boolean allowUserQuestions, Boolean isAudioOnly,
 			Boolean waitForRecording, Boolean allowRecording) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return roomManager.addExternalRoom(name, roomtypes_id,
 						comment, numberOfPartizipants, ispublic, null,
 						appointment, isDemoRoom, demoTime, isModeratedRoom,
@@ -1658,9 +1658,9 @@ public class RoomWebService {
 			Boolean isAudioOnly, Boolean waitForRecording,
 			Boolean allowRecording, Boolean hideTopBar) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return roomManager.addExternalRoom(name, roomtypes_id,
 						comment, numberOfPartizipants, ispublic, null,
 						appointment, isDemoRoom, demoTime, isModeratedRoom,
@@ -1716,10 +1716,10 @@ public class RoomWebService {
 			String validFromDate, String validFromTime, String validToDate,
 			String validToTime) throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				Date dFrom = null;
 				Date dTo = null;
@@ -1854,10 +1854,10 @@ public class RoomWebService {
 			String validFromTime, String validToDate, String validToTime,
 			Long language_id, Boolean sendMail) throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				Date dFrom = null;
 				Date dTo = null;
@@ -1986,10 +1986,10 @@ public class RoomWebService {
 			String invitationpass, Integer valid, Date fromDate, Date toDate,
 			Long language_id, Boolean sendMail) throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				Calendar calFrom = Calendar.getInstance();
 				calFrom.setTime(fromDate);
@@ -2224,10 +2224,10 @@ public class RoomWebService {
 			Boolean isPasswordProtected, String password, Long reminderTypeId,
 			String redirectURL) throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				Date dFrom = null;
 				Date dTo = null;
@@ -2339,10 +2339,10 @@ public class RoomWebService {
 			String firstname, String lastname, String email, String baseUrl,
 			Long language_id) throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				Appointment appointment = appointmentDao
 						.getAppointmentByRoom(room_id);
@@ -2402,10 +2402,10 @@ public class RoomWebService {
 			Long language_id, String jNameTimeZone, String invitorName)
 			throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				Appointment appointment = appointmentDao
 						.getAppointmentByRoom(room_id);
@@ -2453,12 +2453,12 @@ public class RoomWebService {
 	public int closeRoom(String SID, Long room_id, Boolean status)
 			throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
 			log.debug("closeRoom 1 " + room_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				log.debug("closeRoom 2 " + status);
 
@@ -2496,9 +2496,9 @@ public class RoomWebService {
 	public int modifyRoomParameter(String SID, Long room_id, String paramName, String paramValue)
 			throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				log.debug("closeRoom 1 " + room_id);
 				Room r = roomDao.get(room_id);
 				PropertyUtils.setSimpleProperty(r, paramName, paramValue);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebService.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebService.java Wed Feb 13 05:53:05 2013
@@ -42,11 +42,11 @@ public class ServerWebService {
 			ServerWebService.class, OpenmeetingsVariables.webAppRootKey);
 
 	@Autowired
-	private SessiondataDao sessionManagement;
+	private SessiondataDao sessiondataDao;
 	@Autowired
 	private UserManager userManager;
 	@Autowired
-	private AuthLevelUtil authLevelManagement;
+	private AuthLevelUtil authLevelUtil;
 	@Autowired
 	private ServerDao serversDao;
 
@@ -63,10 +63,10 @@ public class ServerWebService {
 	 */
 	public Server[] getServers(String SID, int start, int max) throws AxisFault {
 		log.debug("getServers enter");
-		Long users_id = sessionManagement.checkSession(SID);
+		Long users_id = sessiondataDao.checkSession(SID);
 		Long user_level = userManager.getUserLevelByID(users_id);
 
-		if (authLevelManagement.checkWebServiceLevel(user_level)) {
+		if (authLevelUtil.checkWebServiceLevel(user_level)) {
 			return serversDao.get(start, max).toArray(new Server[0]);
 		} else {
 			log.warn("Insuffisient permissions");
@@ -84,10 +84,10 @@ public class ServerWebService {
 	 */
 	public int getServerCount(String SID) throws AxisFault {
 		log.debug("getServerCount enter");
-		Long users_id = sessionManagement.checkSession(SID);
+		Long users_id = sessiondataDao.checkSession(SID);
 		Long user_level = userManager.getUserLevelByID(users_id);
 
-		if (authLevelManagement.checkWebServiceLevel(user_level)) {
+		if (authLevelUtil.checkWebServiceLevel(user_level)) {
 			return (int) serversDao.count();
 		} else {
 			log.warn("Insuffisient permissions");
@@ -126,10 +126,10 @@ public class ServerWebService {
 			int port, String user, String pass, String webapp, String protocol,
 			Boolean active, String comment) throws AxisFault {
 		log.debug("saveServerCount enter");
-		Long users_id = sessionManagement.checkSession(SID);
+		Long users_id = sessiondataDao.checkSession(SID);
 		Long user_level = userManager.getUserLevelByID(users_id);
 
-		if (authLevelManagement.checkWebServiceLevel(user_level)) {
+		if (authLevelUtil.checkWebServiceLevel(user_level)) {
 			Server s = serversDao.get(id);
 			if (s == null) {
 				s = new Server();
@@ -161,10 +161,10 @@ public class ServerWebService {
 	 */
 	public boolean deleteServer(String SID, long id) throws AxisFault {
 		log.debug("saveServerCount enter");
-		Long users_id = sessionManagement.checkSession(SID);
+		Long users_id = sessiondataDao.checkSession(SID);
 		Long user_level = userManager.getUserLevelByID(users_id);
 
-		if (authLevelManagement.checkWebServiceLevel(user_level)) {
+		if (authLevelUtil.checkWebServiceLevel(user_level)) {
 			Server s = serversDao.get(id);
 			if (s != null) {
 				serversDao.delete(s, users_id);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java Wed Feb 13 05:53:05 2013
@@ -61,13 +61,13 @@ public class UserWebService {
 			UserWebService.class, OpenmeetingsVariables.webAppRootKey);
 
 	@Autowired
-	private SessiondataDao sessionManagement;
+	private SessiondataDao sessiondataDao;
 	@Autowired
-	private ConfigurationDao configurationDaoImpl;
+	private ConfigurationDao configurationDao;
 	@Autowired
 	private UserManager userManagement;
 	@Autowired
-	private FieldManager fieldmanagment;
+	private FieldManager fieldManager;
 	@Autowired
 	private ErrorDao errorManagement;
 	@Autowired
@@ -79,7 +79,7 @@ public class UserWebService {
 	@Autowired
 	private MainService mainService;
 	@Autowired
-	private AuthLevelUtil authLevelManagement;
+	private AuthLevelUtil authLevelUtil;
 
 	/**
 	 * load this session id before doing anything else Returns an Object of Type
@@ -147,10 +147,10 @@ public class UserWebService {
 				ErrorValue eValues = errorManagement
 						.getErrorValuesById(errorid * (-1));
 				if (eValues != null) {
-					Fieldlanguagesvalues errorValue = fieldmanagment
+					Fieldlanguagesvalues errorValue = fieldManager
 							.getFieldByIdAndLanguage(
 									eValues.getFieldvalues_id(), language_id);
-					Fieldlanguagesvalues typeValue = fieldmanagment
+					Fieldlanguagesvalues typeValue = fieldManager
 							.getFieldByIdAndLanguage(errorManagement
 									.getErrorType(eValues.getErrortype_id())
 									.getFieldvalues_id(), language_id);
@@ -213,12 +213,12 @@ public class UserWebService {
 			long states_id, String town, long language_id, String baseURL)
 			throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
-				String jName_timeZone = configurationDaoImpl.getConfValue("default.timezone", String.class, "");
+				String jName_timeZone = configurationDao.getConfValue("default.timezone", String.class, "");
 
 				Long user_id = userManagement.registerUser(username, userpass,
 						lastname, firstname, email, new Date(), street,
@@ -295,10 +295,10 @@ public class UserWebService {
 			long states_id, String town, long language_id, String baseURL,
 			String jNameTimeZone) throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				Long user_id = userManagement.registerUser(username, userpass,
 						lastname, firstname, email, new Date(), street,
@@ -387,10 +387,10 @@ public class UserWebService {
 			String jNameTimeZone, String externalUserId, String externalUserType)
 			throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkAdminLevel(user_level)) {
+			if (authLevelUtil.checkAdminLevel(user_level)) {
 
 				User testUser = userManagement.getUserByExternalIdAndType(
 						externalUserId, externalUserType);
@@ -446,10 +446,10 @@ public class UserWebService {
 	 */
 	public Long deleteUserById(String SID, Long userId) throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkAdminLevel(user_level)) {
+			if (authLevelUtil.checkAdminLevel(user_level)) {
 
 				// Setting user deleted
 				usersDao.deleteUserID(userId);
@@ -483,10 +483,10 @@ public class UserWebService {
 	public Long deleteUserByExternalUserIdAndType(String SID,
 			String externalUserId, String externalUserType) throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
 
-			if (authLevelManagement.checkAdminLevel(user_level)) {
+			if (authLevelUtil.checkAdminLevel(user_level)) {
 
 				User userExternal = userManagement.getUserByExternalIdAndType(
 						externalUserId, externalUserType);
@@ -537,9 +537,9 @@ public class UserWebService {
 		log.debug("UserService.setUserObject");
 
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
 						username, firstname, lastname, profilePictureUrl, email);
@@ -557,7 +557,7 @@ public class UserWebService {
 
 				log.debug("xmlString " + xmlString);
 
-				sessionManagement.updateUserRemoteSession(SID, xmlString);
+				sessiondataDao.updateUserRemoteSession(SID, xmlString);
 
 				return new Long(1);
 			} else {
@@ -604,9 +604,9 @@ public class UserWebService {
 		log.debug("UserService.setUserObject");
 
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
 						username, firstname, lastname, profilePictureUrl,
@@ -627,7 +627,7 @@ public class UserWebService {
 
 				log.debug("xmlString " + xmlString);
 
-				sessionManagement.updateUserRemoteSession(SID, xmlString);
+				sessiondataDao.updateUserRemoteSession(SID, xmlString);
 
 				return new Long(1);
 			} else {
@@ -677,9 +677,9 @@ public class UserWebService {
 			Long room_id, int becomeModeratorAsInt, int showAudioVideoTestAsInt)
 			throws AxisFault {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
 						username, firstname, lastname, profilePictureUrl,
@@ -700,7 +700,7 @@ public class UserWebService {
 
 				log.debug("xmlString " + xmlString);
 
-				sessionManagement.updateUserRemoteSession(SID, xmlString);
+				sessiondataDao.updateUserRemoteSession(SID, xmlString);
 
 				boolean becomeModerator = false;
 				if (becomeModeratorAsInt != 0) {
@@ -778,9 +778,9 @@ public class UserWebService {
 		log.debug("UserService.setUserObject");
 
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
 						username, firstname, lastname, profilePictureUrl,
@@ -801,7 +801,7 @@ public class UserWebService {
 
 				log.debug("xmlString " + xmlString);
 
-				sessionManagement.updateUserRemoteSession(SID, xmlString);
+				sessiondataDao.updateUserRemoteSession(SID, xmlString);
 
 				boolean becomeModerator = false;
 				if (becomeModeratorAsInt != 0) {
@@ -880,9 +880,9 @@ public class UserWebService {
 			String externalUserType, Long room_id, int becomeModeratorAsInt,
 			int showAudioVideoTestAsInt, int allowRecording) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
 						username, firstname, lastname, profilePictureUrl,
@@ -904,7 +904,7 @@ public class UserWebService {
 
 				log.debug("xmlString " + xmlString);
 
-				sessionManagement.updateUserRemoteSession(SID, xmlString);
+				sessiondataDao.updateUserRemoteSession(SID, xmlString);
 
 				boolean becomeModerator = false;
 				if (becomeModeratorAsInt != 0) {
@@ -977,9 +977,9 @@ public class UserWebService {
 		log.debug("UserService.setUserObjectMainLandingZone");
 
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
 						username, firstname, lastname, profilePictureUrl,
@@ -1000,7 +1000,7 @@ public class UserWebService {
 
 				log.debug("xmlString " + xmlString);
 
-				sessionManagement.updateUserRemoteSession(SID, xmlString);
+				sessiondataDao.updateUserRemoteSession(SID, xmlString);
 
 				String hash = soapLoginDao.addSOAPLogin(SID, null, false, true,
 						true, // allowSameURLMultipleTimes
@@ -1077,9 +1077,9 @@ public class UserWebService {
 			Long room_id, int becomeModeratorAsInt,
 			int showAudioVideoTestAsInt, int showNickNameDialogAsInt) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
 						username, firstname, lastname, profilePictureUrl,
@@ -1101,7 +1101,7 @@ public class UserWebService {
 
 				log.debug("xmlString " + xmlString);
 
-				sessionManagement.updateUserRemoteSession(SID, xmlString);
+				sessiondataDao.updateUserRemoteSession(SID, xmlString);
 
 				boolean becomeModerator = false;
 				if (becomeModeratorAsInt != 0) {
@@ -1162,9 +1162,9 @@ public class UserWebService {
 			String username, String firstname, String lastname,
 			String externalUserId, String externalUserType, Long recording_id) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
 						username, firstname, "", "", "", externalUserId,
@@ -1185,7 +1185,7 @@ public class UserWebService {
 
 				log.debug("xmlString " + xmlString);
 
-				sessionManagement.updateUserRemoteSession(SID, xmlString);
+				sessiondataDao.updateUserRemoteSession(SID, xmlString);
 
 				String hash = soapLoginDao.addSOAPLogin(SID, null, false,
 						false, true, // allowSameURLMultipleTimes
@@ -1225,9 +1225,9 @@ public class UserWebService {
 	public Long addUserToOrganisation(String SID, Long user_id,
 			Long organisation_id, Long insertedby) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 
 				return organisationManager.addUserToOrganisation(user_id,
 						organisation_id, users_id);
@@ -1262,9 +1262,9 @@ public class UserWebService {
 			long organisation_id, int start, int max, String orderby,
 			boolean asc) {
 		try {
-			Long users_id = sessionManagement.checkSession(SID);
+			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
-			if (authLevelManagement.checkWebServiceLevel(user_level)) {
+			if (authLevelUtil.checkWebServiceLevel(user_level)) {
 				return organisationManager
 						.getUsersSearchResultByOrganisationId(organisation_id,
 								start, max, orderby, asc);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDao.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDao.java Wed Feb 13 05:53:05 2013
@@ -44,7 +44,7 @@ public class FieldLanguagesValuesDao imp
 	@PersistenceContext
 	private EntityManager em;
 	@Autowired
-	private ConfigurationDao configurationDaoImpl;
+	private ConfigurationDao configurationDao;
 
 	/*
 	 * (non-Javadoc)
@@ -52,7 +52,7 @@ public class FieldLanguagesValuesDao imp
 	 * @see org.apache.openmeetings.data.OmDAO#get(int, int)
 	 */
 	public List<Fieldlanguagesvalues> get(int first, int count) {
-		return get(configurationDaoImpl.getConfValue("default_lang_id",
+		return get(configurationDao.getConfValue("default_lang_id",
 				Long.class, "1"), first, count);
 	}
 

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDao.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDao.java Wed Feb 13 05:53:05 2013
@@ -41,12 +41,12 @@ public class FieldValueDao implements ID
 	@PersistenceContext
 	private EntityManager em;
 	@Autowired
-	private ConfigurationDao configurationDaoImpl;
+	private ConfigurationDao configurationDao;
 	@Autowired
 	private FieldLanguagesValuesDao flvDaoImpl;
 
 	private Long getDefaultLanguage() {
-		return configurationDaoImpl.getConfValue("default_lang_id", Long.class, "1");
+		return configurationDao.getConfValue("default_lang_id", Long.class, "1");
 	}
 	
 	public Fieldvalues get(long id) {

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/NaviBuilder.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/NaviBuilder.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/NaviBuilder.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/NaviBuilder.java Wed Feb 13 05:53:05 2013
@@ -44,7 +44,7 @@ public class NaviBuilder {
 	private EntityManager em;
 
 	@Autowired
-	private FieldManager fieldmanagment;
+	private FieldManager fieldManager;
 
 	public Naviglobal getGlobalMenuEntry(long globalId) {
 		try {
@@ -61,14 +61,14 @@ public class NaviBuilder {
 	public List<Naviglobal> getMainMenu(long user_level, long USER_ID, long language_id) {
 		List<Naviglobal> ll = getMainMenu(user_level, USER_ID);
 		for (Naviglobal navigl : ll) {
-			navigl.setLabel(fieldmanagment.getFieldByIdAndLanguageByNavi(
+			navigl.setLabel(fieldManager.getFieldByIdAndLanguageByNavi(
 					navigl.getFieldvalues_id(), language_id));
-			navigl.setTooltip(fieldmanagment.getFieldByIdAndLanguageByNavi(
+			navigl.setTooltip(fieldManager.getFieldByIdAndLanguageByNavi(
 					navigl.getTooltip_fieldvalues_id(), language_id));
 			for (Navimain navim : navigl.getMainnavi()) {
-				navim.setLabel(fieldmanagment.getFieldByIdAndLanguageByNavi(
+				navim.setLabel(fieldManager.getFieldByIdAndLanguageByNavi(
 						navim.getFieldvalues_id(), language_id));
-				navim.setTooltip(fieldmanagment.getFieldByIdAndLanguageByNavi(
+				navim.setTooltip(fieldManager.getFieldByIdAndLanguageByNavi(
 						navim.getTooltip_fieldvalues_id(), language_id));
 			}
 		}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java Wed Feb 13 05:53:05 2013
@@ -43,7 +43,7 @@ public class OmTimeZoneDao {
 	private EntityManager em;
 
 	@Autowired
-	private ConfigurationDao configurationDaoImpl;
+	private ConfigurationDao configurationDao;
 
 	/**
 	 * Get a default {@link OmTimeZone}, if user is set, it will return the
@@ -60,7 +60,7 @@ public class OmTimeZoneDao {
 			return user.getOmTimeZone();
 		}
 		
-		String jNameTimeZone = configurationDaoImpl.getConfValue(
+		String jNameTimeZone = configurationDao.getConfValue(
 				"default.timezone", String.class, "Europe/Berlin");
 		
 		OmTimeZone omTimeZone = this.getOmTimeZone(jNameTimeZone);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java Wed Feb 13 05:53:05 2013
@@ -53,11 +53,11 @@ public class AppointmentLogic {
 	@Autowired
 	private AppointmentDao appointmentDao;
 	@Autowired
-	private ConfigurationDao configurationDaoImpl;
+	private ConfigurationDao configurationDao;
 	@Autowired
 	private UserManager userManager;
 	@Autowired
-	private FieldManager fieldmanagment;
+	private FieldManager fieldManager;
 	@Autowired
 	private OmTimeZoneDao omTimeZoneDaoImpl;
 	@Autowired
@@ -153,7 +153,7 @@ public class AppointmentLogic {
 		
 		// TODO:Add this user as the default Moderator of the Room
 
-		Long numberOfParticipants = configurationDaoImpl.getConfValue(
+		Long numberOfParticipants = configurationDao.getConfValue(
 				"calendar.conference.rooms.default.size", Long.class, "50");
 
 		try {
@@ -401,7 +401,7 @@ public class AppointmentLogic {
 	public void doScheduledMeetingReminder() throws Exception {
 		// log.debug("doScheduledMeetingReminder");
 
-		Integer minutesReminderSend = configurationDaoImpl.getConfValue(
+		Integer minutesReminderSend = configurationDao.getConfValue(
 				"number.minutes.reminder.send", Integer.class, ""
 						+ DEFAULT_MINUTES_REMINDER_SEND);
 		if (minutesReminderSend == null) {
@@ -424,14 +424,14 @@ public class AppointmentLogic {
 			return;
 		}
 
-		Long language_id = configurationDaoImpl.getConfValue("default_lang_id", Long.class, "1");
+		Long language_id = configurationDao.getConfValue("default_lang_id", Long.class, "1");
 
 		// Get the required labels one time for all meeting members. The
 		// Language of the email will be the system default language
-		String labelid1158 = fieldmanagment.getString(1158L, language_id);
-		Fieldlanguagesvalues labelid1153 = fieldmanagment
+		String labelid1158 = fieldManager.getString(1158L, language_id);
+		Fieldlanguagesvalues labelid1153 = fieldManager
 				.getFieldByIdAndLanguage(1153L, language_id);
-		Fieldlanguagesvalues labelid1154 = fieldmanagment
+		Fieldlanguagesvalues labelid1154 = fieldManager
 				.getFieldByIdAndLanguage(1154L, language_id);
 
 		for (int i = 0; i < points.size(); i++) {
@@ -530,7 +530,7 @@ public class AppointmentLogic {
 	}
 
 	private String generateSMSSubject(String labelid1158, Appointment ment) {
-		String subj = configurationDaoImpl.getConfValue("sms.subject", String.class, null);
+		String subj = configurationDao.getConfValue("sms.subject", String.class, null);
 		return subj == null || subj.length() == 0 ? 
 				labelid1158 + " " + ment.getAppointmentName() : subj;
 	}
@@ -557,7 +557,7 @@ public class AppointmentLogic {
 
 		if (ment.getAppointmentDescription().length() != 0) {
 
-			Fieldlanguagesvalues labelid1152 = fieldmanagment
+			Fieldlanguagesvalues labelid1152 = fieldManager
 					.getFieldByIdAndLanguage(new Long(1152), language_id);
 			message += labelid1152.getValue()
 					+ ment.getAppointmentDescription();

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java Wed Feb 13 05:53:05 2013
@@ -45,7 +45,7 @@ public class MeetingMemberLogic {
 	@Autowired
 	private UserManager userManager;
 	@Autowired
-	private FieldManager fieldmanagment;
+	private FieldManager fieldManager;
 	@Autowired
 	private InvitationManager invitationManager;
 	@Autowired
@@ -195,7 +195,7 @@ public class MeetingMemberLogic {
 	private String formatSubject(Long language_id, Appointment point,
 			TimeZone timezone) {
 		try {
-			String message = fieldmanagment.getString(1151L, language_id) + " "
+			String message = fieldManager.getString(1151L, language_id) + " "
 					+ point.getAppointmentName();
 
 			message += " "
@@ -217,27 +217,27 @@ public class MeetingMemberLogic {
 	private String formatMessage(Long language_id, Appointment point,
 			TimeZone timezone, String invitorName) {
 		try {
-			String message = fieldmanagment.getString(1151L, language_id) + " "
+			String message = fieldManager.getString(1151L, language_id) + " "
 					+ point.getAppointmentName();
 
 			if (point.getAppointmentDescription().length() != 0) {
-				message += fieldmanagment.getString(1152L, language_id)
+				message += fieldManager.getString(1152L, language_id)
 						+ point.getAppointmentDescription();
 			}
 
 			message += "<br/>"
-					+ fieldmanagment.getString(1153L, language_id)
+					+ fieldManager.getString(1153L, language_id)
 					+ ' '
 					+ CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
 							point.getAppointmentStarttime(), timezone)
 					+ "<br/>";
 
-			message += fieldmanagment.getString(1154L, language_id)
+			message += fieldManager.getString(1154L, language_id)
 					+ ' '
 					+ CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
 							point.getAppointmentEndtime(), timezone) + "<br/>";
 
-			message += fieldmanagment.getString(1156L, language_id) + invitorName + "<br/>";
+			message += fieldManager.getString(1156L, language_id) + invitorName + "<br/>";
 
 			return message;
 		} catch (Exception err) {

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/FeedbackManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/FeedbackManager.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/FeedbackManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/FeedbackManager.java Wed Feb 13 05:53:05 2013
@@ -32,9 +32,9 @@ public class FeedbackManager {
 			FeedbackManager.class, OpenmeetingsVariables.webAppRootKey);
 
 	@Autowired
-	private ConfigurationDao configurationDaoImpl;
+	private ConfigurationDao configurationDao;
 	@Autowired
-	private FieldManager fieldmanagment;
+	private FieldManager fieldManager;
 	@Autowired
 	private MailHandler mailHandler;
 	@Autowired
@@ -42,14 +42,14 @@ public class FeedbackManager {
 
 	public String sendFeedback(String username, String email, String message) {
 		try {
-			Long default_lang_id = configurationDaoImpl.getConfValue(
+			Long default_lang_id = configurationDao.getConfValue(
 					"default_lang_id", Long.class, "1");
 
 			String template = feedbackTemplate.getFeedBackTemplate(username,
 					email, message, default_lang_id);
 
 			return mailHandler.sendMail("openmeetings-user@googlegroups.com",
-					fieldmanagment.getString(499L, default_lang_id), template);
+					fieldManager.getString(499L, default_lang_id), template);
 
 		} catch (Exception err) {
 			log.error("sendInvitationLink", err);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java Wed Feb 13 05:53:05 2013
@@ -76,11 +76,11 @@ public class InvitationManager {
 	@Autowired
 	private AppointmentLogic appointmentLogic;
 	@Autowired
-	private ConfigurationDao configurationDaoImpl;
+	private ConfigurationDao configurationDao;
 	@Autowired
 	private UserManager userManager;
 	@Autowired
-	private FieldManager fieldmanagment;
+	private FieldManager fieldManager;
 	@Autowired
 	private ManageCryptStyle manageCryptStyle;
 	@Autowired
@@ -96,7 +96,7 @@ public class InvitationManager {
 	@Autowired
 	private InvitationTemplate invitationTemplate;
 	@Autowired
-	private AuthLevelUtil authLevelManagement;
+	private AuthLevelUtil authLevelUtil;
 	@Autowired
 	private TimezoneUtil timezoneUtil;
 	@Autowired
@@ -132,7 +132,7 @@ public class InvitationManager {
 			Long language_id, Boolean sendMail, Date gmtTimeStart,
 			Date gmtTimeEnd, Long appointmentId, String fromUserField, OmTimeZone omTimeZone) {
 		try {
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				Invitations invitation = new Invitations();
 				invitation.setIsPasswordProtected(isPasswordProtected);
@@ -289,7 +289,7 @@ public class InvitationManager {
 	private String formatCancelSubject(Long language_id,
 			Appointment appointment, User user, TimeZone timezone) {
 		try {
-			String message = fieldmanagment.getString(1157L, language_id)
+			String message = fieldManager.getString(1157L, language_id)
 					+ appointment.getAppointmentName();
 
 			message += " "
@@ -309,21 +309,21 @@ public class InvitationManager {
 	private String formatCancelMessage(Long language_id,
 			Appointment appointment, User user, TimeZone timezone) {
 		try {
-			String message = fieldmanagment.getString(1157L, language_id)
+			String message = fieldManager.getString(1157L, language_id)
 					+ appointment.getAppointmentName();
 
 			if (appointment.getAppointmentDescription().length() != 0) {
 
-				Fieldlanguagesvalues labelid1152 = fieldmanagment
+				Fieldlanguagesvalues labelid1152 = fieldManager
 						.getFieldByIdAndLanguage(new Long(1152), language_id);
 				message += labelid1152.getValue()
 						+ appointment.getAppointmentDescription();
 
 			}
 
-			Fieldlanguagesvalues labelid1153 = fieldmanagment
+			Fieldlanguagesvalues labelid1153 = fieldManager
 					.getFieldByIdAndLanguage(new Long(1153), language_id);
-			Fieldlanguagesvalues labelid1154 = fieldmanagment
+			Fieldlanguagesvalues labelid1154 = fieldManager
 					.getFieldByIdAndLanguage(new Long(1154), language_id);
 
 			message += "<br/>"
@@ -342,7 +342,7 @@ public class InvitationManager {
 			String invitorName = user.getFirstname() + " " + user.getLastname()
 					+ " [" + user.getAdresses().getEmail() + "]";
 
-			Fieldlanguagesvalues labelid1156 = fieldmanagment
+			Fieldlanguagesvalues labelid1156 = fieldManager
 					.getFieldByIdAndLanguage(new Long(1156), language_id);
 			message += labelid1156.getValue() + invitorName + "<br/>";
 
@@ -423,12 +423,12 @@ public class InvitationManager {
 			Appointment appointment, User user, TimeZone timezone) {
 		try {
 
-			String message = fieldmanagment.getString(1155L, language_id) + " "
+			String message = fieldManager.getString(1155L, language_id) + " "
 					+ appointment.getAppointmentName();
 
 			if (appointment.getAppointmentDescription().length() != 0) {
 
-				Fieldlanguagesvalues labelid1152 = fieldmanagment
+				Fieldlanguagesvalues labelid1152 = fieldManager
 						.getFieldByIdAndLanguage(new Long(1152), language_id);
 				message += labelid1152.getValue()
 						+ appointment.getAppointmentDescription();
@@ -455,21 +455,21 @@ public class InvitationManager {
 			String invitorName) {
 		try {
 
-			String message = fieldmanagment.getString(1155L, language_id) + " "
+			String message = fieldManager.getString(1155L, language_id) + " "
 					+ appointment.getAppointmentName();
 
 			if (appointment.getAppointmentDescription().length() != 0) {
 
-				Fieldlanguagesvalues labelid1152 = fieldmanagment
+				Fieldlanguagesvalues labelid1152 = fieldManager
 						.getFieldByIdAndLanguage(new Long(1152), language_id);
 				message += labelid1152.getValue()
 						+ appointment.getAppointmentDescription();
 
 			}
 
-			Fieldlanguagesvalues labelid1153 = fieldmanagment
+			Fieldlanguagesvalues labelid1153 = fieldManager
 					.getFieldByIdAndLanguage(1153L, language_id);
-			Fieldlanguagesvalues labelid1154 = fieldmanagment
+			Fieldlanguagesvalues labelid1154 = fieldManager
 					.getFieldByIdAndLanguage(1154L, language_id);
 
 			message += "<br/>"
@@ -485,7 +485,7 @@ public class InvitationManager {
 							appointment.getAppointmentEndtime(), timezone)
 					+ "<br/>";
 
-			Fieldlanguagesvalues labelid1156 = fieldmanagment
+			Fieldlanguagesvalues labelid1156 = fieldManager
 					.getFieldByIdAndLanguage(new Long(1156), language_id);
 			message += labelid1156.getValue() + invitorName + "<br/>";
 
@@ -528,7 +528,7 @@ public class InvitationManager {
 		log.debug("addInvitationIcalLink");
 
 		try {
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				Invitations invitation = new Invitations();
 				invitation.setIsPasswordProtected(isPasswordProtected);
@@ -660,7 +660,7 @@ public class InvitationManager {
 
 			return mailHandler.sendMail(email, subject
 					, message + "<br/><a href='" + invitation_link + "'>"
-					+ fieldmanagment.getFieldByIdAndLanguage(626L, langId) + "</a>");
+					+ fieldManager.getFieldByIdAndLanguage(626L, langId) + "</a>");
 		} catch (Exception e) {
 			log.error("sendInvitationReminderLink", e);
 		}
@@ -938,14 +938,14 @@ public class InvitationManager {
 			String baseurl, String email, String replyTo, String subject, Long room_id,
 			Date starttime, Date endtime) {
 		try {
-			if (authLevelManagement.checkUserLevel(user_level)) {
+			if (authLevelUtil.checkUserLevel(user_level)) {
 
 				String invitation_link = baseurl
 						+ "?lzproxied=solo&lzr=swf8&lzt=swf&domain=" + domain
 						+ "&room=" + room + "&roomtype=" + roomtype + "&email="
 						+ email + "&roomid=" + room_id;
 
-				Long default_lang_id = configurationDaoImpl.getConfValue("default_lang_id", Long.class, "1");
+				Long default_lang_id = configurationDao.getConfValue("default_lang_id", Long.class, "1");
 
 				String template = invitationTemplate
 						.getRegisterInvitationTemplate(username, message,
@@ -1066,7 +1066,7 @@ public class InvitationManager {
 
 				} else if (invitation.getIsValidByTime()) {
 					OmTimeZone tz = invitation.getOmTimeZone() == null 
-							? omTimeZoneDaoImpl.getOmTimeZone(configurationDaoImpl.getConfValue("default.timezone", String.class, "Europe/Berlin"))
+							? omTimeZoneDaoImpl.getOmTimeZone(configurationDao.getConfValue("default.timezone", String.class, "Europe/Berlin"))
 							: invitation.getOmTimeZone();
 					Calendar now = Calendar.getInstance(TimeZone.getTimeZone(tz.getIcal()));
 					Calendar start = Calendar.getInstance(TimeZone.getTimeZone(tz.getIcal()));

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManager.java?rev=1445477&r1=1445476&r2=1445477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManager.java Wed Feb 13 05:53:05 2013
@@ -47,7 +47,7 @@ public class PollManager {
 	@PersistenceContext
 	private EntityManager em;
 	@Autowired
-	private FieldManager fieldmanagment;
+	private FieldManager fieldManager;
 	@Autowired
 	private UserManager userManager;
 	@Autowired
@@ -56,7 +56,7 @@ public class PollManager {
 	public Long addPollType(Long labelId, Boolean isNumeric) {
 		log.debug("Adding poll type: " + labelId + ", " + isNumeric);
 		PollType pt = new PollType();
-		pt.setLabel(fieldmanagment.getFieldvaluesById(labelId));
+		pt.setLabel(fieldManager.getFieldvaluesById(labelId));
 		pt.setIsNumericAnswer(isNumeric);
 
 		em.persist(pt);
@@ -65,12 +65,12 @@ public class PollManager {
 	}
 	
 	public List<PollType> getPollTypes() {
-		TypedQuery<PollType> q = em.createQuery("SELECT pt FROM PollType pt",PollType.class);
-		return q.getResultList();
+		return em.createNamedQuery("getPollTypes", PollType.class)
+				.getResultList();
 	}
 	
 	public PollType getPollType(Long typeId) {
-		TypedQuery<PollType> q = em.createQuery("SELECT pt FROM PollType pt WHERE pt.pollTypesId = :pollTypesId", PollType.class);
+		TypedQuery<PollType> q = em.createNamedQuery("getPollType", PollType.class);
 		q.setParameter("pollTypesId", typeId);
 		return q.getSingleResult();
 	}
@@ -101,7 +101,7 @@ public class PollManager {
 	public boolean closePoll(Long room_id){
 		try {
 			log.debug(" :: closePoll :: ");
-			Query q = em.createQuery("UPDATE RoomPoll rp SET rp.archived = :archived WHERE rp.room.rooms_id = :rooms_id");
+			Query q = em.createNamedQuery("closePoll");
 			q.setParameter("rooms_id", room_id);
 			q.setParameter("archived", true);
 			return q.executeUpdate() > 0;
@@ -114,7 +114,7 @@ public class PollManager {
 	public boolean deletePoll(Long poll_id){
 		try {
 			log.debug(" :: deletePoll :: ");
-			Query q = em.createQuery("DELETE FROM RoomPoll rp WHERE rp.roomPollId = :roomPollId");
+			Query q = em.createNamedQuery("deletePoll");
 			q.setParameter("roomPollId", poll_id);
 			return q.executeUpdate() > 0;
 		} catch (Exception err) {
@@ -126,7 +126,7 @@ public class PollManager {
 	public RoomPoll getPoll(Long room_id) {
 		try {
 			log.debug(" :: getPoll :: " + room_id);
-			TypedQuery<RoomPoll> q = em.createQuery("SELECT rp FROM RoomPoll rp WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived", RoomPoll.class);
+			TypedQuery<RoomPoll> q = em.createNamedQuery("getPoll", RoomPoll.class);
 			q.setParameter("room_id", room_id);
 			q.setParameter("archived", false);
 			return q.getSingleResult();
@@ -140,7 +140,7 @@ public class PollManager {
 	
 	public List<RoomPoll> getPollListBackup() {
 		try {
-			TypedQuery<RoomPoll> q = em.createQuery("SELECT rp FROM RoomPoll rp",RoomPoll.class);
+			TypedQuery<RoomPoll> q = em.createNamedQuery("getPollListBackup",RoomPoll.class);
 			return q.getResultList();
 		} catch (NoResultException nre) {
 			//expected
@@ -153,7 +153,7 @@ public class PollManager {
 	public List<RoomPoll> getArchivedPollList(Long room_id) {
 		try {
 			log.debug(" :: getPoll :: " + room_id);
-			TypedQuery<RoomPoll> q = em.createQuery("SELECT rp FROM RoomPoll rp WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived",RoomPoll.class);
+			TypedQuery<RoomPoll> q = em.createNamedQuery("getArchivedPollList",RoomPoll.class);
 			q.setParameter("room_id", room_id);
 			q.setParameter("archived", true);
 			return q.getResultList();
@@ -168,7 +168,7 @@ public class PollManager {
 	public boolean hasPoll(Long room_id) {
 		try {
 			log.debug(" :: hasPoll :: " + room_id);
-			TypedQuery<Long> q = em.createQuery("SELECT COUNT(rp) FROM RoomPoll rp WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived", Long.class);
+			TypedQuery<Long> q = em.createNamedQuery("hasPoll", Long.class);
 			q.setParameter("room_id", room_id);
 			q.setParameter("archived", false);
 			return q.getSingleResult() > 0;
@@ -183,8 +183,7 @@ public class PollManager {
 	public boolean hasVoted(Long room_id, Long userid) {
 		try {
 			log.debug(" :: hasVoted :: " + room_id + ", " + userid);
-			TypedQuery<RoomPollAnswers> q = em.createQuery("SELECT rpa FROM RoomPollAnswers rpa "
-				+ "WHERE rpa.roomPoll.room.rooms_id = :room_id AND rpa.votedUser.user_id = :userid AND rpa.roomPoll.archived = :archived", RoomPollAnswers.class);
+			TypedQuery<RoomPollAnswers> q = em.createNamedQuery("hasVoted", RoomPollAnswers.class);
 			q.setParameter("room_id", room_id);
 			q.setParameter("userid", userid);
 			q.setParameter("archived", false);