You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/09/12 07:28:23 UTC
svn commit: r1522448 [5/8] - in /openmeetings/trunk/singlewebapp: docs/
src/main/java/org/apache/openmeetings/axis/services/
src/main/java/org/apache/openmeetings/backup/
src/main/java/org/apache/openmeetings/cli/
src/main/java/org/apache/openmeetings/...
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/SOAPLogin.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/SOAPLogin.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/SOAPLogin.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.basic;
+package org.apache.openmeetings.db.entity.server;
import java.io.Serializable;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/Server.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Server.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/Server.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/Server.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Server.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Server.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/Server.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.basic;
+package org.apache.openmeetings.db.entity.server;
import java.io.Serializable;
import java.util.Calendar;
@@ -36,8 +36,8 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
+import org.apache.openmeetings.db.entity.user.User;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Sessiondata.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Sessiondata.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Sessiondata.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.basic;
+package org.apache.openmeetings.db.entity.server;
import java.io.Serializable;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Address.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/Address.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Address.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Address.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/Address.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/Address.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Address.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.user;
+package org.apache.openmeetings.db.entity.user;
import java.io.Serializable;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.sip.asterisk;
+package org.apache.openmeetings.db.entity.user;
import java.io.Serializable;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/domain/Organisation.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/domain/Organisation.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/domain/Organisation.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.domain;
+package org.apache.openmeetings.db.entity.user;
import java.io.Serializable;
import java.util.Date;
@@ -30,7 +30,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
-import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.domain;
+package org.apache.openmeetings.db.entity.user;
import java.io.Serializable;
import java.util.Date;
@@ -34,8 +34,7 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.user;
+package org.apache.openmeetings.db.entity.user;
import java.io.Serializable;
import java.util.Date;
@@ -35,8 +35,8 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
-import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
+import org.apache.openmeetings.db.entity.room.Room;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/PrivateMessageFolder.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/PrivateMessageFolder.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/PrivateMessageFolder.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.user;
+package org.apache.openmeetings.db.entity.user;
import java.io.Serializable;
import java.util.Date;
@@ -28,7 +28,7 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/Salutation.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/Salutation.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/Salutation.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.user;
+package org.apache.openmeetings.db.entity.user;
import java.io.Serializable;
import java.util.Date;
@@ -31,7 +31,7 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Transient;
-import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/State.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/State.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/State.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/State.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/State.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/State.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/State.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.user;
+package org.apache.openmeetings.db.entity.user;
import java.io.Serializable;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/User.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/User.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/User.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/User.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/User.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/User.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/User.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.user;
+package org.apache.openmeetings.db.entity.user;
import static org.apache.openmeetings.utils.UserHelper.invalidPassword;
@@ -52,11 +52,9 @@ import org.apache.openjpa.persistence.Fe
import org.apache.openjpa.persistence.FetchGroups;
import org.apache.openjpa.persistence.LoadFetchGroup;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
-import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
-import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUser;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
+import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.utils.crypt.MD5;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.simpleframework.xml.Element;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/UserContact.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/UserContact.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/UserContact.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.user;
+package org.apache.openmeetings.db.entity.user;
import java.io.Serializable;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/Userdata.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/Userdata.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/Userdata.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.user;
+package org.apache.openmeetings.db.entity.user;
import java.io.Serializable;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Userlevel.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/Userlevel.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Userlevel.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Userlevel.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/Userlevel.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/Userlevel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/user/Userlevel.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.persistence.beans.user;
+package org.apache.openmeetings.db.entity.user;
import java.io.Serializable;
import java.util.Date;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateImage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateImage.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateImage.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateImage.java Thu Sep 12 05:28:14 2013
@@ -33,10 +33,10 @@ import java.io.IOException;
import org.apache.commons.transaction.util.FileHelper;
import org.apache.openmeetings.data.flvrecord.converter.BaseConverter;
-import org.apache.openmeetings.data.user.dao.UserDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.documents.beans.ConverterProcessResult;
import org.apache.openmeetings.documents.beans.ConverterProcessResultList;
-import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -24,7 +24,7 @@ import java.util.ArrayList;
import org.apache.commons.transaction.util.FileHelper;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.documents.beans.ConverterProcessResult;
import org.apache.openmeetings.documents.beans.ConverterProcessResultList;
import org.apache.openmeetings.utils.OmFileHelper;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateSWF.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateSWF.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateSWF.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateSWF.java Thu Sep 12 05:28:14 2013
@@ -24,7 +24,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.documents.beans.ConverterProcessResult;
import org.apache.openmeetings.utils.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -23,10 +23,10 @@ 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.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.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/beans/UploadCompleteMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/beans/UploadCompleteMessage.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/beans/UploadCompleteMessage.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/beans/UploadCompleteMessage.java Thu Sep 12 05:28:14 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.documents.beans;
-import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
+import org.apache.openmeetings.db.entity.file.FileExplorerItem;
/**
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Thu Sep 12 05:28:14 2013
@@ -19,17 +19,17 @@
package org.apache.openmeetings.installation;
import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.db.entity.basic.Configuration.CRYPT_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.DASHBOARD_SHOW_MYROOMS_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.DASHBOARD_SHOW_RSS_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.DEFAUT_LANG_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.FRONTEND_REGISTER_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.LOGIN_MIN_LENGTH_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.MAX_UPLOAD_SIZE_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.PASS_MIN_LENGTH_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.RSS_FEED1_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.RSS_FEED2_KEY;
import static org.apache.openmeetings.installation.InstallationConfig.USER_PASSWORD_MINIMUM_LENGTH;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.CRYPT_KEY;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.DASHBOARD_SHOW_MYROOMS_KEY;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.DASHBOARD_SHOW_RSS_KEY;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.FRONTEND_REGISTER_KEY;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.LOGIN_MIN_LENGTH_KEY;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.MAX_UPLOAD_SIZE_KEY;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.PASS_MIN_LENGTH_KEY;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.RSS_FEED1_KEY;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.RSS_FEED2_KEY;
import java.io.File;
import java.util.Arrays;
@@ -39,27 +39,27 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.openmeetings.data.basic.FieldLanguageDao;
import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.basic.NaviBuilder;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.ErrorDao;
-import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao;
-import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
-import org.apache.openmeetings.data.conference.PollManager;
import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.conference.dao.SipDao;
-import org.apache.openmeetings.data.oauth.OAuth2Dao;
import org.apache.openmeetings.data.user.OrganisationManager;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.data.user.dao.SalutationDao;
-import org.apache.openmeetings.data.user.dao.StateDao;
-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.persistence.beans.user.oauth.OAuthServer;
-import org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer.RequestMethod;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.basic.ErrorDao;
+import org.apache.openmeetings.db.dao.basic.NavigationDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
+import org.apache.openmeetings.db.dao.label.FieldLanguageDao;
+import org.apache.openmeetings.db.dao.room.PollDao;
+import org.apache.openmeetings.db.dao.room.SipDao;
+import org.apache.openmeetings.db.dao.server.OAuth2Dao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.dao.user.SalutationDao;
+import org.apache.openmeetings.db.dao.user.StateDao;
+import org.apache.openmeetings.db.entity.label.FieldLanguage;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
+import org.apache.openmeetings.db.entity.label.Fieldvalues;
+import org.apache.openmeetings.db.entity.server.OAuthServer;
+import org.apache.openmeetings.db.entity.server.OAuthServer.RequestMethod;
import org.apache.openmeetings.utils.ImportHelper;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.TimezoneUtil;
@@ -87,7 +87,7 @@ public class ImportInitvalues {
@Autowired
private StateDao statemanagement;
@Autowired
- private NaviBuilder navimanagement;
+ private NavigationDao navimanagement;
@Autowired
private ErrorDao errorManagement;
@Autowired
@@ -101,7 +101,7 @@ public class ImportInitvalues {
@Autowired
private AppointmentReminderTypDao appointmentReminderTypDaoImpl;
@Autowired
- private PollManager pollManager;
+ private PollDao pollManager;
@Autowired
private SipDao sipDao;
@Autowired
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.ldap;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.DEFAUT_LANG_KEY;
import java.io.File;
import java.util.ArrayList;
@@ -29,17 +29,17 @@ import java.util.Random;
import java.util.Vector;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.StateDao;
-import org.apache.openmeetings.data.user.dao.UserDao;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.server.LdapConfigDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.StateDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.server.LdapConfig;
+import org.apache.openmeetings.db.entity.user.State;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.ldap.config.ConfigReader;
-import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
-import org.apache.openmeetings.persistence.beans.room.Client;
-import org.apache.openmeetings.persistence.beans.user.State;
-import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.TimezoneUtil;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -19,7 +19,7 @@
package org.apache.openmeetings.quartz.scheduler;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.SessiondataDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
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/ChatService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ChatService.java?rev=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -30,8 +30,8 @@ import org.apache.openmeetings.Openmeeti
import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.data.whiteboard.EmoticonsManager;
-import org.apache.openmeetings.persistence.beans.room.Client;
-import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.session.ISessionManager;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -27,17 +27,17 @@ import java.util.Map;
import org.apache.commons.transaction.util.FileHelper;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
-import org.apache.openmeetings.data.file.dto.LibraryPresentation;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.data.whiteboard.WhiteboardManager;
+import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dto.file.LibraryPresentation;
+import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.documents.LibraryChartLoader;
import org.apache.openmeetings.documents.LibraryDocumentConverter;
import org.apache.openmeetings.documents.LibraryWmlLoader;
import org.apache.openmeetings.documents.LoadLibraryPresentation;
-import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
-import org.apache.openmeetings.persistence.beans.room.Client;
import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.crypt.MD5;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.remote;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.DEFAUT_LANG_KEY;
import java.util.ArrayList;
import java.util.Date;
@@ -29,25 +29,25 @@ import java.util.Map;
import java.util.TimeZone;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.cluster.beans.ServerDTO;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
-import org.apache.openmeetings.data.conference.dao.RoomModeratorsDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
-import org.apache.openmeetings.persistence.beans.room.Client;
-import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.room.RoomModerator;
-import org.apache.openmeetings.persistence.beans.room.RoomOrganisation;
-import org.apache.openmeetings.persistence.beans.room.RoomType;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.room.RoomModeratorsDao;
+import org.apache.openmeetings.db.dao.server.ServerDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dto.server.ServerDTO;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.room.RoomModerator;
+import org.apache.openmeetings.db.entity.room.RoomOrganisation;
+import org.apache.openmeetings.db.entity.room.RoomType;
+import org.apache.openmeetings.db.entity.server.Server;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.math.CalendarPatterns;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -20,10 +20,10 @@ package org.apache.openmeetings.remote;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.basic.dao.ErrorDao;
import org.apache.openmeetings.data.beans.basic.ErrorResult;
-import org.apache.openmeetings.persistence.beans.basic.ErrorValue;
-import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
+import org.apache.openmeetings.db.dao.basic.ErrorDao;
+import org.apache.openmeetings.db.entity.basic.ErrorValue;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -24,12 +24,6 @@ import java.util.Map;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingLogDao;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDeltaDao;
import org.apache.openmeetings.data.flvrecord.converter.FlvInterviewConverterTask;
import org.apache.openmeetings.data.flvrecord.converter.FlvInterviewReConverterTask;
import org.apache.openmeetings.data.flvrecord.converter.FlvRecorderConverterTask;
@@ -37,10 +31,16 @@ import org.apache.openmeetings.data.flvr
import org.apache.openmeetings.data.flvrecord.listener.StreamAudioListener;
import org.apache.openmeetings.data.flvrecord.listener.StreamVideoListener;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
-import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
+import org.apache.openmeetings.db.dao.record.FlvRecordingLogDao;
+import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao;
+import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDeltaDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.record.FlvRecording;
+import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
+import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.math.CalendarPatterns;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -25,16 +25,16 @@ import java.util.Date;
import java.util.TimeZone;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.conference.InvitationManager;
import org.apache.openmeetings.data.conference.InvitationManager.MessageType;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.invitation.Invitation;
-import org.apache.openmeetings.persistence.beans.invitation.Invitation.Valid;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.room.Invitation;
+import org.apache.openmeetings.db.entity.room.Invitation.Valid;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.utils.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.service.IPendingServiceCall;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -18,16 +18,16 @@
*/
package org.apache.openmeetings.remote;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.DEFAUT_LANG_KEY;
import java.util.List;
import java.util.Map;
-import org.apache.openmeetings.data.basic.FieldLanguageDao;
import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
-import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.label.FieldLanguageDao;
+import org.apache.openmeetings.db.entity.label.FieldLanguage;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
import org.springframework.beans.factory.annotation.Autowired;
/**
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.remote;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.FRONTEND_REGISTER_KEY;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.MAX_UPLOAD_SIZE_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.FRONTEND_REGISTER_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.MAX_UPLOAD_SIZE_KEY;
import java.util.Date;
import java.util.HashMap;
@@ -30,25 +30,25 @@ import java.util.TimeZone;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
-import org.apache.openmeetings.data.basic.dao.SOAPLoginDao;
import org.apache.openmeetings.data.conference.InvitationManager;
import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.logs.ConferenceLogDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.data.user.dao.StateDao;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
+import org.apache.openmeetings.db.dao.server.LdapConfigDao;
+import org.apache.openmeetings.db.dao.server.SOAPLoginDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.dao.user.StateDao;
+import org.apache.openmeetings.db.entity.basic.Configuration;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.server.RemoteSessionObject;
+import org.apache.openmeetings.db.entity.server.SOAPLogin;
+import org.apache.openmeetings.db.entity.server.Sessiondata;
+import org.apache.openmeetings.db.entity.user.State;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.db.entity.user.Userdata;
import org.apache.openmeetings.ldap.LdapLoginManagement;
-import org.apache.openmeetings.persistence.beans.basic.Configuration;
-import org.apache.openmeetings.persistence.beans.basic.RemoteSessionObject;
-import org.apache.openmeetings.persistence.beans.basic.SOAPLogin;
-import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
-import org.apache.openmeetings.persistence.beans.room.Client;
-import org.apache.openmeetings.persistence.beans.user.State;
-import org.apache.openmeetings.persistence.beans.user.User;
-import org.apache.openmeetings.persistence.beans.user.Userdata;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.session.ISessionManager;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -22,12 +22,12 @@ import java.util.Date;
import java.util.List;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.conference.PollManager;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.persistence.beans.poll.PollType;
-import org.apache.openmeetings.persistence.beans.poll.RoomPoll;
-import org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers;
-import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.db.dao.room.PollDao;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.room.PollType;
+import org.apache.openmeetings.db.entity.room.RoomPoll;
+import org.apache.openmeetings.db.entity.room.RoomPollAnswers;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.session.ISessionManager;
import org.red5.logging.Red5LoggerFactory;
@@ -56,7 +56,7 @@ public class PollService implements IPen
@Autowired
private ScopeApplicationAdapter scopeApplicationAdapter;
@Autowired
- private PollManager pollManager;
+ private PollDao pollManager;
public String createPoll(String pollName, String pollQuestion, int pollTypeId) {
String returnValue = "";
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -25,8 +25,8 @@ import java.util.List;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.batik.beans.PrintBean;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.utils.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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -30,32 +30,32 @@ import org.apache.openmeetings.Openmeeti
import org.apache.openmeetings.cluster.SlaveHTTPConnectionManager;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.data.beans.basic.SearchResult;
-import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao;
-import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
-import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
import org.apache.openmeetings.data.conference.InvitationManager;
import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.user.OrganisationManager;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.data.user.dao.PrivateMessageFolderDao;
-import org.apache.openmeetings.data.user.dao.PrivateMessagesDao;
-import org.apache.openmeetings.data.user.dao.SalutationDao;
-import org.apache.openmeetings.data.user.dao.UserContactsDao;
-import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
-import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
-import org.apache.openmeetings.persistence.beans.domain.Organisation;
-import org.apache.openmeetings.persistence.beans.room.Client;
-import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.user.Salutation;
-import org.apache.openmeetings.persistence.beans.user.User;
-import org.apache.openmeetings.persistence.beans.user.UserContact;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
+import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.server.ServerDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao;
+import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
+import org.apache.openmeetings.db.dao.user.SalutationDao;
+import org.apache.openmeetings.db.dao.user.UserContactsDao;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.calendar.MeetingMember;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.server.Server;
+import org.apache.openmeetings.db.entity.user.Organisation;
+import org.apache.openmeetings.db.entity.user.Salutation;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.TimezoneUtil;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/WhiteBoardService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/WhiteBoardService.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/WhiteBoardService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/WhiteBoardService.java Thu Sep 12 05:28:14 2013
@@ -30,15 +30,15 @@ import java.util.Map;
import org.apache.commons.collections.ComparatorUtils;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.data.whiteboard.WhiteBoardObjectListManagerById;
import org.apache.openmeetings.data.whiteboard.WhiteBoardObjectSyncManager;
-import org.apache.openmeetings.data.whiteboard.dto.Cliparts;
-import org.apache.openmeetings.data.whiteboard.dto.WhiteboardObject;
-import org.apache.openmeetings.data.whiteboard.dto.WhiteboardObjectList;
-import org.apache.openmeetings.data.whiteboard.dto.WhiteboardSyncLockObject;
-import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dto.room.Cliparts;
+import org.apache.openmeetings.db.dto.room.WhiteboardObject;
+import org.apache.openmeetings.db.dto.room.WhiteboardObjectList;
+import org.apache.openmeetings.db.dto.room.WhiteboardSyncLockObject;
+import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.OmFileHelper;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.remote.red5;
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.CRYPT_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.CRYPT_KEY;
import java.io.IOException;
import java.util.ArrayList;
@@ -33,27 +33,27 @@ import java.util.Set;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.Version;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.ServerDao;
-import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
-import org.apache.openmeetings.data.logs.ConferenceLogDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.data.whiteboard.EmoticonsManager;
import org.apache.openmeetings.data.whiteboard.WhiteboardManager;
-import org.apache.openmeetings.data.whiteboard.dto.BrowserStatus;
-import org.apache.openmeetings.data.whiteboard.dto.RoomStatus;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
+import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.server.ServerDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.dto.room.BrowserStatus;
+import org.apache.openmeetings.db.dto.room.RoomStatus;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.calendar.MeetingMember;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.server.Server;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.documents.beans.UploadCompleteMessage;
-import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
-import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
-import org.apache.openmeetings.persistence.beans.room.Client;
-import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.remote.FLVRecorderService;
import org.apache.openmeetings.remote.WhiteBoardService;
import org.apache.openmeetings.remote.util.SessionVariablesUtil;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -23,9 +23,9 @@ import javax.servlet.http.HttpServletReq
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
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.utils.ImportHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -33,10 +33,10 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
+import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.entity.file.FileExplorerItem;
import org.apache.openmeetings.servlet.BaseHttpServlet;
import org.apache.openmeetings.servlet.ServerNotInitializedException;
import org.apache.openmeetings.utils.OmFileHelper;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -38,9 +38,9 @@ import org.apache.batik.transcoder.Trans
import org.apache.batik.transcoder.image.JPEGTranscoder;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.batik.beans.PrintBean;
-import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.record.WhiteboardMapToSVG;
import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.remote.PrintService;
import org.apache.openmeetings.servlet.BaseHttpServlet;
import org.apache.openmeetings.servlet.ServerNotInitializedException;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -31,9 +31,9 @@ import org.apache.commons.codec.binary.H
import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.velocity.VelocityContext;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -35,14 +35,14 @@ import org.apache.commons.lang3.StringUt
import org.apache.commons.transaction.util.FileHelper;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.file.FileProcessor;
-import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
-import org.apache.openmeetings.data.user.dao.UserDao;
+import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.documents.GenerateImage;
import org.apache.openmeetings.documents.GeneratePDF;
import org.apache.openmeetings.documents.GenerateThumbs;
import org.apache.openmeetings.documents.beans.ConverterProcessResultList;
import org.apache.openmeetings.documents.beans.UploadCompleteMessage;
-import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.StoredFile;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ClientSessionInfo.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ClientSessionInfo.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ClientSessionInfo.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ClientSessionInfo.java Thu Sep 12 05:28:14 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.session;
-import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.db.entity.room.Client;
public class ClientSessionInfo {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ISessionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ISessionManager.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ISessionManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ISessionManager.java Thu Sep 12 05:28:14 2013
@@ -22,8 +22,8 @@ import java.util.Collection;
import java.util.List;
import org.apache.openmeetings.data.beans.basic.SearchResult;
-import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
/**
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -19,8 +19,8 @@
package org.apache.openmeetings.session;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.dao.ServerDao;
-import org.apache.openmeetings.persistence.beans.basic.Server;
+import org.apache.openmeetings.db.dao.server.ServerDao;
+import org.apache.openmeetings.db.entity.server.Server;
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -30,8 +30,8 @@ import java.util.Random;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.beans.basic.SearchResult;
-import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.room.Client;
+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.utils.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/store/DatabaseStore.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/store/DatabaseStore.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/store/DatabaseStore.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/store/DatabaseStore.java Thu Sep 12 05:28:14 2013
@@ -24,9 +24,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.openmeetings.data.conference.dao.ClientDao;
-import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.db.dao.room.ClientDao;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.server.Server;
import org.springframework.beans.factory.annotation.Autowired;
public class DatabaseStore implements IClientPersistenceStore {
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=1522448&r1=1522447&r2=1522448&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 Thu Sep 12 05:28:14 2013
@@ -27,8 +27,8 @@ import java.util.List;
import java.util.Map;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.server.Server;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/store/IClientPersistenceStore.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/store/IClientPersistenceStore.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/store/IClientPersistenceStore.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/store/IClientPersistenceStore.java Thu Sep 12 05:28:14 2013
@@ -22,8 +22,8 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
-import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.server.Server;
public interface IClientPersistenceStore {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java Thu Sep 12 05:28:14 2013
@@ -48,37 +48,37 @@ import org.apache.openmeetings.backup.Ro
import org.apache.openmeetings.backup.StateConverter;
import org.apache.openmeetings.backup.UserConverter;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.SessiondataDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
-import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
-import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
-import org.apache.openmeetings.data.chat.ChatDao;
-import org.apache.openmeetings.data.conference.PollManager;
import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
import org.apache.openmeetings.data.user.OrganisationManager;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.data.user.dao.PrivateMessageFolderDao;
-import org.apache.openmeetings.data.user.dao.PrivateMessagesDao;
-import org.apache.openmeetings.data.user.dao.UserContactsDao;
-import org.apache.openmeetings.persistence.beans.basic.Configuration;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
-import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
-import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
-import org.apache.openmeetings.persistence.beans.chat.ChatMessage;
-import org.apache.openmeetings.persistence.beans.domain.Organisation;
-import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
-import org.apache.openmeetings.persistence.beans.poll.PollType;
-import org.apache.openmeetings.persistence.beans.poll.RoomPoll;
-import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.room.RoomType;
-import org.apache.openmeetings.persistence.beans.user.PrivateMessage;
-import org.apache.openmeetings.persistence.beans.user.State;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.basic.ChatDao;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
+import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
+import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
+import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
+import org.apache.openmeetings.db.dao.room.PollDao;
+import org.apache.openmeetings.db.dao.server.LdapConfigDao;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao;
+import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
+import org.apache.openmeetings.db.dao.user.UserContactsDao;
+import org.apache.openmeetings.db.entity.basic.ChatMessage;
+import org.apache.openmeetings.db.entity.basic.Configuration;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.calendar.AppointmentCategory;
+import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.record.FlvRecording;
+import org.apache.openmeetings.db.entity.room.PollType;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.room.RoomPoll;
+import org.apache.openmeetings.db.entity.room.RoomType;
+import org.apache.openmeetings.db.entity.user.Organisation;
+import org.apache.openmeetings.db.entity.user.PrivateMessage;
+import org.apache.openmeetings.db.entity.user.State;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.simpleframework.xml.Serializer;
@@ -135,7 +135,7 @@ public class BackupExport {
@Autowired
private AuthLevelUtil authLevelUtil;
@Autowired
- private PollManager pollManager;
+ private PollDao pollManager;
@Autowired
private ConfigurationDao configurationDao;
@Autowired