You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/04/07 18:20:03 UTC
svn commit: r1585514 [2/4] - in /openmeetings/trunk/singlewebapp: ./
openmeetings-axis/
openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/
openmeetings-core/
openmeetings-core/src/main/java/org/apache/openmeetings/batik/ openmeeting...
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.whiteboard;
+package org.apache.openmeetings.core.data.whiteboard;
import java.io.BufferedReader;
import java.io.File;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.whiteboard;
+package org.apache.openmeetings.core.data.whiteboard;
import java.util.HashMap;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.whiteboard;
+package org.apache.openmeetings.core.data.whiteboard;
import java.util.HashMap;
import java.util.Map;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.whiteboard;
+package org.apache.openmeetings.core.data.whiteboard;
import java.util.HashMap;
import java.util.Iterator;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java Mon Apr 7 16:19:59 2014
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import java.io.File;
import java.io.FilenameFilter;
import java.util.ArrayList;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.converter.GenerateSWF;
-import org.apache.openmeetings.converter.GenerateThumbs;
+import org.apache.openmeetings.core.converter.GenerateSWF;
+import org.apache.openmeetings.core.converter.GenerateThumbs;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import java.io.BufferedReader;
import java.io.File;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import java.io.File;
import java.io.FileWriter;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import java.io.BufferedReader;
import java.io.File;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import java.io.File;
import java.io.FileInputStream;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.documents;
+package org.apache.openmeetings.core.documents;
import java.util.Iterator;
import java.util.LinkedList;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapAuthBase.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapAuthBase.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapAuthBase.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapAuthBase.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.ldap;
+package org.apache.openmeetings.core.ldap;
import java.util.HashMap;
import java.util.Hashtable;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.ldap;
+package org.apache.openmeetings.core.ldap;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -30,21 +30,21 @@ import java.util.Random;
import java.util.UUID;
import java.util.Vector;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.ldap.config.ConfigReader;
+import org.apache.openmeetings.core.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
import org.apache.openmeetings.db.dao.user.ILdapLoginManagement;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dao.user.StateDao;
-import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.LdapConfig;
import org.apache.openmeetings.db.entity.user.State;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.db.util.TimezoneUtil;
-import org.apache.openmeetings.ldap.config.ConfigReader;
-import org.apache.openmeetings.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.util.OmFileHelper;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IClient;
@@ -65,13 +65,13 @@ public class LdapLoginManagement impleme
@Autowired
private ConfigurationDao configurationDao;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
@Autowired
private StateDao statemanagement;
@Autowired
private LdapConfigDao ldapConfigDao;
@Autowired
- private UserDao usersDao;
+ private AdminUserDao usersDao;
@Autowired
private TimezoneUtil timezoneUtil;
@@ -416,7 +416,7 @@ public class LdapLoginManagement impleme
User u = null;
try {
- u = userManager.getUserByLogin(user);
+ u = usersDao.getUserByLogin(user);
} catch (Exception e) {
log.error("Error retrieving Userdata : " + e.getMessage());
}
@@ -509,7 +509,7 @@ public class LdapLoginManagement impleme
}
// Return UserObject
- User u2 = userManager.getUserById(userid);
+ User u2 = usersDao.get(userid);
if (u2 == null) {
return new Long(-1);
@@ -518,7 +518,7 @@ public class LdapLoginManagement impleme
u2.setType(Type.ldap);
// initialize lazy collection
- userManager.refreshUserObject(u2);
+ usersDao.update(u2, u2.getUser_id());
log.debug("getUserbyId : " + userid + " : " + u2.getLogin());
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/config/ConfigReader.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/config/ConfigReader.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/config/ConfigReader.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/config/ConfigReader.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.ldap.config;
+package org.apache.openmeetings.core.ldap.config;
import java.io.BufferedReader;
import java.io.File;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.mail;
+package org.apache.openmeetings.core.mail;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.mail;
+package org.apache.openmeetings.core.mail;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.util.OpenmeetingsVariables;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/MeetingReminderJob.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/MeetingReminderJob.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/MeetingReminderJob.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/MeetingReminderJob.java Mon Apr 7 16:19:59 2014
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.quartz.scheduler;
+package org.apache.openmeetings.core.quartz.scheduler;
-import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
+import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/SessionClearJob.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/SessionClearJob.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/SessionClearJob.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/SessionClearJob.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.quartz.scheduler;
+package org.apache.openmeetings.core.quartz.scheduler;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.util.OpenmeetingsVariables;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/TestSetupCleanupJob.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/TestSetupCleanupJob.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/TestSetupCleanupJob.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/TestSetupCleanupJob.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.quartz.scheduler;
+package org.apache.openmeetings.core.quartz.scheduler;
import java.io.File;
import java.io.FileFilter;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import java.util.ArrayList;
import java.util.Calendar;
@@ -26,14 +26,14 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
-import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.whiteboard.EmoticonsManager;
+import org.apache.openmeetings.core.data.conference.RoomManager;
+import org.apache.openmeetings.core.data.whiteboard.EmoticonsManager;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.core.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.db.dao.server.ISessionManager;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.stringhandlers.ChatString;
import org.red5.logging.Red5LoggerFactory;
@@ -63,7 +63,7 @@ public class ChatService implements IPen
@Autowired
private RoomManager roomManager;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
//number of items in the chat room history
private static final int chatRoomHistory = 50;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import java.io.File;
import java.util.ArrayList;
@@ -25,18 +25,18 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.whiteboard.WhiteboardManager;
+import org.apache.openmeetings.core.data.whiteboard.WhiteboardManager;
+import org.apache.openmeetings.core.documents.LibraryChartLoader;
+import org.apache.openmeetings.core.documents.LibraryDocumentConverter;
+import org.apache.openmeetings.core.documents.LibraryWmlLoader;
+import org.apache.openmeetings.core.documents.LoadLibraryPresentation;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dto.file.LibraryPresentation;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
import org.apache.openmeetings.db.entity.room.Client;
-import org.apache.openmeetings.documents.LibraryChartLoader;
-import org.apache.openmeetings.documents.LibraryDocumentConverter;
-import org.apache.openmeetings.documents.LibraryWmlLoader;
-import org.apache.openmeetings.documents.LoadLibraryPresentation;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
@@ -65,7 +65,7 @@ public class ConferenceLibrary implement
@Autowired
private SessiondataDao sessiondataDao;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
@Autowired
private FileExplorerItemDao fileExplorerItemDao;
@Autowired
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
@@ -28,9 +28,8 @@ import java.util.List;
import java.util.Map;
import java.util.TimeZone;
-import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
-import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
+import org.apache.openmeetings.core.data.conference.RoomManager;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.room.RoomModeratorsDao;
@@ -38,6 +37,8 @@ import org.apache.openmeetings.db.dao.ro
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
+import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.dto.basic.SearchResult;
import org.apache.openmeetings.db.dto.server.ServerDTO;
import org.apache.openmeetings.db.entity.calendar.Appointment;
@@ -73,7 +74,9 @@ public class ConferenceService {
@Autowired
private SessiondataDao sessiondataDao;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
+ @Autowired
+ private UserDao userDao;
@Autowired
private RoomManager roomManager;
@Autowired
@@ -308,7 +311,7 @@ public class ConferenceService {
returnMap.put("appointment", appointment);
- User us = userManager.getUserById(currentClient.getUser_id());
+ User us = userDao.get(currentClient.getUser_id());
TimeZone timezone = timezoneUtil.getTimeZone(us);
returnMap.put("appointment", appointment);
@@ -417,7 +420,7 @@ public class ConferenceService {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
if (AuthLevelUtil.checkUserLevel(user_level)) {
- User user = userManager.getUserById(users_id);
+ User user = userDao.get(users_id);
return roomTypeDao.getAll(user == null
? cfgDao.getConfValue(CONFIG_DEFAUT_LANG_KEY, Long.class, "1") : user.getLanguage_id());
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/DocumentService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/DocumentService.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/DocumentService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/DocumentService.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import java.util.List;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -24,11 +24,11 @@ import java.util.Date;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.openmeetings.data.flvrecord.converter.FlvInterviewConverterTask;
-import org.apache.openmeetings.data.flvrecord.converter.FlvInterviewReConverterTask;
-import org.apache.openmeetings.data.flvrecord.converter.FlvRecorderConverterTask;
-import org.apache.openmeetings.data.flvrecord.listener.StreamListener;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.data.flvrecord.converter.FlvInterviewConverterTask;
+import org.apache.openmeetings.core.data.flvrecord.converter.FlvInterviewReConverterTask;
+import org.apache.openmeetings.core.data.flvrecord.converter.FlvRecorderConverterTask;
+import org.apache.openmeetings.core.data.flvrecord.listener.StreamListener;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingLogDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao;
@@ -36,12 +36,12 @@ import org.apache.openmeetings.db.dao.re
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData.Status;
import org.apache.openmeetings.db.entity.room.Client;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
@@ -88,7 +88,7 @@ public class FLVRecorderService implemen
@Autowired
private SessiondataDao sessiondataDao;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
@Autowired
private ScopeApplicationAdapter scopeApplicationAdapter;
@Autowired
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -24,14 +24,15 @@ import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
-import org.apache.openmeetings.data.conference.InvitationManager;
-import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.apache.openmeetings.db.dao.calendar.IInvitationManager.MessageType;
+import org.apache.openmeetings.db.dao.room.IInvitationManager;
+import org.apache.openmeetings.db.dao.room.InvitationDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Invitation;
+import org.apache.openmeetings.db.entity.room.Invitation.MessageType;
import org.apache.openmeetings.db.entity.room.Invitation.Valid;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.TimezoneUtil;
@@ -51,9 +52,11 @@ public class InvitationService implement
@Autowired
private UserDao userDao;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
@Autowired
- private InvitationManager invitationManager;
+ private IInvitationManager invitationManager;
+ @Autowired
+ private InvitationDao invitationDao;
@Autowired
private TimezoneUtil timezoneUtil;
@Autowired
@@ -191,8 +194,7 @@ public class InvitationService implement
}
public Object getInvitationByHash(String hashCode) {
- return invitationManager.getInvitationByHashCode(
- hashCode, true);
+ return invitationDao.getInvitationByHashCode(hashCode, true);
}
public Object checkInvitationPass(String hashCode, String pass) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java Mon Apr 7 16:19:59 2014
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
import java.util.List;
import java.util.Map;
-import org.apache.openmeetings.data.basic.FieldManager;
+import org.apache.openmeetings.core.data.basic.FieldManager;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.label.FieldLanguageDao;
import org.apache.openmeetings.db.entity.label.FieldLanguage;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
@@ -29,9 +29,11 @@ import java.util.List;
import java.util.Map;
import java.util.TimeZone;
-import org.apache.openmeetings.data.conference.InvitationManager;
-import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.data.conference.RoomManager;
+import org.apache.openmeetings.core.ldap.LdapLoginManagement;
+import org.apache.openmeetings.core.mail.MailHandler;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.core.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
@@ -39,6 +41,7 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.server.SOAPLoginDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dao.user.StateDao;
import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.db.entity.room.Client;
@@ -47,10 +50,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.Userdata;
-import org.apache.openmeetings.ldap.LdapLoginManagement;
-import org.apache.openmeetings.mail.MailHandler;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.wicket.util.string.Strings;
@@ -80,7 +79,7 @@ public class MainService implements IPen
@Autowired
private ConfigurationDao configurationDao;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
@Autowired
private StateDao statemanagement;
@Autowired
@@ -94,8 +93,6 @@ public class MainService implements IPen
@Autowired
private SOAPLoginDao soapLoginDao;
@Autowired
- private InvitationManager invitationManager;
- @Autowired
private LdapLoginManagement ldapLoginManagement;
@Autowired
private MailHandler mailHandler;
@@ -339,8 +336,7 @@ public class MainService implements IPen
// If so we need to check that we create this user in
// OpenMeetings and update its record
- User user = userManager.getUserByExternalIdAndType(
- userObject.getExternalUserId(),
+ User user = usersDao.getExternalUser(userObject.getExternalUserId(),
userObject.getExternalUserType());
if (user == null) {
@@ -364,7 +360,7 @@ public class MainService implements IPen
} else {
user.setPictureuri(userObject.getPictureUrl());
- userManager.updateUser(user);
+ usersDao.update(user, users_id);
currentClient.setUser_id(user.getUser_id());
SessionVariablesUtil.setUserId(current.getClient(), user.getUser_id());
@@ -408,7 +404,7 @@ public class MainService implements IPen
Long defaultRpcUserid = configurationDao.getConfValue(
"default.rpc.userid", Long.class, "-1");
- User defaultRpcUser = userManager.getUserById(defaultRpcUserid);
+ User defaultRpcUser = usersDao.get(defaultRpcUserid);
User user = new User();
user.setOrganisation_users(defaultRpcUser.getOrganisation_users());
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PollService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PollService.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PollService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PollService.java Mon Apr 7 16:19:59 2014
@@ -16,19 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import java.util.Date;
import java.util.List;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.db.dao.room.PollDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
+import org.apache.openmeetings.db.dao.user.IUserManager;
+import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.room.PollType;
import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.apache.openmeetings.db.entity.room.RoomPollAnswers;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
@@ -52,7 +53,9 @@ public class PollService implements IPen
@Autowired
private ISessionManager sessionManager;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
+ @Autowired
+ private UserDao userDao;
@Autowired
private ScopeApplicationAdapter scopeApplicationAdapter;
@Autowired
@@ -147,7 +150,7 @@ public class PollService implements IPen
// continue;
} else {
if (rcl.getRoom_id() != null && rcl.getRoom_id().equals(rc.getRoom_id())
- && userManager.getUserById(rcl.getUser_id())!=null) {
+ && userDao.get(rcl.getUser_id())!=null) {
((IServiceCapableConnection) conn).invoke(
clientFunction, obj,
scopeApplicationAdapter);
@@ -183,7 +186,7 @@ public class PollService implements IPen
return -1;
}
- if(userManager.getUserById(rc.getUser_id())==null){
+ if(userDao.get(rc.getUser_id())==null){
log.debug("vote: Invited users can not vote");
return -1;
}
@@ -207,7 +210,7 @@ public class PollService implements IPen
// Is boolean Question
rpA.setAnswer(new Boolean(pollvalue == 1));
}
- rpA.setVotedUser(userManager.getUserById(rc.getUser_id()));
+ rpA.setVotedUser(userDao.get(rc.getUser_id()));
rpA.setVoteDate(new Date());
rpA.setRoomPoll(roomP);
roomP.getRoomPollAnswerList().add(rpA);
@@ -245,7 +248,7 @@ public class PollService implements IPen
.getClientByStreamId(streamid, null);
long roomId = rc.getRoom_id();
- if(userManager.getUserById(rc.getUser_id())==null){
+ if(userDao.get(rc.getUser_id())==null){
log.debug("checkHasVoted: Invited users can not vote");
return -1;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java Mon Apr 7 16:19:59 2014
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
-import org.apache.openmeetings.batik.beans.PrintBean;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.batik.beans.PrintBean;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.crypt.MD5;
@@ -41,7 +41,7 @@ public class PrintService {
@Autowired
private SessiondataDao sessiondataDao;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
/*
* Export List
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=1585514&r1=1584946&r2=1585514&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 Mon Apr 7 16:19:59 2014
@@ -16,20 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
-import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
-import java.util.TimeZone;
-import org.apache.openmeetings.cluster.SlaveHTTPConnectionManager;
-import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.conference.InvitationManager;
-import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.user.OrganisationManager;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.cluster.SlaveHTTPConnectionManager;
+import org.apache.openmeetings.core.data.basic.FieldManager;
+import org.apache.openmeetings.core.data.conference.RoomManager;
+import org.apache.openmeetings.core.data.user.OrganisationManager;
+import org.apache.openmeetings.core.mail.MailHandler;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
@@ -41,28 +39,21 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dao.user.IUserService;
import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao;
import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
import org.apache.openmeetings.db.dao.user.SalutationDao;
import org.apache.openmeetings.db.dao.user.UserContactsDao;
-import org.apache.openmeetings.db.dto.basic.SearchResult;
-import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.apache.openmeetings.db.entity.calendar.MeetingMember;
import org.apache.openmeetings.db.entity.room.Client;
-import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.db.entity.user.Organisation;
import org.apache.openmeetings.db.entity.user.Salutation;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.openmeetings.db.util.TimezoneUtil;
-import org.apache.openmeetings.mail.MailHandler;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.util.AuthLevelUtil;
-import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.OpenmeetingsVariables;
-import org.apache.openmeetings.web.util.ContactsHelper;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.scope.IScope;
import org.slf4j.Logger;
@@ -92,7 +83,7 @@ public class UserService implements IUse
@Autowired
private ConfigurationDao configurationDao;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
@Autowired
private AdminUserDao userDao;
@Autowired
@@ -112,16 +103,12 @@ public class UserService implements IUse
@Autowired
private PrivateMessageFolderDao privateMessageFolderDao;
@Autowired
- private AdminUserDao usersDao;
- @Autowired
private UserContactsDao userContactsDao;
@Autowired
private MailHandler mailHandler;
@Autowired
private TimezoneUtil timezoneUtil;
@Autowired
- private InvitationManager invitationManager;
- @Autowired
private ServerDao serverDao;
@Autowired
private SlaveHTTPConnectionManager slaveHTTPConnectionManager;
@@ -140,7 +127,10 @@ public class UserService implements IUse
public User getUserById(String SID, long user_id) {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
- return userManager.checkAdmingetUserById(user_level, user_id);
+ if (AuthLevelUtil.checkUserLevel(user_level)) {
+ return userDao.get(user_id);
+ }
+ return null;
}
/**
@@ -186,12 +176,6 @@ public class UserService implements IUse
start, max, orderby, asc);
}
- public List<User> getUserListByModForm(String SID) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- return userManager.getUserByMod(user_level, users_id);
- }
-
/**
* get a list of all organisations of an user
*
@@ -239,12 +223,13 @@ public class UserService implements IUse
* @param orderby
* @return whole user-list
*/
- public SearchResult<User> getUserList(String SID, int start, int max,
- String orderby, boolean asc) {
+ public List<User> getUserList(String SID, int start, int max, String orderby, boolean asc) {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
- return userManager
- .getUsersList(user_level, start, max, orderby, asc);
+ if (AuthLevelUtil.checkAdminLevel(user_level)) {
+ return userDao.get("", start, max, orderby + (asc ? " ASC" : " DESC"));
+ }
+ return null;
}
/**
@@ -316,13 +301,13 @@ public class UserService implements IUse
// users only
if (AuthLevelUtil.checkUserLevel(user_level)) {
- User us = userManager.getUserById(users_id);
+ User us = userDao.get(users_id);
us.setTimeZoneId(timezoneUtil.getTimezoneByInternalJName(jname).getID());
us.setForceTimeZoneCheck(false);
us.setUpdatetime(new Date());
- userManager.updateUser(us);
+ userDao.update(us, users_id);
return us;
@@ -333,22 +318,6 @@ public class UserService implements IUse
return null;
}
- @Deprecated
- public Long requestUserToContactList(String SID, Long userToAdd_id,
- String domain, String port, String webapp) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- // users only
- if (AuthLevelUtil.checkUserLevel(user_level)) {
- return ContactsHelper.addUserToContactList(userToAdd_id);
- }
- } catch (Exception err) {
- log.error("[requestuserToContactList]", err);
- }
- return null;
- }
-
public List<UserContact> getPendingUserContacts(String SID) {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -410,113 +379,6 @@ public class UserService implements IUse
return null;
}
- private Date createCalendarDate(TimeZone timezone, String dateOnly,
- String time) {
- Integer hour = Integer.valueOf(time.substring(0, 2)).intValue();
- Integer minute = Integer.valueOf(time.substring(3, 5)).intValue();
-
- log.info("createCalendar Hour: " + hour);
- log.info("createCalendar Minute: " + minute);
-
- Calendar cal = TimezoneUtil.getCalendarInTimezone(dateOnly, timezone);
- cal.set(Calendar.HOUR_OF_DAY, hour);
- cal.set(Calendar.MINUTE, minute);
- cal.set(Calendar.SECOND, 0);
- cal.set(Calendar.MILLISECOND, 0);
-
- return cal.getTime();
- }
-
- public Long composeMail(String SID, List<String> recipients,
- String subject, String message, Boolean bookedRoom,
- String validFromDate, String validFromTime, String validToDate,
- String validToTime, Long parentMessageId, Long roomtype_id,
- String domain, String port, String webapp) {
- try {
-
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- // users only
- if (AuthLevelUtil.checkUserLevel(user_level)) {
- User from = userManager.getUserById(users_id);
- TimeZone timezone = timezoneUtil.getTimeZone(from);
-
- Date start = createCalendarDate(timezone, validFromDate, validFromTime);
- Date end = createCalendarDate(timezone, validToDate, validToTime);
-
- log.info("validFromDate: " + CalendarPatterns.getDateWithTimeByMiliSeconds(start));
- log.info("validToDate: " + CalendarPatterns.getDateWithTimeByMiliSeconds(end));
-
- String baseURL = "http://" + domain + ":" + port + webapp;
- if (port.equals("80")) {
- baseURL = "http://" + domain + webapp;
- } else if (port.equals("443")) {
- baseURL = "https://" + domain + webapp;
- }
-
- Appointment a = new Appointment();
- a.setTitle(subject);
- a.setDescription(message);
- a.setStart(start);
- a.setEnd(end);
- a.setCategory(appointmentCategoryDao.get(1L));
- a.setOwner(from);
- if (bookedRoom) {
- a.setRoom(new Room());
- a.getRoom().setAppointment(true);
- a.getRoom().setName(subject);
- a.getRoom().setRoomtype(roomTypeDao.get(roomtype_id));
- a.getRoom().setNumberOfPartizipants(100L);
- a.getRoom().setAllowUserQuestions(true);
- a.getRoom().setAllowFontStyles(true);
- }
- for (String email : recipients) {
- MeetingMember mm = new MeetingMember();
- mm.setAppointment(a);
- mm.setUser(userDao.getContact(email, users_id));
- a.getMeetingMembers().add(mm);
- }
- a = appointmentDao.update(a, baseURL, users_id);
- for (MeetingMember mm : a.getMeetingMembers()) {
- User to = mm.getUser();
- Room room = a.getRoom();
-
- //TODO should be reviewed
- if (!to.getUser_id().equals(from.getUser_id())) {
- // One message to the Send
- privateMessagesDao.addPrivateMessage(subject,
- message, parentMessageId, from, to, from,
- bookedRoom, room, false, 0L);
-
- // One message to the Inbox
- privateMessagesDao.addPrivateMessage(subject,
- message, parentMessageId, from, to, to,
- bookedRoom, room, false, 0L);
- }
-
- // We do not send an email to the one that has created the
- // private message
- if (to != null && to.getUser_id().equals(from.getUser_id())) {
- continue;
- }
-
- if (to.getAdresses() != null) {
- String aLinkHTML = "<br/><br/>" + "<a href='" + ContactsHelper.getLink() + "'>"
- + fieldLanguagesValuesDao.get(1302, from.getLanguage_id()) + "</a><br/>";
-
- mailHandler.send(to.getAdresses().getEmail(),
- fieldLanguagesValuesDao.get(1301, from.getLanguage_id()) + subject,
- message.replaceAll("\\<.*?>", "") + aLinkHTML);
- }
- }
- }
-
- } catch (Exception err) {
- log.error("[composeMail]", err);
- }
- return null;
- }
-
public Boolean checkUserIsInContactList(String SID, Long user_id) {
try {
Long users_id = sessiondataDao.checkSession(SID);
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=1585514&r1=1584946&r2=1585514&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 Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote;
+package org.apache.openmeetings.core.remote;
import java.io.File;
import java.io.FilenameFilter;
@@ -29,17 +29,17 @@ import java.util.LinkedList;
import java.util.Map;
import org.apache.commons.collections.ComparatorUtils;
-import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.whiteboard.WhiteBoardObjectListManagerById;
-import org.apache.openmeetings.data.whiteboard.WhiteBoardObjectSyncManager;
+import org.apache.openmeetings.core.data.whiteboard.WhiteBoardObjectListManagerById;
+import org.apache.openmeetings.core.data.whiteboard.WhiteBoardObjectSyncManager;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dto.room.Cliparts;
import org.apache.openmeetings.db.dto.room.WhiteboardObject;
import org.apache.openmeetings.db.dto.room.WhiteboardObjectList;
import org.apache.openmeetings.db.dto.room.WhiteboardSyncLockObject;
import org.apache.openmeetings.db.entity.room.Client;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.OmFileHelper;
import org.red5.logging.Red5LoggerFactory;
@@ -61,7 +61,7 @@ public class WhiteBoardService implement
private static final Logger log = Red5LoggerFactory.getLogger(
WhiteBoardService.class, "openmeetings");
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
@Autowired
private final ScopeApplicationAdapter scopeApplicationAdapter = null;
@Autowired
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=1585514&r1=1584946&r2=1585514&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 Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote.red5;
+package org.apache.openmeetings.core.remote.red5;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -32,11 +32,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
-import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.whiteboard.EmoticonsManager;
-import org.apache.openmeetings.data.whiteboard.WhiteboardManager;
+import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
+import org.apache.openmeetings.core.data.conference.RoomManager;
+import org.apache.openmeetings.core.data.whiteboard.EmoticonsManager;
+import org.apache.openmeetings.core.data.whiteboard.WhiteboardManager;
+import org.apache.openmeetings.core.remote.FLVRecorderService;
+import org.apache.openmeetings.core.remote.WhiteBoardService;
+import org.apache.openmeetings.core.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
@@ -45,6 +47,7 @@ import org.apache.openmeetings.db.dao.ro
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.dto.room.BrowserStatus;
import org.apache.openmeetings.db.dto.room.RoomStatus;
@@ -54,9 +57,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.remote.FLVRecorderService;
-import org.apache.openmeetings.remote.WhiteBoardService;
-import org.apache.openmeetings.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.InitializationContainer;
import org.apache.openmeetings.util.OmFileHelper;
@@ -99,7 +99,7 @@ public class ScopeApplicationAdapter ext
@Autowired
private SessiondataDao sessiondataDao;
@Autowired
- private UserManager userManager;
+ private IUserManager userManager;
@Autowired
private RoomManager roomManager;
@Autowired
@@ -1649,7 +1649,7 @@ public class ScopeApplicationAdapter ext
log.debug("UDPATE SESSION " + SID + ", " + userId);
sessiondataDao.updateUserWithoutSession(SID, userId);
- User user = userManager.getUserById(userId);
+ User user = usersDao.get(userId);
if (user != null) {
currentClient.setExternalUserId(user.getExternalUserId());
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/util/SessionVariablesUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/util/SessionVariablesUtil.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/util/SessionVariablesUtil.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/util/SessionVariablesUtil.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.remote.util;
+package org.apache.openmeetings.core.remote.util;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.rss;
+package org.apache.openmeetings.core.rss;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet;
+package org.apache.openmeetings.core.servlet;
import java.io.IOException;
import java.io.OutputStream;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BeanUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BeanUtil.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BeanUtil.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BeanUtil.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet;
+package org.apache.openmeetings.core.servlet;
import javax.servlet.ServletContext;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet;
+package org.apache.openmeetings.core.servlet;
public class ServerNotInitializedException extends Exception {
private static final long serialVersionUID = -7771909924751249321L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java Mon Apr 7 16:19:59 2014
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.core.servlet.outputhandler;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
@@ -38,7 +38,7 @@ public abstract class AbstractUploadCont
@Autowired
protected SessiondataDao sessiondataDao;
@Autowired
- protected UserManager userManager;
+ protected IUserManager userManager;
@Autowired
protected ConfigurationDao configurationDao;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.core.servlet.outputhandler;
import static org.apache.openmeetings.util.OmFileHelper.bigImagePrefix;
import static org.apache.openmeetings.util.OmFileHelper.chatImagePrefix;
@@ -32,12 +32,12 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.servlet.BaseHttpServlet;
+import org.apache.openmeetings.core.servlet.ServerNotInitializedException;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
-import org.apache.openmeetings.servlet.BaseHttpServlet;
-import org.apache.openmeetings.servlet.ServerNotInitializedException;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
@@ -98,7 +98,7 @@ public class DownloadHandler extends Bas
log.debug("sid: " + sid);
Long users_id = getBean(SessiondataDao.class).checkSession(sid);
- Long user_level = getBean(UserManager.class).getUserLevelByID(users_id);
+ Long user_level = getBean(IUserManager.class).getUserLevelByID(users_id);
if (user_level != null && user_level > 0) {
String room_id = httpServletRequest.getParameter("room_id");
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.core.servlet.outputhandler;
import java.io.File;
import java.io.FileOutputStream;
@@ -36,13 +36,13 @@ import org.apache.batik.svggen.SVGGraphi
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.batik.transcoder.image.JPEGTranscoder;
-import org.apache.openmeetings.batik.beans.PrintBean;
-import org.apache.openmeetings.data.record.WhiteboardMapToSVG;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.core.batik.beans.PrintBean;
+import org.apache.openmeetings.core.data.record.WhiteboardMapToSVG;
+import org.apache.openmeetings.core.remote.PrintService;
+import org.apache.openmeetings.core.servlet.BaseHttpServlet;
+import org.apache.openmeetings.core.servlet.ServerNotInitializedException;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
-import org.apache.openmeetings.remote.PrintService;
-import org.apache.openmeetings.servlet.BaseHttpServlet;
-import org.apache.openmeetings.servlet.ServerNotInitializedException;
+import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
@@ -94,7 +94,7 @@ public class ExportToImage extends BaseH
}
Long users_id = getBean(SessiondataDao.class).checkSession(sid);
- Long user_level = getBean(UserManager.class).getUserLevelByID(users_id);
+ Long user_level = getBean(IUserManager.class).getUserLevelByID(users_id);
log.debug("users_id: " + users_id);
log.debug("user_level: " + user_level);
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.core.servlet.outputhandler;
import java.io.IOException;
import java.util.Arrays;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.core.servlet.outputhandler;
import java.io.File;
import java.io.FileFilter;
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang3.StringUtils;
-import org.apache.openmeetings.data.basic.FieldManager;
+import org.apache.openmeetings.core.data.basic.FieldManager;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.core.servlet.outputhandler;
import static org.apache.openmeetings.util.OmFileHelper.bigImagePrefix;
import static org.apache.openmeetings.util.OmFileHelper.chatImagePrefix;
@@ -33,15 +33,15 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.converter.GenerateImage;
-import org.apache.openmeetings.converter.GenerateThumbs;
-import org.apache.openmeetings.data.file.FileProcessor;
+import org.apache.openmeetings.core.converter.GenerateImage;
+import org.apache.openmeetings.core.converter.GenerateThumbs;
+import org.apache.openmeetings.core.data.file.FileProcessor;
+import org.apache.openmeetings.core.documents.GeneratePDF;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.documents.GeneratePDF;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.StoredFile;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/ServerUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/ServerUtil.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/ServerUtil.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/ServerUtil.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.session;
+package org.apache.openmeetings.core.session;
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.entity.server.Server;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.session;
+package org.apache.openmeetings.core.session;
import java.math.BigInteger;
import java.util.ArrayList;
@@ -28,12 +28,12 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Random;
+import org.apache.openmeetings.core.session.store.IClientPersistenceStore;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dto.basic.SearchResult;
import org.apache.openmeetings.db.dto.server.ClientSessionInfo;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.Server;
-import org.apache.openmeetings.session.store.IClientPersistenceStore;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.session.store;
+package org.apache.openmeetings.core.session.store;
import java.util.ArrayList;
import java.util.Collection;
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=1585514&r1=1584946&r2=1585514&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 Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.session.store;
+package org.apache.openmeetings.core.session.store;
import java.util.ArrayList;
import java.util.Collection;