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 [3/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/...

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/rooms/RoomsList.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/rooms/RoomsList.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/rooms/RoomsList.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/rooms/RoomsList.java Thu Sep 12 05:28:14 2013
@@ -18,7 +18,7 @@
  */
 package org.apache.openmeetings.data.beans.rooms;
 
-import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.db.entity.room.Room;
 
 public class RoomsList {
 	

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java Thu Sep 12 05:28:14 2013
@@ -27,21 +27,21 @@ import java.util.List;
 import java.util.TimeZone;
 
 import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao;
-import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
-import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
-import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
 import org.apache.openmeetings.data.conference.InvitationManager;
 import org.apache.openmeetings.data.conference.InvitationManager.MessageType;
 import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.conference.dao.InvitationDao;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
-import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
-import org.apache.openmeetings.persistence.beans.invitation.Invitation;
-import org.apache.openmeetings.persistence.beans.room.Room;
+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.AppointmentReminderTypDao;
+import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
+import org.apache.openmeetings.db.dao.room.InvitationDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.calendar.MeetingMember;
+import org.apache.openmeetings.db.entity.room.Invitation;
+import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.utils.TimezoneUtil;
 import org.apache.openmeetings.utils.math.CalendarPatterns;
 import org.red5.logging.Red5LoggerFactory;

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java Thu Sep 12 05:28:14 2013
@@ -29,16 +29,16 @@ import java.util.TimeZone;
 import java.util.Vector;
 
 import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.conference.dao.InvitationDao;
-import org.apache.openmeetings.persistence.beans.basic.MailMessage;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
-import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
-import org.apache.openmeetings.persistence.beans.invitation.Invitation;
-import org.apache.openmeetings.persistence.beans.invitation.Invitation.Valid;
-import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.user.User;
-import org.apache.openmeetings.persistence.beans.user.User.Type;
+import org.apache.openmeetings.db.dao.room.InvitationDao;
+import org.apache.openmeetings.db.entity.basic.MailMessage;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.calendar.MeetingMember;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
+import org.apache.openmeetings.db.entity.room.Invitation;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.room.Invitation.Valid;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.db.entity.user.User.Type;
 import org.apache.openmeetings.utils.TimezoneUtil;
 import org.apache.openmeetings.utils.crypt.MD5;
 import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
@@ -50,14 +50,12 @@ import org.apache.openmeetings.web.mail.
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 
  * @author swagner
  * 
  */
-@Transactional
 public class InvitationManager {
 	private static final Logger log = Red5LoggerFactory.getLogger(InvitationManager.class, webAppRootKey);
 	public enum MessageType {

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java Thu Sep 12 05:28:14 2013
@@ -35,16 +35,16 @@ import javax.persistence.criteria.Root;
 import org.apache.openmeetings.data.basic.AuthLevelUtil;
 import org.apache.openmeetings.data.basic.FieldManager;
 import org.apache.openmeetings.data.beans.basic.SearchResult;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
-import org.apache.openmeetings.data.conference.dao.RoomModeratorsDao;
-import org.apache.openmeetings.data.conference.dao.SipDao;
 import org.apache.openmeetings.data.user.OrganisationManager;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.persistence.beans.room.Room;
-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.room.RoomDao;
+import org.apache.openmeetings.db.dao.room.RoomModeratorsDao;
+import org.apache.openmeetings.db.dao.room.SipDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.room.RoomOrganisation;
+import org.apache.openmeetings.db.entity.room.RoomType;
+import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.session.ISessionManager;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/FileProcessor.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/FileProcessor.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/FileProcessor.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/FileProcessor.java Thu Sep 12 05:28:14 2013
@@ -27,14 +27,14 @@ import java.util.List;
 
 import org.apache.commons.transaction.util.FileHelper;
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
 import org.apache.openmeetings.data.flvrecord.converter.FlvExplorerConverter;
+import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
+import org.apache.openmeetings.db.entity.file.FileExplorerItem;
 import org.apache.openmeetings.documents.GenerateImage;
 import org.apache.openmeetings.documents.GeneratePDF;
 import org.apache.openmeetings.documents.GenerateThumbs;
 import org.apache.openmeetings.documents.beans.ConverterProcessResult;
 import org.apache.openmeetings.documents.beans.ConverterProcessResultList;
-import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
 import org.apache.openmeetings.utils.OmFileHelper;
 import org.apache.openmeetings.utils.StoredFile;
 import org.apache.openmeetings.utils.crypt.MD5;

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/FileUtils.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/FileUtils.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/FileUtils.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/FileUtils.java Thu Sep 12 05:28:14 2013
@@ -26,8 +26,8 @@ import java.util.Date;
 import java.util.Locale;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
-import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
+import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
+import org.apache.openmeetings.db.entity.file.FileExplorerItem;
 import org.apache.openmeetings.utils.OmFileHelper;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/beans/FLVRecorderObject.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/beans/FLVRecorderObject.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/beans/FLVRecorderObject.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/beans/FLVRecorderObject.java Thu Sep 12 05:28:14 2013
@@ -20,7 +20,7 @@ package org.apache.openmeetings.data.flv
 
 import java.util.List;
 
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
+import org.apache.openmeetings.db.entity.record.FlvRecording;
 
 public class FLVRecorderObject {
 

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/BaseConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/BaseConverter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/BaseConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/BaseConverter.java Thu Sep 12 05:28:14 2013
@@ -26,14 +26,14 @@ import java.io.IOException;
 import java.util.List;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDeltaDao;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao;
+import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDeltaDao;
+import org.apache.openmeetings.db.entity.record.FlvRecording;
+import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
+import org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta;
 import org.apache.openmeetings.documents.GenerateSWF;
 import org.apache.openmeetings.documents.beans.ConverterProcessResult;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaDelta;
 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/data/flvrecord/converter/FlvExplorerConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvExplorerConverter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvExplorerConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvExplorerConverter.java Thu Sep 12 05:28:14 2013
@@ -25,10 +25,10 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingLogDao;
+import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
+import org.apache.openmeetings.db.dao.record.FlvRecordingLogDao;
+import org.apache.openmeetings.db.entity.file.FileExplorerItem;
 import org.apache.openmeetings.documents.beans.ConverterProcessResult;
-import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
 import org.apache.openmeetings.utils.ProcessHelper;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvInterviewConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvInterviewConverter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvInterviewConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvInterviewConverter.java Thu Sep 12 05:28:14 2013
@@ -25,13 +25,13 @@ import java.util.List;
 
 import org.apache.commons.transaction.util.FileHelper;
 import org.apache.openmeetings.OpenmeetingsVariables;
-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.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.entity.record.FlvRecording;
+import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
 import org.apache.openmeetings.documents.GenerateThumbs;
 import org.apache.openmeetings.documents.beans.ConverterProcessResult;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
 import org.apache.openmeetings.utils.ProcessHelper;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvRecorderConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvRecorderConverter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvRecorderConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/converter/FlvRecorderConverter.java Thu Sep 12 05:28:14 2013
@@ -24,12 +24,12 @@ import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-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.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.entity.record.FlvRecording;
+import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
 import org.apache.openmeetings.documents.beans.ConverterProcessResult;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
 import org.apache.openmeetings.utils.ProcessHelper;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/StreamAudioListener.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/StreamAudioListener.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/StreamAudioListener.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/StreamAudioListener.java Thu Sep 12 05:28:14 2013
@@ -21,10 +21,10 @@ package org.apache.openmeetings.data.flv
 import java.util.Date;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDeltaDao;
 import org.apache.openmeetings.data.flvrecord.listener.async.CachedEvent;
 import org.apache.openmeetings.data.flvrecord.listener.async.StreamAudioWriter;
+import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao;
+import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDeltaDao;
 import org.red5.logging.Red5LoggerFactory;
 import org.red5.server.api.scope.IScope;
 import org.red5.server.api.stream.IBroadcastStream;

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/StreamVideoListener.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/StreamVideoListener.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/StreamVideoListener.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/StreamVideoListener.java Thu Sep 12 05:28:14 2013
@@ -21,9 +21,9 @@ package org.apache.openmeetings.data.flv
 import java.util.Date;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
 import org.apache.openmeetings.data.flvrecord.listener.async.CachedEvent;
 import org.apache.openmeetings.data.flvrecord.listener.async.StreamVideoWriter;
+import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao;
 import org.red5.logging.Red5LoggerFactory;
 import org.red5.server.api.scope.IScope;
 import org.red5.server.api.stream.IBroadcastStream;

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java Thu Sep 12 05:28:14 2013
@@ -23,10 +23,10 @@ import java.util.Date;
 
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDeltaDao;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaDelta;
+import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao;
+import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDeltaDao;
+import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
+import org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta;
 import org.red5.io.ITag;
 import org.red5.io.flv.impl.Tag;
 import org.red5.logging.Red5LoggerFactory;

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamVideoWriter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamVideoWriter.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamVideoWriter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamVideoWriter.java Thu Sep 12 05:28:14 2013
@@ -23,8 +23,8 @@ import java.util.Date;
 
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
+import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao;
+import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
 import org.red5.io.ITag;
 import org.red5.io.flv.impl.Tag;
 import org.red5.logging.Red5LoggerFactory;

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/record/BatikMethods.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/record/BatikMethods.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/record/BatikMethods.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/record/BatikMethods.java Thu Sep 12 05:28:14 2013
@@ -35,7 +35,7 @@ import javax.swing.JTextArea;
 import org.apache.batik.dom.svg.SVGDOMImplementation;
 import org.apache.batik.svggen.SVGGraphics2D;
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.utils.geom.ArrowStyle;
 import org.apache.openmeetings.utils.geom.GeomPoint;
 import org.red5.logging.Red5LoggerFactory;

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/EmailManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/EmailManager.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/EmailManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/EmailManager.java Thu Sep 12 05:28:14 2013
@@ -20,7 +20,7 @@ package org.apache.openmeetings.data.use
 
 import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
 
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.utils.mail.MailHandler;
 import org.apache.openmeetings.web.app.WebSession;
 import org.apache.openmeetings.web.mail.template.FeedbackTemplate;
@@ -36,7 +36,6 @@ import org.springframework.transaction.a
  * @author swagner
  *
  */
-@Transactional
 public class EmailManager {
 	private static final Logger log = Red5LoggerFactory.getLogger(EmailManager.class, webAppRootKey);
 

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/OrganisationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/OrganisationManager.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/OrganisationManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/OrganisationManager.java Thu Sep 12 05:28:14 2013
@@ -38,12 +38,12 @@ import javax.persistence.criteria.Root;
 import org.apache.openmeetings.OpenmeetingsVariables;
 import org.apache.openmeetings.data.basic.AuthLevelUtil;
 import org.apache.openmeetings.data.beans.basic.SearchResult;
-import org.apache.openmeetings.data.user.dao.OrganisationDao;
-import org.apache.openmeetings.data.user.dao.OrganisationUserDao;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.domain.Organisation;
-import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.user.OrganisationDao;
+import org.apache.openmeetings.db.dao.user.OrganisationUserDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.Organisation;
+import org.apache.openmeetings.db.entity.user.Organisation_Users;
+import org.apache.openmeetings.db.entity.user.User;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java Thu Sep 12 05:28:14 2013
@@ -19,8 +19,8 @@
 package org.apache.openmeetings.data.user;
 
 import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
-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.db.entity.basic.Configuration.FRONTEND_REGISTER_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.LOGIN_MIN_LENGTH_KEY;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -42,18 +42,18 @@ import javax.persistence.criteria.Root;
 import org.apache.commons.lang3.StringUtils;
 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.beans.basic.SearchResult;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.data.user.dao.StateDao;
-import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
-import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.persistence.beans.room.Client;
-import org.apache.openmeetings.persistence.beans.user.Address;
-import org.apache.openmeetings.persistence.beans.user.User;
-import org.apache.openmeetings.persistence.beans.user.Userdata;
-import org.apache.openmeetings.persistence.beans.user.Userlevel;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+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.room.Client;
+import org.apache.openmeetings.db.entity.server.Sessiondata;
+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.Userdata;
+import org.apache.openmeetings.db.entity.user.Userlevel;
 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/data/whiteboard/WhiteBoardObjectListManagerById.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectListManagerById.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectListManagerById.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectListManagerById.java Thu Sep 12 05:28:14 2013
@@ -20,8 +20,8 @@ package org.apache.openmeetings.data.whi
 
 import java.util.HashMap;
 
-import org.apache.openmeetings.data.whiteboard.dto.WhiteboardObject;
-import org.apache.openmeetings.data.whiteboard.dto.WhiteboardObjectList;
+import org.apache.openmeetings.db.dto.room.WhiteboardObject;
+import org.apache.openmeetings.db.dto.room.WhiteboardObjectList;
 
 /**
  * Memory based cache, configured as singleton in spring configuration

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectSyncManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectSyncManager.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectSyncManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectSyncManager.java Thu Sep 12 05:28:14 2013
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.whiteboard.dto.WhiteboardSyncLockObject;
+import org.apache.openmeetings.db.dto.room.WhiteboardSyncLockObject;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java Thu Sep 12 05:28:14 2013
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.whiteboard.dto.WhiteboardObject;
+import org.apache.openmeetings.db.dto.room.WhiteboardObject;
 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/IDataProviderDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/IDataProviderDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/IDataProviderDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/IDataProviderDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.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;
+package org.apache.openmeetings.db.dao;
 
 import java.util.List;
 
-import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
 
 /**
  * General interface to perform CRUD operations on entities

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/chat/ChatDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/chat/ChatDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/chat/ChatDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.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.chat;
+package org.apache.openmeetings.db.dao.basic;
 
 import java.util.Date;
 import java.util.List;
@@ -24,7 +24,7 @@ import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import org.apache.openmeetings.persistence.beans.chat.ChatMessage;
+import org.apache.openmeetings.db.entity.basic.ChatMessage;
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.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.basic.dao;
+package org.apache.openmeetings.db.dao.basic;
 
-import static org.apache.openmeetings.persistence.beans.basic.Configuration.CRYPT_KEY;
+import static org.apache.openmeetings.db.entity.basic.Configuration.CRYPT_KEY;
 
 import java.lang.reflect.Constructor;
 import java.util.Arrays;
@@ -32,9 +32,9 @@ import javax.persistence.PersistenceCont
 import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.persistence.beans.basic.Configuration;
+import org.apache.openmeetings.db.dao.IDataProviderDao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.entity.basic.Configuration;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.apache.openmeetings.utils.DaoHelper;
 import org.apache.openmeetings.utils.mappings.CastMapToObject;

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ErrorDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ErrorDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ErrorDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.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.dao;
+package org.apache.openmeetings.db.dao.basic;
 
 import java.util.Date;
 import java.util.List;
@@ -27,8 +27,8 @@ import javax.persistence.PersistenceCont
 import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.basic.ErrorType;
-import org.apache.openmeetings.persistence.beans.basic.ErrorValue;
+import org.apache.openmeetings.db.entity.basic.ErrorType;
+import org.apache.openmeetings.db.entity.basic.ErrorValue;
 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/basic/MailMessageDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/MailMessageDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/MailMessageDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/MailMessageDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.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.dao;
+package org.apache.openmeetings.db.dao.basic;
 
 import java.util.Calendar;
 import java.util.List;
@@ -24,9 +24,9 @@ import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.persistence.beans.basic.MailMessage;
-import org.apache.openmeetings.persistence.beans.basic.MailMessage.Status;
+import org.apache.openmeetings.db.dao.IDataProviderDao;
+import org.apache.openmeetings.db.entity.basic.MailMessage;
+import org.apache.openmeetings.db.entity.basic.MailMessage.Status;
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/NaviBuilder.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/NaviBuilder.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/NaviBuilder.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.data.basic;
+package org.apache.openmeetings.db.dao.basic;
+
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -26,18 +28,17 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 
-import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.basic.Naviglobal;
-import org.apache.openmeetings.persistence.beans.basic.Navimain;
+import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
+import org.apache.openmeetings.db.entity.basic.Naviglobal;
+import org.apache.openmeetings.db.entity.basic.Navimain;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
-public class NaviBuilder {
-
-	private static final Logger log = Red5LoggerFactory.getLogger(NaviBuilder.class, OpenmeetingsVariables.webAppRootKey);
+public class NavigationDao {
+	private static final Logger log = Red5LoggerFactory.getLogger(NavigationDao.class, webAppRootKey);
 
 	@PersistenceContext
 	private EntityManager em;

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentCategoryDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentCategoryDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentCategoryDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentCategoryDao.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.calendar.daos;
+package org.apache.openmeetings.db.dao.calendar;
 
 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.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.calendar.AppointmentCategory;
 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/calendar/AppointmentDao.java (from r1522289, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java&r1=1522289&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.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.calendar.daos;
+package org.apache.openmeetings.db.dao.calendar;
 
 import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
 
@@ -33,16 +33,16 @@ import javax.persistence.NoResultExcepti
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 
-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.InvitationDao;
-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.calendar.Appointment;
-import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
-import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.room.InvitationDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.calendar.MeetingMember;
+import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.utils.TimezoneUtil;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.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.calendar.daos;
+package org.apache.openmeetings.db.dao.calendar;
 
 import java.util.Date;
 import java.util.List;
@@ -27,9 +27,9 @@ import javax.persistence.PersistenceCont
 import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.FieldLanguagesValuesDao;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
 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/calendar/MeetingMemberDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.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.calendar.daos;
+package org.apache.openmeetings.db.dao.calendar;
 
 import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
 
@@ -28,8 +28,8 @@ import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.PersistenceContext;
 
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.calendar.MeetingMember;
 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/file/FileExplorerItemDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dao/FileExplorerItemDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dao/FileExplorerItemDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dao/FileExplorerItemDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.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.dao;
+package org.apache.openmeetings.db.dao.file;
 
 import java.util.Date;
 import java.util.List;
@@ -27,7 +27,7 @@ import javax.persistence.PersistenceCont
 import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
+import org.apache.openmeetings.db.entity.file.FileExplorerItem;
 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/label/FieldLanguageDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldLanguageDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldLanguageDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldLanguageDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.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.label;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -28,7 +28,7 @@ import javax.persistence.PersistenceCont
 import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
+import org.apache.openmeetings.db.entity.label.FieldLanguage;
 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/label/FieldLanguagesValuesDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldLanguagesValuesDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguagesValuesDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguagesValuesDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldLanguagesValuesDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldLanguagesValuesDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguagesValuesDao.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.basic;
+package org.apache.openmeetings.db.dao.label;
 
-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.Date;
 import java.util.List;
@@ -28,9 +28,9 @@ import javax.persistence.NoResultExcepti
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 
-import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
+import org.apache.openmeetings.db.dao.IDataProviderDao;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
 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/label/FieldValueDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldValueDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldValueDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldValueDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/label/FieldValueDao.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.basic;
+package org.apache.openmeetings.db.dao.label;
 
-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;
@@ -28,10 +28,10 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 
-import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
+import org.apache.openmeetings.db.dao.IDataProviderDao;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
+import org.apache.openmeetings.db.entity.label.Fieldvalues;
 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/log/ConferenceLogDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/logs/ConferenceLogDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/logs/ConferenceLogDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/logs/ConferenceLogDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.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.logs;
+package org.apache.openmeetings.db.dao.log;
 
 import java.util.Date;
 
@@ -24,8 +24,8 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.logs.ConferenceLog;
-import org.apache.openmeetings.persistence.beans.logs.ConferenceLogType;
+import org.apache.openmeetings.db.entity.log.ConferenceLog;
+import org.apache.openmeetings.db.entity.log.ConferenceLogType;
 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/log/ConferenceLogTypeDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/logs/ConferenceLogTypeDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogTypeDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogTypeDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/logs/ConferenceLogTypeDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/logs/ConferenceLogTypeDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogTypeDao.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.logs;
+package org.apache.openmeetings.db.dao.log;
 
 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.logs.ConferenceLogType;
+import org.apache.openmeetings.db.entity.log.ConferenceLogType;
 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/record/FlvRecordingDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/FlvRecordingDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/FlvRecordingDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/FlvRecordingDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.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.flvrecord;
+package org.apache.openmeetings.db.dao.record;
 
 import java.util.Date;
 import java.util.List;
@@ -27,7 +27,7 @@ import javax.persistence.PersistenceCont
 import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
+import org.apache.openmeetings.db.entity.record.FlvRecording;
 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/record/FlvRecordingLogDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/FlvRecordingLogDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/FlvRecordingLogDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/FlvRecordingLogDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.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.flvrecord;
+package org.apache.openmeetings.db.dao.record;
 
 import java.util.Date;
 import java.util.List;
@@ -25,9 +25,9 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 
+import org.apache.openmeetings.db.entity.record.FlvRecording;
+import org.apache.openmeetings.db.entity.record.FlvRecordingLog;
 import org.apache.openmeetings.documents.beans.ConverterProcessResult;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog;
 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/record/FlvRecordingMetaDataDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDataDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDataDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDataDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.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.flvrecord;
+package org.apache.openmeetings.db.dao.record;
 
 import java.util.Date;
 import java.util.List;
@@ -27,7 +27,7 @@ import javax.persistence.PersistenceCont
 import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
+import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
 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/record/FlvRecordingMetaDeltaDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDeltaDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDeltaDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDeltaDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDeltaDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDeltaDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDeltaDao.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.flvrecord;
+package org.apache.openmeetings.db.dao.record;
 
 import java.util.List;
 
@@ -25,7 +25,7 @@ import javax.persistence.PersistenceCont
 import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaDelta;
+import org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta;
 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/room/ClientDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/ClientDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/ClientDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/ClientDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.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.conference.dao;
+package org.apache.openmeetings.db.dao.room;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,8 +26,8 @@ import javax.persistence.PersistenceCont
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
-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.springframework.transaction.annotation.Transactional;
 
 /**

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/InvitationDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/InvitationDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/InvitationDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.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.conference.dao;
+package org.apache.openmeetings.db.dao.room;
 
 import java.util.Date;
 
@@ -26,7 +26,7 @@ import javax.persistence.PersistenceCont
 import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.invitation.Invitation;
+import org.apache.openmeetings.db.entity.room.Invitation;
 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/room/PollDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/PollManager.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/PollManager.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/PollManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java Thu Sep 12 05:28:14 2013
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.data.conference;
+package org.apache.openmeetings.db.dao.room;
+
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
 
 import java.util.Date;
 import java.util.List;
@@ -28,21 +30,19 @@ import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
 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.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.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
-public class PollManager {
-	private static final Logger log = Red5LoggerFactory
-			.getLogger(PollManager.class);
+public class PollDao {
+	private static final Logger log = Red5LoggerFactory.getLogger(PollDao.class, webAppRootKey);
 
 	@PersistenceContext
 	private EntityManager em;

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/RoomDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/RoomDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/RoomDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.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.conference.dao;
+package org.apache.openmeetings.db.dao.room;
 
 import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
 
@@ -29,10 +29,10 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 
-import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.db.dao.IDataProviderDao;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.utils.DaoHelper;
 import org.apache.openmeetings.utils.TimezoneUtil;
 import org.red5.logging.Red5LoggerFactory;

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.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.conference.dao;
+package org.apache.openmeetings.db.dao.room;
 
 import java.util.Date;
 import java.util.Iterator;
@@ -30,8 +30,8 @@ import javax.persistence.PersistenceCont
 import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.persistence.beans.room.RoomModerator;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.room.RoomModerator;
+import org.apache.openmeetings.db.entity.user.User;
 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/room/SipDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/SipDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/SipDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/SipDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.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.conference.dao;
+package org.apache.openmeetings.db.dao.room;
 
 import org.asteriskjava.manager.ManagerConnection;
 import org.asteriskjava.manager.ManagerConnectionFactory;

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.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.dao;
+package org.apache.openmeetings.db.dao.server;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -29,9 +29,9 @@ import javax.persistence.PersistenceExce
 import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
+import org.apache.openmeetings.db.dao.IDataProviderDao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.entity.server.LdapConfig;
 import org.apache.openmeetings.utils.DaoHelper;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/oauth/OAuth2Dao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/oauth/OAuth2Dao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/oauth/OAuth2Dao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.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.oauth;
+package org.apache.openmeetings.db.dao.server;
 
 import java.util.List;
 
@@ -25,8 +25,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.oauth.OAuthServer;
+import org.apache.openmeetings.db.dao.IDataProviderDao;
+import org.apache.openmeetings.db.entity.server.OAuthServer;
 import org.apache.openmeetings.utils.DaoHelper;
 import org.springframework.transaction.annotation.Transactional;
 

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/SOAPLoginDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/SOAPLoginDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/SOAPLoginDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.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.dao;
+package org.apache.openmeetings.db.dao.server;
 
 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.basic.SOAPLogin;
+import org.apache.openmeetings.db.entity.server.SOAPLogin;
 import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ServerDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ServerDao.java&r1=1522099&r2=1522448&rev=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ServerDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.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.dao;
+package org.apache.openmeetings.db.dao.server;
 
 import java.util.Date;
 import java.util.List;
@@ -27,9 +27,9 @@ import javax.persistence.PersistenceCont
 import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.persistence.beans.basic.Server;
+import org.apache.openmeetings.db.dao.IDataProviderDao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.entity.server.Server;
 import org.apache.openmeetings.utils.DaoHelper;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;