svn commit: r1382635 [5/9] - in /incubator/openmeetings/trunk/singlewebapp: ./ WebContent/WEB-INF/ WebContent/red5/ docs/ src/ src/META-INF/ src/org/apache/ src/org/apache/openmeetings/ src/org/apache/openmeetings/axis/ src/org/apache/openmeetings/axis...

[so...@apache.org]

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/record/WhiteboardMapToSVG.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/record/WhiteboardMapToSVG.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/record/WhiteboardMapToSVG.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/record/WhiteboardMapToSVG.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.data.record;
+package org.apache.openmeetings.data.record;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -28,9 +28,9 @@ import java.util.List;
 import javax.imageio.ImageIO;
 
 import org.apache.batik.svggen.SVGGraphics2D;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.utils.OmFileHelper;
-import org.openmeetings.utils.geom.GeomPoint;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.utils.OmFileHelper;
+import org.apache.openmeetings.utils.geom.GeomPoint;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 

Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Emailmanagement.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Emailmanagement.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Emailmanagement.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Emailmanagement.java Mon Sep 10 03:55:51 2012
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.data.user;
+package org.apache.openmeetings.data.user;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.persistence.beans.adresses.Adresses;
-import org.openmeetings.app.templates.RegisterUserTemplate;
-import org.openmeetings.utils.mail.MailHandler;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.Fieldmanagment;
+import org.apache.openmeetings.persistence.beans.adresses.Adresses;
+import org.apache.openmeetings.templates.RegisterUserTemplate;
+import org.apache.openmeetings.utils.mail.MailHandler;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java (from r1382630, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Organisationmanagement.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Organisationmanagement.java&r1=1382630&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Organisationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.data.user;
+package org.apache.openmeetings.data.user;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -35,13 +35,13 @@ import javax.persistence.criteria.Criter
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.AuthLevelmanagement;
-import org.openmeetings.app.data.beans.basic.SearchResult;
-import org.openmeetings.app.data.user.dao.UsersDaoImpl;
-import org.openmeetings.app.persistence.beans.domain.Organisation;
-import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
-import org.openmeetings.app.persistence.beans.user.Users;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.AuthLevelmanagement;
+import org.apache.openmeetings.data.beans.basic.SearchResult;
+import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.persistence.beans.domain.Organisation;
+import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
+import org.apache.openmeetings.persistence.beans.user.Users;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Salutationmanagement.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Salutationmanagement.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Salutationmanagement.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Salutationmanagement.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Salutationmanagement.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Salutationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Salutationmanagement.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.data.user;
+package org.apache.openmeetings.data.user;
 
 import java.util.Date;
 import java.util.List;
@@ -28,9 +28,9 @@ import javax.persistence.criteria.Criter
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.persistence.beans.user.Salutations;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Fieldmanagment;
+import org.apache.openmeetings.persistence.beans.user.Salutations;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Statemanagement.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Statemanagement.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Statemanagement.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Statemanagement.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.data.user;
+package org.apache.openmeetings.data.user;
 
 import java.util.Date;
 import java.util.List;
@@ -25,8 +25,8 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.persistence.beans.adresses.States;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.persistence.beans.adresses.States;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.transaction.annotation.Transactional;

Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.data.user;
+package org.apache.openmeetings.data.user;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -37,33 +37,33 @@ import javax.persistence.criteria.Predic
 import javax.persistence.criteria.Root;
 
 import org.apache.commons.lang.StringUtils;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.AuthLevelmanagement;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.data.basic.Sessionmanagement;
-import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
-import org.openmeetings.app.data.basic.dao.ServerDaoImpl;
-import org.openmeetings.app.data.beans.basic.SearchResult;
-import org.openmeetings.app.data.user.dao.UserSipDataDaoImpl;
-import org.openmeetings.app.data.user.dao.UsersDaoImpl;
-import org.openmeetings.app.persistence.beans.adresses.Adresses;
-import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
-import org.openmeetings.app.persistence.beans.basic.Server;
-import org.openmeetings.app.persistence.beans.basic.Sessiondata;
-import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
-import org.openmeetings.app.persistence.beans.rooms.RoomClient;
-import org.openmeetings.app.persistence.beans.user.UserSipData;
-import org.openmeetings.app.persistence.beans.user.Userdata;
-import org.openmeetings.app.persistence.beans.user.Userlevel;
-import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.app.remote.red5.ClientListManager;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient;
-import org.openmeetings.app.templates.ResetPasswordTemplate;
-import org.openmeetings.utils.crypt.ManageCryptStyle;
-import org.openmeetings.utils.mail.MailHandler;
-import org.openmeetings.utils.math.CalendarPatterns;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.AuthLevelmanagement;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.Fieldmanagment;
+import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ServerDaoImpl;
+import org.apache.openmeetings.data.beans.basic.SearchResult;
+import org.apache.openmeetings.data.user.dao.UserSipDataDaoImpl;
+import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.persistence.beans.adresses.Adresses;
+import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
+import org.apache.openmeetings.persistence.beans.basic.Server;
+import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
+import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
+import org.apache.openmeetings.persistence.beans.rooms.RoomClient;
+import org.apache.openmeetings.persistence.beans.user.UserSipData;
+import org.apache.openmeetings.persistence.beans.user.Userdata;
+import org.apache.openmeetings.persistence.beans.user.Userlevel;
+import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.remote.red5.ClientListManager;
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.sip.xmlrpc.OpenXGHttpClient;
+import org.apache.openmeetings.templates.ResetPasswordTemplate;
+import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
+import org.apache.openmeetings.utils.mail.MailHandler;
+import org.apache.openmeetings.utils.math.CalendarPatterns;
 import org.red5.io.utils.ObjectMap;
 import org.red5.logging.Red5LoggerFactory;
 import org.red5.server.api.scope.IScope;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessageFolderDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessageFolderDaoImpl.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessageFolderDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessageFolderDaoImpl.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.data.user.dao;
+package org.apache.openmeetings.data.user.dao;
 
 import java.util.Date;
 import java.util.List;
@@ -26,8 +26,8 @@ import javax.persistence.NoResultExcepti
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.persistence.beans.user.PrivateMessageFolder;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.transaction.annotation.Transactional;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDaoImpl.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDaoImpl.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.data.user.dao;
+package org.apache.openmeetings.data.user.dao;
 
 import java.util.Date;
 import java.util.List;
@@ -28,10 +28,10 @@ import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
 import org.apache.commons.lang.StringUtils;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.persistence.beans.rooms.Rooms;
-import org.openmeetings.app.persistence.beans.user.PrivateMessages;
-import org.openmeetings.app.persistence.beans.user.Users;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.persistence.beans.rooms.Rooms;
+import org.apache.openmeetings.persistence.beans.user.PrivateMessages;
+import org.apache.openmeetings.persistence.beans.user.Users;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.transaction.annotation.Transactional;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDaoImpl.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDaoImpl.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.data.user.dao;
+package org.apache.openmeetings.data.user.dao;
 
 import java.util.Date;
 import java.util.List;
@@ -27,9 +27,9 @@ import javax.persistence.PersistenceCont
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.persistence.beans.user.UserContacts;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.persistence.beans.user.UserContacts;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserSipDataDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserSipDataDaoImpl.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserSipDataDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserSipDataDaoImpl.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.data.user.dao;
+package org.apache.openmeetings.data.user.dao;
 
 import java.util.Date;
 
@@ -25,8 +25,8 @@ import javax.persistence.NoResultExcepti
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.persistence.beans.user.UserSipData;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.persistence.beans.user.UserSipData;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.transaction.annotation.Transactional;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.data.user.dao;
+package org.apache.openmeetings.data.user.dao;
 
 import java.util.Date;
 import java.util.List;
@@ -31,10 +31,10 @@ import javax.persistence.criteria.Predic
 import javax.persistence.criteria.Root;
 
 import org.apache.commons.lang.StringUtils;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.persistence.beans.adresses.Adresses;
-import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.utils.crypt.ManageCryptStyle;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.persistence.beans.adresses.Adresses;
+import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/doc/WebServiceDoclet.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/doc/WebServiceDoclet.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/doc/WebServiceDoclet.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/doc/WebServiceDoclet.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.doc;
+package org.apache.openmeetings.doc;
 
 import java.io.File;
 import java.io.FileWriter;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/CreateLibraryPresentation.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/CreateLibraryPresentation.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/CreateLibraryPresentation.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/CreateLibraryPresentation.java Mon Sep 10 03:55:51 2012
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.documents;
+package org.apache.openmeetings.documents;
 
 import java.util.HashMap;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.FileOutputStream;
 
+import org.apache.openmeetings.utils.OmFileHelper;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.io.XMLWriter;
-import org.openmeetings.utils.OmFileHelper;
 
 import java.util.Arrays;
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateImage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateImage.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateImage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateImage.java Mon Sep 10 03:55:51 2012
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.documents;
+package org.apache.openmeetings.documents;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.user.dao.UsersDaoImpl;
-import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.utils.OmFileHelper;
-import org.openmeetings.utils.ProcessHelper;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.utils.OmFileHelper;
+import org.apache.openmeetings.utils.ProcessHelper;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GeneratePDF.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GeneratePDF.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GeneratePDF.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GeneratePDF.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.documents;
+package org.apache.openmeetings.documents;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -24,10 +24,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 
 import org.apache.commons.transaction.util.FileHelper;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.utils.OmFileHelper;
-import org.openmeetings.utils.ProcessHelper;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.utils.OmFileHelper;
+import org.apache.openmeetings.utils.ProcessHelper;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateSWF.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateSWF.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateSWF.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateSWF.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.documents;
+package org.apache.openmeetings.documents;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,9 +24,9 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.utils.ProcessHelper;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.utils.ProcessHelper;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateThumbs.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateThumbs.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateThumbs.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateThumbs.java Mon Sep 10 03:55:51 2012
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.documents;
+package org.apache.openmeetings.documents;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.utils.ProcessHelper;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.utils.ProcessHelper;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/InstallationDocumentHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/InstallationDocumentHandler.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/InstallationDocumentHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/InstallationDocumentHandler.java Mon Sep 10 03:55:51 2012
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.documents;
+package org.apache.openmeetings.documents;
 
 import java.io.FileWriter;
 
+import org.apache.openmeetings.utils.OmFileHelper;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.Node;
 import org.dom4j.io.SAXReader;
 import org.dom4j.io.XMLWriter;
-import org.openmeetings.utils.OmFileHelper;
 
 public class InstallationDocumentHandler {
 	public static void createDocument(Integer stepNo) throws Exception {

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryChartLoader.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryChartLoader.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryChartLoader.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryChartLoader.java Mon Sep 10 03:55:51 2012
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.documents;
+package org.apache.openmeetings.documents;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.util.ArrayList;
 
-import org.openmeetings.utils.Logger;
+import org.apache.openmeetings.utils.Logger;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.XppDriver;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryDocumentConverter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryDocumentConverter.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryDocumentConverter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryDocumentConverter.java Mon Sep 10 03:55:51 2012
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.documents;
+package org.apache.openmeetings.documents;
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.utils.OmFileHelper;
-import org.openmeetings.utils.stringhandlers.StringComparer;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.utils.OmFileHelper;
+import org.apache.openmeetings.utils.stringhandlers.StringComparer;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryDocuments.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryDocuments.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryDocuments.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryDocuments.java Mon Sep 10 03:55:51 2012
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.documents;
+package org.apache.openmeetings.documents;
 
-import org.openmeetings.app.OpenmeetingsVariables;
+import org.apache.openmeetings.OpenmeetingsVariables;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryWmlLoader.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryWmlLoader.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryWmlLoader.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LibraryWmlLoader.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.documents;
+package org.apache.openmeetings.documents;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -25,9 +25,9 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.utils.OmFileHelper;
 import org.dom4j.Element;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.utils.OmFileHelper;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LoadLibraryPresentation.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LoadLibraryPresentation.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LoadLibraryPresentation.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LoadLibraryPresentation.java Mon Sep 10 03:55:51 2012
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.documents;
+package org.apache.openmeetings.documents;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.Iterator;
 
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.file.dto.LibraryPresenationThumbs;
+import org.apache.openmeetings.data.file.dto.LibraryPresentation;
+import org.apache.openmeetings.data.file.dto.LibraryPresentationFile;
+import org.apache.openmeetings.data.file.dto.LibraryPresentationThumb;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.file.dto.LibraryPresenationThumbs;
-import org.openmeetings.app.data.file.dto.LibraryPresentation;
-import org.openmeetings.app.data.file.dto.LibraryPresentationFile;
-import org.openmeetings.app.data.file.dto.LibraryPresentationThumb;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LoadLibraryPresentationToObject.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LoadLibraryPresentationToObject.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LoadLibraryPresentationToObject.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/LoadLibraryPresentationToObject.java Mon Sep 10 03:55:51 2012
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.documents;
+package org.apache.openmeetings.documents;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.files.FilesObject;
+import org.apache.openmeetings.data.basic.files.PresentationObject;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.files.FilesObject;
-import org.openmeetings.app.data.basic.files.PresentationObject;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.installation;
+package org.apache.openmeetings.installation;
 
 import java.io.File;
 import java.util.Arrays;
@@ -28,31 +28,31 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.ErrorManagement;
+import org.apache.openmeetings.data.basic.FieldLanguageDaoImpl;
+import org.apache.openmeetings.data.basic.Fieldmanagment;
+import org.apache.openmeetings.data.basic.Navimanagement;
+import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
+import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDaoImpl;
+import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDaoImpl;
+import org.apache.openmeetings.data.conference.PollManagement;
+import org.apache.openmeetings.data.conference.Roommanagement;
+import org.apache.openmeetings.data.user.Organisationmanagement;
+import org.apache.openmeetings.data.user.Salutationmanagement;
+import org.apache.openmeetings.data.user.Statemanagement;
+import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
+import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
+import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
+import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
+import org.apache.openmeetings.utils.ImportHelper;
+import org.apache.openmeetings.utils.OmFileHelper;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.ErrorManagement;
-import org.openmeetings.app.data.basic.FieldLanguageDaoImpl;
-import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.data.basic.Navimanagement;
-import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
-import org.openmeetings.app.data.calendar.daos.AppointmentCategoryDaoImpl;
-import org.openmeetings.app.data.calendar.daos.AppointmentReminderTypDaoImpl;
-import org.openmeetings.app.data.conference.PollManagement;
-import org.openmeetings.app.data.conference.Roommanagement;
-import org.openmeetings.app.data.user.Organisationmanagement;
-import org.openmeetings.app.data.user.Salutationmanagement;
-import org.openmeetings.app.data.user.Statemanagement;
-import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.data.user.dao.UsersDaoImpl;
-import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
-import org.openmeetings.app.persistence.beans.lang.FieldLanguage;
-import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
-import org.openmeetings.app.persistence.beans.lang.Fieldvalues;
-import org.openmeetings.utils.ImportHelper;
-import org.openmeetings.utils.OmFileHelper;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java Mon Sep 10 03:55:51 2012
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.installation;
+package org.apache.openmeetings.installation;
 
-import org.openmeetings.utils.crypt.MD5Implementation;
+import org.apache.openmeetings.utils.crypt.MD5Implementation;
 
 public class InstallationConfig {
 	public static final int USER_LOGIN_MINIMUM_LENGTH = 4;

Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapAuthBase.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapAuthBase.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapAuthBase.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapAuthBase.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapAuthBase.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapAuthBase.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapAuthBase.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.ldap;
+package org.apache.openmeetings.ldap;
 
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -34,7 +34,7 @@ import javax.naming.directory.InitialDir
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
-import org.openmeetings.app.OpenmeetingsVariables;
+import org.apache.openmeetings.OpenmeetingsVariables;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 

Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.ldap;
+package org.apache.openmeetings.ldap;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -26,19 +26,19 @@ import java.util.List;
 import java.util.Random;
 import java.util.Vector;
 
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.Sessionmanagement;
-import org.openmeetings.app.data.basic.dao.LdapConfigDaoImpl;
-import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
-import org.openmeetings.app.data.user.Statemanagement;
-import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.ldap.config.ConfigReader;
-import org.openmeetings.app.persistence.beans.adresses.States;
-import org.openmeetings.app.persistence.beans.basic.LdapConfig;
-import org.openmeetings.app.persistence.beans.rooms.RoomClient;
-import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.utils.OmFileHelper;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.basic.dao.LdapConfigDaoImpl;
+import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
+import org.apache.openmeetings.data.user.Statemanagement;
+import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.ldap.config.ConfigReader;
+import org.apache.openmeetings.persistence.beans.adresses.States;
+import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
+import org.apache.openmeetings.persistence.beans.rooms.RoomClient;
+import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.utils.OmFileHelper;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/config/ConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/config/ConfigReader.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/config/ConfigReader.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/config/ConfigReader.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.ldap.config;
+package org.apache.openmeetings.ldap.config;
 
 import java.io.BufferedReader;
 import java.io.File;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/Adresses.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/Adresses.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/Adresses.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/Adresses.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.adresses;
+package org.apache.openmeetings.persistence.beans.adresses;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/States.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/States.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/States.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/States.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.adresses;
+package org.apache.openmeetings.persistence.beans.adresses;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java Mon Sep 10 03:55:51 2012
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.basic;
+package org.apache.openmeetings.persistence.beans.basic;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import org.openmeetings.app.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.Users;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/ErrorType.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/ErrorType.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/ErrorType.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/ErrorType.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.basic;
+package org.apache.openmeetings.persistence.beans.basic;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/ErrorValues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/ErrorValues.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/ErrorValues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/ErrorValues.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.basic;
+package org.apache.openmeetings.persistence.beans.basic;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java Mon Sep 10 03:55:51 2012
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.basic;
+package org.apache.openmeetings.persistence.beans.basic;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import org.openmeetings.app.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.Users;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.basic;
+package org.apache.openmeetings.persistence.beans.basic;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -36,7 +36,7 @@ import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
-import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
+import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
 
 @Entity
 @NamedQueries({

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Navimain.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Navimain.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Navimain.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Navimain.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.basic;
+package org.apache.openmeetings.persistence.beans.basic;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -29,7 +29,7 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
-import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
+import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
 
 @Entity
 @Table(name = "navimain")

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/OmTimeZone.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/OmTimeZone.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/OmTimeZone.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/OmTimeZone.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.basic;
+package org.apache.openmeetings.persistence.beans.basic;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/RemoteSessionObject.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/RemoteSessionObject.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/RemoteSessionObject.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/RemoteSessionObject.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.basic;
+package org.apache.openmeetings.persistence.beans.basic;
 
 /**
  * This Class is marshaled as an XML-Object and stored as a String in the DB to make

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/SOAPLogin.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/SOAPLogin.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/SOAPLogin.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/SOAPLogin.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.basic;
+package org.apache.openmeetings.persistence.beans.basic;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.basic;
+package org.apache.openmeetings.persistence.beans.basic;
 
 import java.io.Serializable;
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Sessiondata.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Sessiondata.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Sessiondata.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Sessiondata.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.basic;
+package org.apache.openmeetings.persistence.beans.basic;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.calendar;
+package org.apache.openmeetings.persistence.beans.calendar;
 
 import java.io.Serializable;
 import java.util.Calendar;
@@ -38,8 +38,8 @@ import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import org.openmeetings.app.persistence.beans.rooms.Rooms;
-import org.openmeetings.app.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.rooms.Rooms;
+import org.apache.openmeetings.persistence.beans.user.Users;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentCategory.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentCategory.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentCategory.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentCategory.java Mon Sep 10 03:55:51 2012
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.calendar;
+package org.apache.openmeetings.persistence.beans.calendar;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import org.openmeetings.app.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.Users;
 
 
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.calendar;
+package org.apache.openmeetings.persistence.beans.calendar;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -31,7 +31,7 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.openmeetings.app.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.Users;
 
 
 @Entity

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.calendar;
+package org.apache.openmeetings.persistence.beans.calendar;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -31,9 +31,9 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
-import org.openmeetings.app.persistence.beans.invitation.Invitations;
-import org.openmeetings.app.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
+import org.apache.openmeetings.persistence.beans.invitation.Invitations;
+import org.apache.openmeetings.persistence.beans.user.Users;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.domain;
+package org.apache.openmeetings.persistence.beans.domain;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.domain;
+package org.apache.openmeetings.persistence.beans.domain;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/files/FileExplorerItem.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/files/FileExplorerItem.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/files/FileExplorerItem.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/files/FileExplorerItem.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.files;
+package org.apache.openmeetings.persistence.beans.files;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecording.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecording.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecording.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecording.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.flvrecord;
+package org.apache.openmeetings.persistence.beans.flvrecord;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -36,8 +36,8 @@ import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
-import org.openmeetings.app.persistence.beans.rooms.Rooms;
-import org.openmeetings.app.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.rooms.Rooms;
+import org.apache.openmeetings.persistence.beans.user.Users;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.ElementList;
 import org.simpleframework.xml.Root;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingLog.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingLog.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingLog.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingLog.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.flvrecord;
+package org.apache.openmeetings.persistence.beans.flvrecord;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.flvrecord;
+package org.apache.openmeetings.persistence.beans.flvrecord;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaDelta.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaDelta.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaDelta.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaDelta.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.flvrecord;
+package org.apache.openmeetings.persistence.beans.flvrecord;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/invitation/Invitations.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/invitation/Invitations.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/invitation/Invitations.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/invitation/Invitations.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.invitation;
+package org.apache.openmeetings.persistence.beans.invitation;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -31,8 +31,8 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.openmeetings.app.persistence.beans.rooms.Rooms;
-import org.openmeetings.app.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.rooms.Rooms;
+import org.apache.openmeetings.persistence.beans.user.Users;
 
 @Entity
 @Table(name = "invitations")

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.lang;
+package org.apache.openmeetings.persistence.beans.lang;
 
 import java.io.Serializable;
 import java.util.ArrayList;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.lang;
+package org.apache.openmeetings.persistence.beans.lang;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldvalues.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldvalues.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.lang;
+package org.apache.openmeetings.persistence.beans.lang;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLog.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLog.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLog.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLog.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.logs;
+package org.apache.openmeetings.persistence.beans.logs;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLogType.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLogType.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLogType.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLogType.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.logs;
+package org.apache.openmeetings.persistence.beans.logs;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/PollType.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/PollType.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/PollType.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/PollType.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.poll;
+package org.apache.openmeetings.persistence.beans.poll;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -28,7 +28,7 @@ import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-import org.openmeetings.app.persistence.beans.lang.Fieldvalues;
+import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
 
 @Entity
 @Table(name = "poll_types")

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPoll.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPoll.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPoll.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPoll.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.poll;
+package org.apache.openmeetings.persistence.beans.poll;
 
 import java.util.Date;
 import java.util.LinkedList;
@@ -34,8 +34,8 @@ import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-import org.openmeetings.app.persistence.beans.rooms.Rooms;
-import org.openmeetings.app.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.rooms.Rooms;
+import org.apache.openmeetings.persistence.beans.user.Users;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.ElementList;
 import org.simpleframework.xml.Root;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPollAnswers.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPollAnswers.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPollAnswers.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPollAnswers.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.poll;
+package org.apache.openmeetings.persistence.beans.poll;
 
 import java.util.Date;
 
@@ -27,7 +27,7 @@ import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-import org.openmeetings.app.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.Users;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomClient.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomClient.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomClient.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomClient.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.rooms;
+package org.apache.openmeetings.persistence.beans.rooms;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomModerators.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomModerators.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomModerators.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomModerators.java Mon Sep 10 03:55:51 2012
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.rooms;
+package org.apache.openmeetings.persistence.beans.rooms;
 
 import java.io.Serializable;
 import java.util.Date;
 
 
-import org.openmeetings.app.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.Users;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
 

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomTypes.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomTypes.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomTypes.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomTypes.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.rooms;
+package org.apache.openmeetings.persistence.beans.rooms;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java Mon Sep 10 03:55:51 2012
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.openmeetings.app.persistence.beans.rooms;
+package org.apache.openmeetings.persistence.beans.rooms;
 
-import org.openmeetings.app.persistence.beans.basic.Server;
+import org.apache.openmeetings.persistence.beans.basic.Server;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.ElementList;
 import org.simpleframework.xml.Root;