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/10/05 03:44:55 UTC
svn commit: r1529378 [2/3] - in /openmeetings/trunk/singlewebapp/src:
axis/java/org/apache/openmeetings/axis/services/
db/java/org/apache/openmeetings/db/dao/basic/
db/java/org/apache/openmeetings/db/dao/calendar/
db/java/org/apache/openmeetings/db/dao...
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.data.flvrecord.listener.async;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.IOException;
import java.util.Date;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamVideoWriter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamVideoWriter.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamVideoWriter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamVideoWriter.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.data.flvrecord.listener.async;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.IOException;
import java.util.Date;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/record/BatikMethods.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/record/BatikMethods.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/record/BatikMethods.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/record/BatikMethods.java Sat Oct 5 01:44:51 2013
@@ -34,8 +34,8 @@ import javax.swing.JTextArea;
import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.svggen.SVGGraphics2D;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.geom.ArrowStyle;
import org.apache.openmeetings.util.geom.GeomPoint;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/record/WhiteboardMapToSVG.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/record/WhiteboardMapToSVG.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/record/WhiteboardMapToSVG.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/record/WhiteboardMapToSVG.java Sat Oct 5 01:44:51 2013
@@ -28,8 +28,8 @@ import java.util.List;
import javax.imageio.ImageIO;
import org.apache.batik.svggen.SVGGraphics2D;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.geom.GeomPoint;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/EmailManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/EmailManager.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/EmailManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/EmailManager.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.data.user;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.mail.MailHandler;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/OrganisationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/OrganisationManager.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/OrganisationManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/OrganisationManager.java Sat Oct 5 01:44:51 2013
@@ -35,7 +35,6 @@ import javax.persistence.criteria.Criter
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dao.user.OrganisationDao;
import org.apache.openmeetings.db.dao.user.OrganisationUserDao;
import org.apache.openmeetings.db.dao.user.UserDao;
@@ -44,6 +43,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.Organisation_Users;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.AuthLevelUtil;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java Sat Oct 5 01:44:51 2013
@@ -18,9 +18,9 @@
*/
package org.apache.openmeetings.data.user;
-import static org.apache.openmeetings.OpenmeetingsVariables.CONFIG_FRONTEND_REGISTER_KEY;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FRONTEND_REGISTER_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.util.Arrays;
import java.util.Date;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/EmoticonsManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/EmoticonsManager.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/EmoticonsManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/EmoticonsManager.java Sat Oct 5 01:44:51 2013
@@ -23,8 +23,8 @@ import java.io.File;
import java.io.FileReader;
import java.util.LinkedList;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.stringhandlers.ChatString;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectSyncManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectSyncManager.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectSyncManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectSyncManager.java Sat Oct 5 01:44:51 2013
@@ -21,8 +21,8 @@ package org.apache.openmeetings.data.whi
import java.util.HashMap;
import java.util.Map;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dto.room.WhiteboardSyncLockObject;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java Sat Oct 5 01:44:51 2013
@@ -23,8 +23,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dto.room.WhiteboardObject;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GeneratePDF.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GeneratePDF.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GeneratePDF.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GeneratePDF.java Sat Oct 5 01:44:51 2013
@@ -23,11 +23,11 @@ import java.io.FilenameFilter;
import java.util.ArrayList;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.converter.GenerateSWF;
import org.apache.openmeetings.converter.GenerateThumbs;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.process.ConverterProcessResult;
import org.apache.openmeetings.util.process.ConverterProcessResultList;
import org.apache.openmeetings.util.process.ProcessHelper;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LibraryDocumentConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LibraryDocumentConverter.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LibraryDocumentConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LibraryDocumentConverter.java Sat Oct 5 01:44:51 2013
@@ -23,8 +23,8 @@ import java.io.FileWriter;
import java.io.PrintWriter;
import java.util.ArrayList;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.stringhandlers.StringComparer;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LibraryDocuments.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LibraryDocuments.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LibraryDocuments.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LibraryDocuments.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.documents;
-import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LibraryWmlLoader.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LibraryWmlLoader.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LibraryWmlLoader.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LibraryWmlLoader.java Sat Oct 5 01:44:51 2013
@@ -25,8 +25,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.dom4j.Element;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LoadLibraryPresentation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LoadLibraryPresentation.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LoadLibraryPresentation.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LoadLibraryPresentation.java Sat Oct 5 01:44:51 2013
@@ -22,11 +22,11 @@ import java.io.File;
import java.io.FileInputStream;
import java.util.Iterator;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dto.file.LibraryPresenationThumbs;
import org.apache.openmeetings.db.dto.file.LibraryPresentation;
import org.apache.openmeetings.db.dto.file.LibraryPresentationFile;
import org.apache.openmeetings.db.dto.file.LibraryPresentationThumb;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LoadLibraryPresentationToObject.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LoadLibraryPresentationToObject.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LoadLibraryPresentationToObject.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LoadLibraryPresentationToObject.java Sat Oct 5 01:44:51 2013
@@ -21,9 +21,9 @@ package org.apache.openmeetings.document
import java.util.Iterator;
import java.util.LinkedList;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dto.file.FilesObject;
import org.apache.openmeetings.db.dto.file.PresentationObject;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapAuthBase.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapAuthBase.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapAuthBase.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapAuthBase.java Sat Oct 5 01:44:51 2013
@@ -34,7 +34,7 @@ import javax.naming.directory.InitialDir
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java Sat Oct 5 01:44:51 2013
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.ldap;
-import static org.apache.openmeetings.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
import java.util.ArrayList;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/mail/MailHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/mail/MailHandler.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/mail/MailHandler.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/mail/MailHandler.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.mail;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.ByteArrayInputStream;
import java.io.IOException;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/mail/SMSHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/mail/SMSHandler.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/mail/SMSHandler.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/mail/SMSHandler.java Sat Oct 5 01:44:51 2013
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.mail;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.smslib.Message.MessageEncodings;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/quartz/scheduler/MeetingReminderJob.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/quartz/scheduler/MeetingReminderJob.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/quartz/scheduler/MeetingReminderJob.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/quartz/scheduler/MeetingReminderJob.java Sat Oct 5 01:44:51 2013
@@ -19,8 +19,8 @@
package org.apache.openmeetings.quartz.scheduler;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/quartz/scheduler/SessionClearJob.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/quartz/scheduler/SessionClearJob.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/quartz/scheduler/SessionClearJob.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/quartz/scheduler/SessionClearJob.java Sat Oct 5 01:44:51 2013
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.quartz.scheduler;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/quartz/scheduler/TestSetupCleanupJob.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/quartz/scheduler/TestSetupCleanupJob.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/quartz/scheduler/TestSetupCleanupJob.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/quartz/scheduler/TestSetupCleanupJob.java Sat Oct 5 01:44:51 2013
@@ -21,8 +21,8 @@ package org.apache.openmeetings.quartz.s
import java.io.File;
import java.io.FileFilter;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ChatService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ChatService.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ChatService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ChatService.java Sat Oct 5 01:44:51 2013
@@ -27,7 +27,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.data.whiteboard.EmoticonsManager;
@@ -36,6 +35,7 @@ import org.apache.openmeetings.db.entity
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;
import org.red5.server.api.IClient;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ConferenceLibrary.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ConferenceLibrary.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ConferenceLibrary.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ConferenceLibrary.java Sat Oct 5 01:44:51 2013
@@ -26,7 +26,6 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.data.whiteboard.WhiteboardManager;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
@@ -41,6 +40,7 @@ import org.apache.openmeetings.documents
import org.apache.openmeetings.documents.LoadLibraryPresentation;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.crypt.MD5;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ConferenceService.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ConferenceService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ConferenceService.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.remote;
-import static org.apache.openmeetings.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
import java.util.ArrayList;
import java.util.Date;
@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.TimeZone;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.user.UserManager;
@@ -52,6 +51,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.CalendarPatterns;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/DocumentService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/DocumentService.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/DocumentService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/DocumentService.java Sat Oct 5 01:44:51 2013
@@ -20,7 +20,7 @@ package org.apache.openmeetings.remote;
import java.util.List;
-import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ErrorService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ErrorService.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ErrorService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ErrorService.java Sat Oct 5 01:44:51 2013
@@ -18,12 +18,12 @@
*/
package org.apache.openmeetings.remote;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.FieldManager;
import org.apache.openmeetings.db.dao.basic.ErrorDao;
import org.apache.openmeetings.db.dto.basic.ErrorResult;
import org.apache.openmeetings.db.entity.basic.ErrorValue;
import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.remote;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.util.Date;
import java.util.HashMap;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/InvitationService.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/InvitationService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/InvitationService.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.remote;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.util.Calendar;
import java.util.Date;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/LanguageService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/LanguageService.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/LanguageService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/LanguageService.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.remote;
-import static org.apache.openmeetings.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
import java.util.List;
import java.util.Map;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java Sat Oct 5 01:44:51 2013
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.remote;
-import static org.apache.openmeetings.OpenmeetingsVariables.CONFIG_FRONTEND_REGISTER_KEY;
-import static org.apache.openmeetings.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FRONTEND_REGISTER_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE_KEY;
import java.util.Date;
import java.util.HashMap;
@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.TimeZone;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.conference.InvitationManager;
import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.user.UserManager;
@@ -53,6 +52,7 @@ import org.apache.openmeetings.mail.Mail
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.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/PollService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/PollService.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/PollService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/PollService.java Sat Oct 5 01:44:51 2013
@@ -22,7 +22,6 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.db.dao.room.PollDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
@@ -31,6 +30,7 @@ import org.apache.openmeetings.db.entity
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;
import org.red5.server.api.Red5;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/PrintService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/PrintService.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/PrintService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/PrintService.java Sat Oct 5 01:44:51 2013
@@ -22,11 +22,11 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.batik.beans.PrintBean;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.util.AuthLevelUtil;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.crypt.MD5;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/UserService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/UserService.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/UserService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/UserService.java Sat Oct 5 01:44:51 2013
@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.TimeZone;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.cluster.SlaveHTTPConnectionManager;
import org.apache.openmeetings.data.basic.FieldManager;
import org.apache.openmeetings.data.conference.InvitationManager;
@@ -62,6 +61,7 @@ import org.apache.openmeetings.mail.Mail
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;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.remote.red5;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.IOException;
import java.util.ArrayList;
@@ -32,9 +32,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.openmeetings.InitializationContainer;
-import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.Version;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.user.UserManager;
@@ -60,7 +57,10 @@ import org.apache.openmeetings.remote.FL
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;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
+import org.apache.openmeetings.util.Version;
import org.apache.openmeetings.util.process.UploadCompleteMessage;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.adapter.ApplicationAdapter;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/util/SessionVariablesUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/util/SessionVariablesUtil.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/util/SessionVariablesUtil.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/util/SessionVariablesUtil.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.remote.util;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IClient;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/rss/LoadAtomRssFeed.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/rss/LoadAtomRssFeed.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/rss/LoadAtomRssFeed.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/rss/LoadAtomRssFeed.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.rss;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.IOException;
import java.net.HttpURLConnection;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/BeanUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/BeanUtil.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/BeanUtil.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/BeanUtil.java Sat Oct 5 01:44:51 2013
@@ -20,7 +20,7 @@ package org.apache.openmeetings.servlet;
import javax.servlet.ServletContext;
-import org.apache.openmeetings.InitializationContainer;
+import org.apache.openmeetings.util.InitializationContainer;
import org.springframework.web.context.support.WebApplicationContextUtils;
public class BeanUtil {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/AbstractUploadController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/AbstractUploadController.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/AbstractUploadController.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/AbstractUploadController.java Sat Oct 5 01:44:51 2013
@@ -21,11 +21,11 @@ package org.apache.openmeetings.servlet.
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import org.apache.openmeetings.OpenmeetingsVariables;
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.util.AuthLevelUtil;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java Sat Oct 5 01:44:51 2013
@@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
@@ -40,6 +39,7 @@ import org.apache.openmeetings.db.entity
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;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/ExportToImage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/ExportToImage.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/ExportToImage.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/ExportToImage.java Sat Oct 5 01:44:51 2013
@@ -36,7 +36,6 @@ 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.OpenmeetingsVariables;
import org.apache.openmeetings.batik.beans.PrintBean;
import org.apache.openmeetings.data.record.WhiteboardMapToSVG;
import org.apache.openmeetings.data.user.UserManager;
@@ -46,6 +45,7 @@ import org.apache.openmeetings.servlet.B
import org.apache.openmeetings.servlet.ServerNotInitializedException;
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.w3c.dom.DOMImplementation;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java Sat Oct 5 01:44:51 2013
@@ -29,13 +29,13 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang3.StringUtils;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.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;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/UploadController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/UploadController.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/UploadController.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/UploadController.java Sat Oct 5 01:44:51 2013
@@ -33,7 +33,6 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.converter.GenerateImage;
import org.apache.openmeetings.converter.GenerateThumbs;
import org.apache.openmeetings.data.file.FileProcessor;
@@ -44,6 +43,7 @@ import org.apache.openmeetings.db.entity
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;
import org.apache.openmeetings.util.process.ConverterProcessResultList;
import org.apache.openmeetings.util.process.UploadCompleteMessage;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ServerUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ServerUtil.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ServerUtil.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ServerUtil.java Sat Oct 5 01:44:51 2013
@@ -18,9 +18,9 @@
*/
package org.apache.openmeetings.session;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.entity.server.Server;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/SessionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/SessionManager.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/SessionManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/SessionManager.java Sat Oct 5 01:44:51 2013
@@ -28,13 +28,13 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Random;
-import org.apache.openmeetings.OpenmeetingsVariables;
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;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/store/HashMapStore.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/store/HashMapStore.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/store/HashMapStore.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/store/HashMapStore.java Sat Oct 5 01:44:51 2013
@@ -26,9 +26,9 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.Server;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.backup;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.calendar;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.junit.Assert.assertTrue;
import java.util.Calendar;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java Sat Oct 5 01:44:51 2013
@@ -20,9 +20,9 @@ package org.apache.openmeetings.test.cal
import static org.junit.Assert.assertTrue;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java Sat Oct 5 01:44:51 2013
@@ -60,9 +60,9 @@ import net.fortuna.ical4j.model.property
import net.fortuna.ical4j.model.property.Version;
import net.fortuna.ical4j.util.UidGenerator;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.mail.ByteArrayDataSource;
import org.apache.openmeetings.util.mail.IcalHandler;
import org.apache.openmeetings.util.mail.SmtpAuthenticator;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java Sat Oct 5 01:44:51 2013
@@ -22,12 +22,12 @@ import static org.junit.Assert.assertEqu
import java.util.List;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dao.room.ClientDao;
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java Sat Oct 5 01:44:51 2013
@@ -22,12 +22,12 @@ import static org.junit.Assert.assertEqu
import java.util.List;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dao.room.ClientDao;
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java Sat Oct 5 01:44:51 2013
@@ -25,11 +25,11 @@ import java.util.Arrays;
import java.util.Date;
import java.util.Random;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.session.store.HashMapStore;
import org.apache.openmeetings.session.store.IClientPersistenceStore;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/InitializationContainer.java (from r1529278, openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/InitializationContainer.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/InitializationContainer.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/InitializationContainer.java&p1=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/InitializationContainer.java&r1=1529278&r2=1529378&rev=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/InitializationContainer.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/InitializationContainer.java Sat Oct 5 01:44:51 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings;
+package org.apache.openmeetings.util;
public class InitializationContainer {
public static boolean initComplete = false;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/Logger.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/Logger.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/Logger.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/Logger.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.util;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
public class Logger {
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OMContextListener.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OMContextListener.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OMContextListener.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OMContextListener.java Sat Oct 5 01:44:51 2013
@@ -20,7 +20,6 @@ package org.apache.openmeetings.util;
import javax.servlet.ServletContextEvent;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.red5.logging.ContextLoggingListener;
public class OMContextListener extends ContextLoggingListener {
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OmFileHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OmFileHelper.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OmFileHelper.java Sat Oct 5 01:44:51 2013
@@ -26,7 +26,6 @@ import java.io.OutputStream;
import java.text.DecimalFormat;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java (from r1529278, openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/OpenmeetingsVariables.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java&p1=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/OpenmeetingsVariables.java&r1=1529278&r2=1529378&rev=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/OpenmeetingsVariables.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java Sat Oct 5 01:44:51 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings;
+package org.apache.openmeetings.util;
public class OpenmeetingsVariables {
public static final String CONFIG_CRYPT_KEY = "crypt_ClassName";
Copied: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/Version.java (from r1529278, openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/Version.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/Version.java?p2=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/Version.java&p1=openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/Version.java&r1=1529278&r2=1529378&rev=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/Version.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/Version.java Sat Oct 5 01:44:51 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings;
+package org.apache.openmeetings.util;
import java.io.IOException;
import java.net.MalformedURLException;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/ManageCryptStyle.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/ManageCryptStyle.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/ManageCryptStyle.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/ManageCryptStyle.java Sat Oct 5 01:44:51 2013
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.util.crypt;
-import static org.apache.openmeetings.OpenmeetingsVariables.configKeyCryptClassName;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.configKeyCryptClassName;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/geom/GeomPoint.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/geom/GeomPoint.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/geom/GeomPoint.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/geom/GeomPoint.java Sat Oct 5 01:44:51 2013
@@ -20,7 +20,7 @@ package org.apache.openmeetings.util.geo
import java.awt.Point;
-import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/IcalHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/IcalHandler.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/IcalHandler.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/mail/IcalHandler.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.util.mail;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.ByteArrayOutputStream;
import java.io.FileOutputStream;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.util.process;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.red5.logging.Red5LoggerFactory.getLogger;
import java.util.HashMap;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java Sat Oct 5 01:44:51 2013
@@ -28,7 +28,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeoutException;
-import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/stringhandlers/ChatString.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/stringhandlers/ChatString.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/stringhandlers/ChatString.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/stringhandlers/ChatString.java Sat Oct 5 01:44:51 2013
@@ -25,7 +25,7 @@ import java.util.LinkedList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.admin.backup;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import java.io.File;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.admin.configurations;
-import static org.apache.openmeetings.OpenmeetingsVariables.WEB_DATE_PATTERN;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.admin.labels;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.admin.ldaps;
-import static org.apache.openmeetings.OpenmeetingsVariables.WEB_DATE_PATTERN;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/servers/ServerForm.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/servers/ServerForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/servers/ServerForm.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.admin.servers;
-import static org.apache.openmeetings.OpenmeetingsVariables.WEB_DATE_PATTERN;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import org.apache.openmeetings.db.dao.server.ServerDao;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java Sat Oct 5 01:44:51 2013
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.web.admin.users;
-import static org.apache.openmeetings.OpenmeetingsVariables.WEB_DATE_PATTERN;
import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java Sat Oct 5 01:44:51 2013
@@ -26,9 +26,9 @@ import java.util.concurrent.ConcurrentHa
import javax.servlet.ServletContext;
-import org.apache.openmeetings.InitializationContainer;
import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.util.InitializationContainer;
import org.apache.openmeetings.web.pages.ActivatePage;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.openmeetings.web.pages.NotInitedPage;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.app;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java Sat Oct 5 01:44:51 2013
@@ -19,9 +19,9 @@
package org.apache.openmeetings.web.app;
import static java.text.DateFormat.SHORT;
-import static org.apache.openmeetings.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_MYROOMS_KEY;
-import static org.apache.openmeetings.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_RSS_KEY;
-import static org.apache.openmeetings.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_MYROOMS_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_RSS_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
import static org.apache.openmeetings.web.app.Application.getAuthenticationStrategy;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.getDashboardContext;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/ErrorMessagePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/ErrorMessagePanel.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/ErrorMessagePanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/ErrorMessagePanel.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.common;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.PrintWriter;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/ProfileImagePanel.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/ProfileImagePanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/ProfileImagePanel.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.common;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import java.io.File;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/MainPage.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.pages;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.addOnlineUser;
import static org.apache.openmeetings.web.app.Application.removeOnlineUser;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/NotInitedPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/NotInitedPage.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/NotInitedPage.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/NotInitedPage.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.pages;
-import org.apache.openmeetings.InitializationContainer;
+import org.apache.openmeetings.util.InitializationContainer;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.RestartResponseException;
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1529378&r1=1529377&r2=1529378&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java Sat Oct 5 01:44:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.pages.auth;
-import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getBaseUrl;