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 [4/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/dao/server/SessiondataDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/SessiondataDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/SessiondataDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/SessiondataDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.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.data.basic;
+package org.apache.openmeetings.db.dao.server;
import java.util.Calendar;
import java.util.Date;
@@ -32,8 +32,8 @@ import javax.persistence.criteria.Predic
import javax.persistence.criteria.Root;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
-import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AbstractUserDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AbstractUserDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AbstractUserDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java Thu Sep 12 05:28:14 2013
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.user.dao;
+package org.apache.openmeetings.db.dao.user;
import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
-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.security.NoSuchAlgorithmException;
import java.util.Date;
@@ -33,11 +33,11 @@ import javax.persistence.TypedQuery;
import org.apache.commons.lang3.StringUtils;
import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.apache.openjpa.persistence.OpenJPAQuery;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.persistence.beans.user.Address;
-import org.apache.openmeetings.persistence.beans.user.User;
-import org.apache.openmeetings.persistence.beans.user.User.Type;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.entity.user.Address;
+import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.utils.DaoHelper;
import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/AdminUserDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AdminUserDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/AdminUserDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/AdminUserDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AdminUserDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AdminUserDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/AdminUserDao.java Thu Sep 12 05:28:14 2013
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.user.dao;
+package org.apache.openmeetings.db.dao.user;
import java.security.NoSuchAlgorithmException;
import java.util.List;
-import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.IDataProviderDao;
+import org.apache.openmeetings.db.entity.user.User;
import org.springframework.beans.factory.annotation.Autowired;
public class AdminUserDao implements IDataProviderDao<User> {
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/OrganisationDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/OrganisationDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/OrganisationDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.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.data.user.dao;
+package org.apache.openmeetings.db.dao.user;
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.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.persistence.beans.domain.Organisation;
+import org.apache.openmeetings.db.dao.IDataProviderDao;
+import org.apache.openmeetings.db.entity.user.Organisation;
import org.apache.openmeetings.utils.DaoHelper;
import org.springframework.transaction.annotation.Transactional;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.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.data.user.dao;
+package org.apache.openmeetings.db.dao.user;
import java.util.List;
@@ -24,9 +24,9 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
-import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.IDataProviderDao;
+import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.utils.DaoHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/PrivateMessageFolderDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/PrivateMessageFolderDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/PrivateMessageFolderDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.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.data.user.dao;
+package org.apache.openmeetings.db.dao.user;
import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
@@ -28,8 +28,8 @@ import javax.persistence.NoResultExcepti
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
-import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder;
+import org.apache.openmeetings.db.dao.IDataProviderDao;
+import org.apache.openmeetings.db.entity.user.PrivateMessageFolder;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.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.data.user.dao;
+package org.apache.openmeetings.db.dao.user;
import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
@@ -31,10 +31,10 @@ import javax.persistence.Query;
import javax.persistence.TypedQuery;
import org.apache.commons.lang3.StringUtils;
-import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.user.PrivateMessage;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.IDataProviderDao;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.user.PrivateMessage;
+import org.apache.openmeetings.db.entity.user.User;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/SalutationDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/SalutationDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/SalutationDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.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.data.user.dao;
+package org.apache.openmeetings.db.dao.user;
import java.util.Date;
import java.util.List;
@@ -26,7 +26,7 @@ import javax.persistence.PersistenceCont
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.persistence.beans.user.Salutation;
+import org.apache.openmeetings.db.entity.user.Salutation;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/StateDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/StateDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/StateDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.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.data.user.dao;
+package org.apache.openmeetings.db.dao.user;
import java.util.Date;
import java.util.List;
@@ -26,7 +26,7 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.user.State;
+import org.apache.openmeetings.db.entity.user.State;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UserContactsDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UserContactsDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UserContactsDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.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.data.user.dao;
+package org.apache.openmeetings.db.dao.user;
import java.util.Date;
import java.util.List;
@@ -29,7 +29,7 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.persistence.beans.user.UserContact;
+import org.apache.openmeetings.db.entity.user.UserContact;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UserDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UserDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UserDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java Thu Sep 12 05:28:14 2013
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.user.dao;
+package org.apache.openmeetings.db.dao.user;
import java.security.NoSuchAlgorithmException;
import java.util.List;
-import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.IDataProviderDao;
+import org.apache.openmeetings.db.entity.user.User;
import org.springframework.beans.factory.annotation.Autowired;
public class UserDao implements IDataProviderDao<User> {
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/FileExplorerObject.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/FileExplorerObject.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/FileExplorerObject.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java Thu Sep 12 05:28:14 2013
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.file.dto;
+package org.apache.openmeetings.db.dto.file;
-import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
+import org.apache.openmeetings.db.entity.file.FileExplorerItem;
/**
* @author sebastianwagner
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/LibraryPresenationThumbs.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/LibraryPresenationThumbs.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/LibraryPresenationThumbs.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.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.data.file.dto;
+package org.apache.openmeetings.db.dto.file;
public class LibraryPresenationThumbs {
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentation.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/LibraryPresentation.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentation.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentation.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/LibraryPresentation.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/LibraryPresentation.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentation.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.data.file.dto;
+package org.apache.openmeetings.db.dto.file;
public class LibraryPresentation {
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/LibraryPresentationFile.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/LibraryPresentationFile.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/LibraryPresentationFile.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.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.data.file.dto;
+package org.apache.openmeetings.db.dto.file;
public class LibraryPresentationFile {
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/LibraryPresentationThumb.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/LibraryPresentationThumb.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/LibraryPresentationThumb.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.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.data.file.dto;
+package org.apache.openmeetings.db.dto.file;
public class LibraryPresentationThumb {
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/BrowserStatus.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/BrowserStatus.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/BrowserStatus.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.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.data.whiteboard.dto;
+package org.apache.openmeetings.db.dto.room;
public class BrowserStatus {
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/Cliparts.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/Cliparts.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/Cliparts.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.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.data.whiteboard.dto;
+package org.apache.openmeetings.db.dto.room;
import java.util.List;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/RoomStatus.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/RoomStatus.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/RoomStatus.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java Thu Sep 12 05:28:14 2013
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.whiteboard.dto;
+package org.apache.openmeetings.db.dto.room;
import java.util.List;
-import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.db.entity.room.Client;
public class RoomStatus {
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObject.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObject.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObject.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObject.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObject.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObject.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObject.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.data.whiteboard.dto;
+package org.apache.openmeetings.db.dto.room;
import java.util.Date;
import java.util.HashMap;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObjectList.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObjectList.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObjectList.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.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.data.whiteboard.dto;
+package org.apache.openmeetings.db.dto.room;
import java.util.HashMap;
import java.util.Map;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/WhiteboardSyncLockObject.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/WhiteboardSyncLockObject.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/WhiteboardSyncLockObject.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.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.data.whiteboard.dto;
+package org.apache.openmeetings.db.dto.room;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/server/ServerDTO.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cluster/beans/ServerDTO.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/server/ServerDTO.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/server/ServerDTO.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cluster/beans/ServerDTO.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cluster/beans/ServerDTO.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/server/ServerDTO.java Thu Sep 12 05:28:14 2013
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.cluster.beans;
+package org.apache.openmeetings.db.dto.server;
-import org.apache.openmeetings.persistence.beans.basic.Server;
+import org.apache.openmeetings.db.entity.server.Server;
/**
*
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/IDataProviderEntity.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/IDataProviderEntity.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/IDataProviderEntity.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/IDataProviderEntity.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/IDataProviderEntity.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/IDataProviderEntity.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/IDataProviderEntity.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;
+package org.apache.openmeetings.db.entity;
public interface IDataProviderEntity {
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/chat/ChatMessage.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/chat/ChatMessage.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/chat/ChatMessage.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.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.chat;
+package org.apache.openmeetings.db.entity.basic;
import java.io.Serializable;
import java.util.Date;
@@ -33,9 +33,9 @@ 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.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
+import org.apache.openmeetings.db.entity.room.Room;
+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/basic/Configuration.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Configuration.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Configuration.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Configuration.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.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.basic;
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.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/basic/ErrorType.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/ErrorType.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/ErrorType.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/ErrorType.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.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.basic;
import java.io.Serializable;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/ErrorValue.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/ErrorValue.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/ErrorValue.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.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.basic;
import java.io.Serializable;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/MailMessage.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/MailMessage.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/MailMessage.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.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.basic;
import java.util.Calendar;
@@ -32,7 +32,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;
@Entity
@NamedQueries({
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.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.basic;
import java.io.Serializable;
import java.util.Date;
@@ -37,7 +37,7 @@ import javax.persistence.Table;
import javax.persistence.Transient;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
@Entity
@NamedQueries({
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Navimain.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Navimain.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Navimain.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.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.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.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
@Entity
@Table(name = "navimain")
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/Appointment.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/Appointment.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/Appointment.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.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.calendar;
+package org.apache.openmeetings.db.entity.calendar;
import java.io.Serializable;
import java.util.Calendar;
@@ -40,8 +40,8 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.room.Room;
+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/calendar/AppointmentCategory.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/AppointmentCategory.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/AppointmentCategory.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/AppointmentCategory.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.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.calendar;
+package org.apache.openmeetings.db.entity.calendar;
import java.io.Serializable;
import java.util.Date;
@@ -33,7 +33,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.user.User;
@Entity
@Table(name = "appointmentcategory")
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderTyps.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderTyps.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderTyps.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderTyps.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.calendar;
+package org.apache.openmeetings.db.entity.calendar;
import java.io.Serializable;
import java.util.Date;
@@ -33,8 +33,8 @@ import javax.persistence.Table;
import javax.persistence.Transient;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
+import org.apache.openmeetings.db.entity.user.User;
import org.simpleframework.xml.Element;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.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.calendar;
+package org.apache.openmeetings.db.entity.calendar;
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.invitation.Invitation;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.room.Invitation;
+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/file/FileExplorerItem.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/files/FileExplorerItem.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/files/FileExplorerItem.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/files/FileExplorerItem.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.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.files;
+package org.apache.openmeetings.db.entity.file;
import java.io.Serializable;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.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.lang;
+package org.apache.openmeetings.db.entity.label;
import java.io.Serializable;
import java.util.ArrayList;
@@ -34,7 +34,7 @@ import javax.persistence.JoinColumn;
import javax.persistence.OneToMany;
import javax.persistence.Table;
-import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
@Entity
@Table(name = "fieldlanguage")
public class FieldLanguage implements Serializable, IDataProviderEntity {
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.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.lang;
+package org.apache.openmeetings.db.entity.label;
import java.io.Serializable;
import java.util.Date;
@@ -35,7 +35,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.db.entity.IDataProviderEntity;
@Entity
@NamedQueries({
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/label/Fieldvalues.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/lang/Fieldvalues.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/label/Fieldvalues.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/label/Fieldvalues.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/lang/Fieldvalues.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/lang/Fieldvalues.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/label/Fieldvalues.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.lang;
+package org.apache.openmeetings.db.entity.label;
import java.io.Serializable;
import java.util.Date;
@@ -33,7 +33,7 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
-import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
@Entity
@NamedQueries({
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/logs/ConferenceLog.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/logs/ConferenceLog.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/logs/ConferenceLog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.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.logs;
+package org.apache.openmeetings.db.entity.log;
import java.io.Serializable;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLogType.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/logs/ConferenceLogType.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLogType.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLogType.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/logs/ConferenceLogType.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/logs/ConferenceLogType.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLogType.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.logs;
+package org.apache.openmeetings.db.entity.log;
import java.io.Serializable;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecording.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecording.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecording.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.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.flvrecord;
+package org.apache.openmeetings.db.entity.record;
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.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.user.User;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingLog.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingLog.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingLog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.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.flvrecord;
+package org.apache.openmeetings.db.entity.record;
import java.io.Serializable;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.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.flvrecord;
+package org.apache.openmeetings.db.entity.record;
import java.io.Serializable;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaDelta.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaDelta.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaDelta.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaDelta.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaDelta.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaDelta.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaDelta.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.flvrecord;
+package org.apache.openmeetings.db.entity.record;
import java.io.Serializable;
import java.util.Date;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Client.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/Client.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Client.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/Client.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/Client.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Client.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.room;
+package org.apache.openmeetings.db.entity.room;
import java.io.Serializable;
import java.util.Date;
@@ -33,8 +33,8 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
-import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
-import org.apache.openmeetings.persistence.beans.basic.Server;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
+import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.utils.math.CalendarPatterns;
/**
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/invitation/Invitation.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/invitation/Invitation.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/invitation/Invitation.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.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.invitation;
+package org.apache.openmeetings.db.entity.room;
import java.io.Serializable;
import java.util.Date;
@@ -37,9 +37,8 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
-import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.user.User;
@Entity
@NamedQueries({
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/poll/PollType.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/poll/PollType.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/poll/PollType.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/PollType.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.poll;
+package org.apache.openmeetings.db.entity.room;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -31,7 +31,7 @@ import javax.persistence.OneToOne;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
+import org.apache.openmeetings.db.entity.label.Fieldvalues;
@Entity
@NamedQueries({
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/Room.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Room.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/Room.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/Room.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Room.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.room;
+package org.apache.openmeetings.db.entity.room;
import java.io.Serializable;
import java.util.ArrayList;
@@ -41,7 +41,7 @@ import javax.persistence.Transient;
import org.apache.openjpa.persistence.ElementDependent;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/RoomModerator.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/RoomModerator.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/RoomModerator.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.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.room;
+package org.apache.openmeetings.db.entity.room;
import java.io.Serializable;
import java.util.Date;
@@ -34,7 +34,7 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.user.User;
+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/room/RoomOrganisation.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/RoomOrganisation.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/RoomOrganisation.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/RoomOrganisation.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.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.room;
+package org.apache.openmeetings.db.entity.room;
import java.io.Serializable;
import java.util.Date;
@@ -34,7 +34,7 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.domain.Organisation;
+import org.apache.openmeetings.db.entity.user.Organisation;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/poll/RoomPoll.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/poll/RoomPoll.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/poll/RoomPoll.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.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.poll;
+package org.apache.openmeetings.db.entity.room;
import java.util.Date;
import java.util.LinkedList;
@@ -37,8 +37,7 @@ import javax.persistence.OneToOne;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.user.User;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswers.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/poll/RoomPollAnswers.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswers.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswers.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/poll/RoomPollAnswers.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/poll/RoomPollAnswers.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswers.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.poll;
+package org.apache.openmeetings.db.entity.room;
import java.util.Date;
@@ -33,7 +33,7 @@ import javax.persistence.OneToOne;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.user.User;
+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/room/RoomType.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/RoomType.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/RoomType.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/RoomType.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.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.room;
+package org.apache.openmeetings.db.entity.room;
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;
@Entity
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/Whiteboard.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/Whiteboard.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/Whiteboard.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.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.room;
+package org.apache.openmeetings.db.entity.room;
import java.util.Calendar;
import java.util.Collection;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/WhiteboardItem.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/WhiteboardItem.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/room/WhiteboardItem.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.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.room;
+package org.apache.openmeetings.db.entity.room;
import javax.persistence.Column;
import javax.persistence.Entity;
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.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;
@@ -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.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/OAuthServer.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/oauth/OAuthServer.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.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.oauth;
+package org.apache.openmeetings.db.entity.server;
import java.io.Serializable;
@@ -29,7 +29,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;
@Entity
@Table(name = "oauth_servers")
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/RemoteSessionObject.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/RemoteSessionObject.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/RemoteSessionObject.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.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;
/**
* This Class is marshaled as an XML-Object and stored as a String in the DB to make