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 [7/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/web/user/profile/MessageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java Thu Sep 12 05:28:14 2013
@@ -26,11 +26,11 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
-import org.apache.openmeetings.data.user.dao.PrivateMessagesDao;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.user.PrivateMessage;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.user.PrivateMessage;
import org.apache.openmeetings.utils.mail.MailHandler;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.util.ContactsHelper;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java Thu Sep 12 05:28:14 2013
@@ -29,13 +29,13 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.openmeetings.data.user.dao.PrivateMessageFolderDao;
-import org.apache.openmeetings.data.user.dao.PrivateMessagesDao;
-import org.apache.openmeetings.data.user.dao.UserContactsDao;
-import org.apache.openmeetings.persistence.beans.user.PrivateMessage;
-import org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder;
-import org.apache.openmeetings.persistence.beans.user.User;
-import org.apache.openmeetings.persistence.beans.user.UserContact;
+import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao;
+import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
+import org.apache.openmeetings.db.dao.user.UserContactsDao;
+import org.apache.openmeetings.db.entity.user.PrivateMessage;
+import org.apache.openmeetings.db.entity.user.PrivateMessageFolder;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.AddFolderDialog;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java Thu Sep 12 05:28:14 2013
@@ -21,8 +21,8 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.common.ComunityUserForm;
import org.apache.openmeetings.web.common.FormSaveRefreshPanel;
import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java Thu Sep 12 05:28:14 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.user.profile;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.GeneralUserForm;
import org.apache.wicket.markup.html.form.PasswordTextField;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java Thu Sep 12 05:28:14 2013
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.we
import java.util.Arrays;
import java.util.List;
-import org.apache.openmeetings.data.user.dao.UserContactsDao;
+import org.apache.openmeetings.db.dao.user.UserContactsDao;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.util.ContactsHelper;
import org.apache.wicket.ajax.AjaxRequestTarget;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java Thu Sep 12 05:28:14 2013
@@ -21,8 +21,8 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ProfileImagePanel;
import org.apache.openmeetings.web.common.UserPanel;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java Thu Sep 12 05:28:14 2013
@@ -28,9 +28,9 @@ import java.util.Iterator;
import java.util.List;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.UserContactsDao;
-import org.apache.openmeetings.persistence.beans.user.PrivateMessage;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.user.UserContactsDao;
+import org.apache.openmeetings.db.entity.user.PrivateMessage;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.web.common.PagingNavigatorPanel;
import org.apache.openmeetings.web.common.UserPanel;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java Thu Sep 12 05:28:14 2013
@@ -29,10 +29,10 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
+import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.record.FlvRecording;
+import org.apache.openmeetings.db.entity.user.Organisation_Users;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.AddFolderDialog;
import org.apache.openmeetings.web.common.ConfirmableAjaxLink;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java Thu Sep 12 05:28:14 2013
@@ -22,10 +22,10 @@ import java.io.File;
import java.io.FileInputStream;
import java.util.List;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.room.Client;
-import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.session.SessionManager;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.web.app.Application;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java Thu Sep 12 05:28:14 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.user.rooms;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.UserPanel;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java Thu Sep 12 05:28:14 2013
@@ -21,11 +21,11 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
-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.room.RoomDao;
+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.apache.openmeetings.web.common.UserPanel;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.markup.html.WebMarkupContainer;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java Thu Sep 12 05:28:14 2013
@@ -24,11 +24,11 @@ import static org.apache.openmeetings.we
import java.util.Date;
-import org.apache.openmeetings.data.user.dao.PrivateMessagesDao;
-import org.apache.openmeetings.data.user.dao.UserContactsDao;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.user.User;
-import org.apache.openmeetings.persistence.beans.user.UserContact;
+import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
+import org.apache.openmeetings.db.dao.user.UserContactsDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.apache.openmeetings.utils.mail.MailHandler;
import org.apache.openmeetings.utils.math.CalendarPatterns;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/Mp4RecordingResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/Mp4RecordingResourceReference.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/Mp4RecordingResourceReference.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/Mp4RecordingResourceReference.java Thu Sep 12 05:28:14 2013
@@ -23,7 +23,7 @@ import static org.apache.openmeetings.ut
import java.io.File;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
+import org.apache.openmeetings.db.entity.record.FlvRecording;
public class Mp4RecordingResourceReference extends RecordingResourceReference {
private static final long serialVersionUID = 6181482949621024822L;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/OggRecordingResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/OggRecordingResourceReference.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/OggRecordingResourceReference.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/OggRecordingResourceReference.java Thu Sep 12 05:28:14 2013
@@ -23,7 +23,7 @@ import static org.apache.openmeetings.ut
import java.io.File;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
+import org.apache.openmeetings.db.entity.record.FlvRecording;
public class OggRecordingResourceReference extends RecordingResourceReference {
private static final long serialVersionUID = 6181482949621024822L;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java Thu Sep 12 05:28:14 2013
@@ -31,10 +31,10 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.input.BoundedInputStream;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
+import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.record.FlvRecording;
+import org.apache.openmeetings.db.entity.user.Organisation_Users;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.protocol.http.servlet.ResponseIOException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java Thu Sep 12 05:28:14 2013
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.we
import java.util.List;
import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.persistence.beans.room.RoomType;
+import org.apache.openmeetings.db.entity.room.RoomType;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java Thu Sep 12 05:28:14 2013
@@ -24,8 +24,8 @@ import static org.apache.openmeetings.we
import java.util.List;
import java.util.Locale;
-import org.apache.openmeetings.data.user.dao.UserDao;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.convert.IConverter;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/xmlimport/LanguageImport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/xmlimport/LanguageImport.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/xmlimport/LanguageImport.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/xmlimport/LanguageImport.java Thu Sep 12 05:28:14 2013
@@ -22,10 +22,10 @@ import java.io.InputStream;
import java.util.Iterator;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.FieldLanguageDao;
import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
+import org.apache.openmeetings.db.dao.label.FieldLanguageDao;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
+import org.apache.openmeetings.db.entity.label.Fieldvalues;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml Thu Sep 12 05:28:14 2013
@@ -24,55 +24,55 @@
version="2.0">
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.apache.openmeetings.persistence.beans.basic.Configuration</class>
- <class>org.apache.openmeetings.persistence.beans.basic.ErrorType</class>
- <class>org.apache.openmeetings.persistence.beans.basic.ErrorValue</class>
- <class>org.apache.openmeetings.persistence.beans.basic.LdapConfig</class>
- <class>org.apache.openmeetings.persistence.beans.basic.MailMessage</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
- <class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Server</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.Appointment</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.MeetingMember</class>
- <class>org.apache.openmeetings.persistence.beans.chat.ChatMessage</class>
- <class>org.apache.openmeetings.persistence.beans.domain.Organisation</class>
- <class>org.apache.openmeetings.persistence.beans.domain.Organisation_Users</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
- <class>org.apache.openmeetings.persistence.beans.invitation.Invitation</class>
- <class>org.apache.openmeetings.persistence.beans.lang.FieldLanguage</class>
- <class>org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues</class>
- <class>org.apache.openmeetings.persistence.beans.lang.Fieldvalues</class>
- <class>org.apache.openmeetings.persistence.beans.logs.ConferenceLog</class>
- <class>org.apache.openmeetings.persistence.beans.logs.ConferenceLogType</class>
- <class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
- <class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
- <class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
- <class>org.apache.openmeetings.persistence.beans.room.Client</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomModerator</class>
- <class>org.apache.openmeetings.persistence.beans.room.Room</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomType</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomOrganisation</class>
- <class>org.apache.openmeetings.persistence.beans.room.Whiteboard</class>
- <class>org.apache.openmeetings.persistence.beans.room.WhiteboardItem</class>
- <class>org.apache.openmeetings.persistence.beans.user.Address</class>
- <class>org.apache.openmeetings.persistence.beans.user.State</class>
- <class>org.apache.openmeetings.persistence.beans.user.PrivateMessage</class>
- <class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
- <class>org.apache.openmeetings.persistence.beans.user.Salutation</class>
- <class>org.apache.openmeetings.persistence.beans.user.UserContact</class>
- <class>org.apache.openmeetings.persistence.beans.user.Userdata</class>
- <class>org.apache.openmeetings.persistence.beans.user.Userlevel</class>
- <class>org.apache.openmeetings.persistence.beans.user.User</class>
- <class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
- <class>org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUser</class>
- <class>org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer</class>
+ <class>org.apache.openmeetings.db.entity.basic.Configuration</class>
+ <class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
+ <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
+ <class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
+ <class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
+ <class>org.apache.openmeetings.db.entity.basic.Naviglobal</class>
+ <class>org.apache.openmeetings.db.entity.basic.Navimain</class>
+ <class>org.apache.openmeetings.db.entity.server.Sessiondata</class>
+ <class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
+ <class>org.apache.openmeetings.db.entity.server.Server</class>
+ <class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
+ <class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
+ <class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
+ <class>org.apache.openmeetings.db.entity.user.Organisation</class>
+ <class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta</class>
+ <class>org.apache.openmeetings.db.entity.room.Invitation</class>
+ <class>org.apache.openmeetings.db.entity.label.FieldLanguage</class>
+ <class>org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues</class>
+ <class>org.apache.openmeetings.db.entity.label.Fieldvalues</class>
+ <class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
+ <class>org.apache.openmeetings.db.entity.log.ConferenceLogType</class>
+ <class>org.apache.openmeetings.db.entity.room.PollType</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomPollAnswers</class>
+ <class>org.apache.openmeetings.db.entity.room.Client</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
+ <class>org.apache.openmeetings.db.entity.room.Room</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomType</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
+ <class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
+ <class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
+ <class>org.apache.openmeetings.db.entity.user.Address</class>
+ <class>org.apache.openmeetings.db.entity.user.State</class>
+ <class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
+ <class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
+ <class>org.apache.openmeetings.db.entity.user.Salutation</class>
+ <class>org.apache.openmeetings.db.entity.user.UserContact</class>
+ <class>org.apache.openmeetings.db.entity.user.Userdata</class>
+ <class>org.apache.openmeetings.db.entity.user.Userlevel</class>
+ <class>org.apache.openmeetings.db.entity.user.User</class>
+ <class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class>
+ <class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class>
+ <class>org.apache.openmeetings.db.entity.server.OAuthServer</class>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml Thu Sep 12 05:28:14 2013
@@ -24,55 +24,55 @@
version="2.0">
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.apache.openmeetings.persistence.beans.basic.Configuration</class>
- <class>org.apache.openmeetings.persistence.beans.basic.ErrorType</class>
- <class>org.apache.openmeetings.persistence.beans.basic.ErrorValue</class>
- <class>org.apache.openmeetings.persistence.beans.basic.LdapConfig</class>
- <class>org.apache.openmeetings.persistence.beans.basic.MailMessage</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
- <class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Server</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.Appointment</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.MeetingMember</class>
- <class>org.apache.openmeetings.persistence.beans.chat.ChatMessage</class>
- <class>org.apache.openmeetings.persistence.beans.domain.Organisation</class>
- <class>org.apache.openmeetings.persistence.beans.domain.Organisation_Users</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
- <class>org.apache.openmeetings.persistence.beans.invitation.Invitation</class>
- <class>org.apache.openmeetings.persistence.beans.lang.FieldLanguage</class>
- <class>org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues</class>
- <class>org.apache.openmeetings.persistence.beans.lang.Fieldvalues</class>
- <class>org.apache.openmeetings.persistence.beans.logs.ConferenceLog</class>
- <class>org.apache.openmeetings.persistence.beans.logs.ConferenceLogType</class>
- <class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
- <class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
- <class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
- <class>org.apache.openmeetings.persistence.beans.room.Client</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomModerator</class>
- <class>org.apache.openmeetings.persistence.beans.room.Room</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomType</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomOrganisation</class>
- <class>org.apache.openmeetings.persistence.beans.room.Whiteboard</class>
- <class>org.apache.openmeetings.persistence.beans.room.WhiteboardItem</class>
- <class>org.apache.openmeetings.persistence.beans.user.Address</class>
- <class>org.apache.openmeetings.persistence.beans.user.State</class>
- <class>org.apache.openmeetings.persistence.beans.user.PrivateMessage</class>
- <class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
- <class>org.apache.openmeetings.persistence.beans.user.Salutation</class>
- <class>org.apache.openmeetings.persistence.beans.user.UserContact</class>
- <class>org.apache.openmeetings.persistence.beans.user.Userdata</class>
- <class>org.apache.openmeetings.persistence.beans.user.Userlevel</class>
- <class>org.apache.openmeetings.persistence.beans.user.User</class>
- <class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
- <class>org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUser</class>
- <class>org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer</class>
+ <class>org.apache.openmeetings.db.entity.basic.Configuration</class>
+ <class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
+ <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
+ <class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
+ <class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
+ <class>org.apache.openmeetings.db.entity.basic.Naviglobal</class>
+ <class>org.apache.openmeetings.db.entity.basic.Navimain</class>
+ <class>org.apache.openmeetings.db.entity.server.Sessiondata</class>
+ <class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
+ <class>org.apache.openmeetings.db.entity.server.Server</class>
+ <class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
+ <class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
+ <class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
+ <class>org.apache.openmeetings.db.entity.user.Organisation</class>
+ <class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta</class>
+ <class>org.apache.openmeetings.db.entity.room.Invitation</class>
+ <class>org.apache.openmeetings.db.entity.label.FieldLanguage</class>
+ <class>org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues</class>
+ <class>org.apache.openmeetings.db.entity.label.Fieldvalues</class>
+ <class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
+ <class>org.apache.openmeetings.db.entity.log.ConferenceLogType</class>
+ <class>org.apache.openmeetings.db.entity.room.PollType</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomPollAnswers</class>
+ <class>org.apache.openmeetings.db.entity.room.Client</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
+ <class>org.apache.openmeetings.db.entity.room.Room</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomType</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
+ <class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
+ <class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
+ <class>org.apache.openmeetings.db.entity.user.Address</class>
+ <class>org.apache.openmeetings.db.entity.user.State</class>
+ <class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
+ <class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
+ <class>org.apache.openmeetings.db.entity.user.Salutation</class>
+ <class>org.apache.openmeetings.db.entity.user.UserContact</class>
+ <class>org.apache.openmeetings.db.entity.user.Userdata</class>
+ <class>org.apache.openmeetings.db.entity.user.Userlevel</class>
+ <class>org.apache.openmeetings.db.entity.user.User</class>
+ <class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class>
+ <class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class>
+ <class>org.apache.openmeetings.db.entity.server.OAuthServer</class>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml Thu Sep 12 05:28:14 2013
@@ -24,55 +24,55 @@
version="2.0">
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.apache.openmeetings.persistence.beans.basic.Configuration</class>
- <class>org.apache.openmeetings.persistence.beans.basic.ErrorType</class>
- <class>org.apache.openmeetings.persistence.beans.basic.ErrorValue</class>
- <class>org.apache.openmeetings.persistence.beans.basic.LdapConfig</class>
- <class>org.apache.openmeetings.persistence.beans.basic.MailMessage</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
- <class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Server</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.Appointment</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.MeetingMember</class>
- <class>org.apache.openmeetings.persistence.beans.chat.ChatMessage</class>
- <class>org.apache.openmeetings.persistence.beans.domain.Organisation</class>
- <class>org.apache.openmeetings.persistence.beans.domain.Organisation_Users</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
- <class>org.apache.openmeetings.persistence.beans.invitation.Invitation</class>
- <class>org.apache.openmeetings.persistence.beans.lang.FieldLanguage</class>
- <class>org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues</class>
- <class>org.apache.openmeetings.persistence.beans.lang.Fieldvalues</class>
- <class>org.apache.openmeetings.persistence.beans.logs.ConferenceLog</class>
- <class>org.apache.openmeetings.persistence.beans.logs.ConferenceLogType</class>
- <class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
- <class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
- <class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
- <class>org.apache.openmeetings.persistence.beans.room.Client</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomModerator</class>
- <class>org.apache.openmeetings.persistence.beans.room.Room</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomType</class>
- <class>org.apache.openmeetings.persistence.beans.room.Whiteboard</class>
- <class>org.apache.openmeetings.persistence.beans.room.WhiteboardItem</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomOrganisation</class>
- <class>org.apache.openmeetings.persistence.beans.user.Address</class>
- <class>org.apache.openmeetings.persistence.beans.user.State</class>
- <class>org.apache.openmeetings.persistence.beans.user.PrivateMessage</class>
- <class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
- <class>org.apache.openmeetings.persistence.beans.user.Salutation</class>
- <class>org.apache.openmeetings.persistence.beans.user.UserContact</class>
- <class>org.apache.openmeetings.persistence.beans.user.Userdata</class>
- <class>org.apache.openmeetings.persistence.beans.user.Userlevel</class>
- <class>org.apache.openmeetings.persistence.beans.user.User</class>
- <class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
- <class>org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUser</class>
- <class>org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer</class>
+ <class>org.apache.openmeetings.db.entity.basic.Configuration</class>
+ <class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
+ <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
+ <class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
+ <class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
+ <class>org.apache.openmeetings.db.entity.basic.Naviglobal</class>
+ <class>org.apache.openmeetings.db.entity.basic.Navimain</class>
+ <class>org.apache.openmeetings.db.entity.server.Sessiondata</class>
+ <class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
+ <class>org.apache.openmeetings.db.entity.server.Server</class>
+ <class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
+ <class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
+ <class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
+ <class>org.apache.openmeetings.db.entity.user.Organisation</class>
+ <class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta</class>
+ <class>org.apache.openmeetings.db.entity.room.Invitation</class>
+ <class>org.apache.openmeetings.db.entity.label.FieldLanguage</class>
+ <class>org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues</class>
+ <class>org.apache.openmeetings.db.entity.label.Fieldvalues</class>
+ <class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
+ <class>org.apache.openmeetings.db.entity.log.ConferenceLogType</class>
+ <class>org.apache.openmeetings.db.entity.room.PollType</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomPollAnswers</class>
+ <class>org.apache.openmeetings.db.entity.room.Client</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
+ <class>org.apache.openmeetings.db.entity.room.Room</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomType</class>
+ <class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
+ <class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
+ <class>org.apache.openmeetings.db.entity.user.Address</class>
+ <class>org.apache.openmeetings.db.entity.user.State</class>
+ <class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
+ <class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
+ <class>org.apache.openmeetings.db.entity.user.Salutation</class>
+ <class>org.apache.openmeetings.db.entity.user.UserContact</class>
+ <class>org.apache.openmeetings.db.entity.user.Userdata</class>
+ <class>org.apache.openmeetings.db.entity.user.Userlevel</class>
+ <class>org.apache.openmeetings.db.entity.user.User</class>
+ <class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class>
+ <class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class>
+ <class>org.apache.openmeetings.db.entity.server.OAuthServer</class>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml Thu Sep 12 05:28:14 2013
@@ -24,55 +24,55 @@
version="2.0">
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.apache.openmeetings.persistence.beans.basic.Configuration</class>
- <class>org.apache.openmeetings.persistence.beans.basic.ErrorType</class>
- <class>org.apache.openmeetings.persistence.beans.basic.ErrorValue</class>
- <class>org.apache.openmeetings.persistence.beans.basic.LdapConfig</class>
- <class>org.apache.openmeetings.persistence.beans.basic.MailMessage</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
- <class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Server</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.Appointment</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.MeetingMember</class>
- <class>org.apache.openmeetings.persistence.beans.chat.ChatMessage</class>
- <class>org.apache.openmeetings.persistence.beans.domain.Organisation</class>
- <class>org.apache.openmeetings.persistence.beans.domain.Organisation_Users</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
- <class>org.apache.openmeetings.persistence.beans.invitation.Invitation</class>
- <class>org.apache.openmeetings.persistence.beans.lang.FieldLanguage</class>
- <class>org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues</class>
- <class>org.apache.openmeetings.persistence.beans.lang.Fieldvalues</class>
- <class>org.apache.openmeetings.persistence.beans.logs.ConferenceLog</class>
- <class>org.apache.openmeetings.persistence.beans.logs.ConferenceLogType</class>
- <class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
- <class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
- <class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
- <class>org.apache.openmeetings.persistence.beans.room.Client</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomModerator</class>
- <class>org.apache.openmeetings.persistence.beans.room.Room</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomType</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomOrganisation</class>
- <class>org.apache.openmeetings.persistence.beans.room.Whiteboard</class>
- <class>org.apache.openmeetings.persistence.beans.room.WhiteboardItem</class>
- <class>org.apache.openmeetings.persistence.beans.user.Address</class>
- <class>org.apache.openmeetings.persistence.beans.user.State</class>
- <class>org.apache.openmeetings.persistence.beans.user.PrivateMessage</class>
- <class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
- <class>org.apache.openmeetings.persistence.beans.user.Salutation</class>
- <class>org.apache.openmeetings.persistence.beans.user.UserContact</class>
- <class>org.apache.openmeetings.persistence.beans.user.Userdata</class>
- <class>org.apache.openmeetings.persistence.beans.user.Userlevel</class>
- <class>org.apache.openmeetings.persistence.beans.user.User</class>
- <class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
- <class>org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUser</class>
- <class>org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer</class>
+ <class>org.apache.openmeetings.db.entity.basic.Configuration</class>
+ <class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
+ <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
+ <class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
+ <class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
+ <class>org.apache.openmeetings.db.entity.basic.Naviglobal</class>
+ <class>org.apache.openmeetings.db.entity.basic.Navimain</class>
+ <class>org.apache.openmeetings.db.entity.server.Sessiondata</class>
+ <class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
+ <class>org.apache.openmeetings.db.entity.server.Server</class>
+ <class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
+ <class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
+ <class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
+ <class>org.apache.openmeetings.db.entity.user.Organisation</class>
+ <class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta</class>
+ <class>org.apache.openmeetings.db.entity.room.Invitation</class>
+ <class>org.apache.openmeetings.db.entity.label.FieldLanguage</class>
+ <class>org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues</class>
+ <class>org.apache.openmeetings.db.entity.label.Fieldvalues</class>
+ <class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
+ <class>org.apache.openmeetings.db.entity.log.ConferenceLogType</class>
+ <class>org.apache.openmeetings.db.entity.room.PollType</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomPollAnswers</class>
+ <class>org.apache.openmeetings.db.entity.room.Client</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
+ <class>org.apache.openmeetings.db.entity.room.Room</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomType</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
+ <class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
+ <class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
+ <class>org.apache.openmeetings.db.entity.user.Address</class>
+ <class>org.apache.openmeetings.db.entity.user.State</class>
+ <class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
+ <class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
+ <class>org.apache.openmeetings.db.entity.user.Salutation</class>
+ <class>org.apache.openmeetings.db.entity.user.UserContact</class>
+ <class>org.apache.openmeetings.db.entity.user.Userdata</class>
+ <class>org.apache.openmeetings.db.entity.user.Userlevel</class>
+ <class>org.apache.openmeetings.db.entity.user.User</class>
+ <class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class>
+ <class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class>
+ <class>org.apache.openmeetings.db.entity.server.OAuthServer</class>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/postgres_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/postgres_persistence.xml?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/postgres_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/postgres_persistence.xml Thu Sep 12 05:28:14 2013
@@ -24,55 +24,55 @@
version="2.0">
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.apache.openmeetings.persistence.beans.basic.Configuration</class>
- <class>org.apache.openmeetings.persistence.beans.basic.ErrorType</class>
- <class>org.apache.openmeetings.persistence.beans.basic.ErrorValue</class>
- <class>org.apache.openmeetings.persistence.beans.basic.LdapConfig</class>
- <class>org.apache.openmeetings.persistence.beans.basic.MailMessage</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
- <class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
- <class>org.apache.openmeetings.persistence.beans.basic.Server</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.Appointment</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps</class>
- <class>org.apache.openmeetings.persistence.beans.calendar.MeetingMember</class>
- <class>org.apache.openmeetings.persistence.beans.chat.ChatMessage</class>
- <class>org.apache.openmeetings.persistence.beans.domain.Organisation</class>
- <class>org.apache.openmeetings.persistence.beans.domain.Organisation_Users</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData</class>
- <class>org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
- <class>org.apache.openmeetings.persistence.beans.invitation.Invitation</class>
- <class>org.apache.openmeetings.persistence.beans.lang.FieldLanguage</class>
- <class>org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues</class>
- <class>org.apache.openmeetings.persistence.beans.lang.Fieldvalues</class>
- <class>org.apache.openmeetings.persistence.beans.logs.ConferenceLog</class>
- <class>org.apache.openmeetings.persistence.beans.logs.ConferenceLogType</class>
- <class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
- <class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
- <class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
- <class>org.apache.openmeetings.persistence.beans.room.Client</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomModerator</class>
- <class>org.apache.openmeetings.persistence.beans.room.Room</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomType</class>
- <class>org.apache.openmeetings.persistence.beans.room.RoomOrganisation</class>
- <class>org.apache.openmeetings.persistence.beans.room.Whiteboard</class>
- <class>org.apache.openmeetings.persistence.beans.room.WhiteboardItem</class>
- <class>org.apache.openmeetings.persistence.beans.user.Address</class>
- <class>org.apache.openmeetings.persistence.beans.user.State</class>
- <class>org.apache.openmeetings.persistence.beans.user.PrivateMessage</class>
- <class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
- <class>org.apache.openmeetings.persistence.beans.user.Salutation</class>
- <class>org.apache.openmeetings.persistence.beans.user.UserContact</class>
- <class>org.apache.openmeetings.persistence.beans.user.Userdata</class>
- <class>org.apache.openmeetings.persistence.beans.user.Userlevel</class>
- <class>org.apache.openmeetings.persistence.beans.user.User</class>
- <class>org.apache.openmeetings.persistence.beans.files.FileExplorerItem</class>
- <class>org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUser</class>
- <class>org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer</class>
+ <class>org.apache.openmeetings.db.entity.basic.Configuration</class>
+ <class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
+ <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
+ <class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
+ <class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
+ <class>org.apache.openmeetings.db.entity.basic.Naviglobal</class>
+ <class>org.apache.openmeetings.db.entity.basic.Navimain</class>
+ <class>org.apache.openmeetings.db.entity.server.Sessiondata</class>
+ <class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
+ <class>org.apache.openmeetings.db.entity.server.Server</class>
+ <class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
+ <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
+ <class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
+ <class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
+ <class>org.apache.openmeetings.db.entity.user.Organisation</class>
+ <class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
+ <class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta</class>
+ <class>org.apache.openmeetings.db.entity.room.Invitation</class>
+ <class>org.apache.openmeetings.db.entity.label.FieldLanguage</class>
+ <class>org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues</class>
+ <class>org.apache.openmeetings.db.entity.label.Fieldvalues</class>
+ <class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
+ <class>org.apache.openmeetings.db.entity.log.ConferenceLogType</class>
+ <class>org.apache.openmeetings.db.entity.room.PollType</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomPollAnswers</class>
+ <class>org.apache.openmeetings.db.entity.room.Client</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
+ <class>org.apache.openmeetings.db.entity.room.Room</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomType</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
+ <class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
+ <class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
+ <class>org.apache.openmeetings.db.entity.user.Address</class>
+ <class>org.apache.openmeetings.db.entity.user.State</class>
+ <class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
+ <class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
+ <class>org.apache.openmeetings.db.entity.user.Salutation</class>
+ <class>org.apache.openmeetings.db.entity.user.UserContact</class>
+ <class>org.apache.openmeetings.db.entity.user.Userdata</class>
+ <class>org.apache.openmeetings.db.entity.user.Userlevel</class>
+ <class>org.apache.openmeetings.db.entity.user.User</class>
+ <class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class>
+ <class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class>
+ <class>org.apache.openmeetings.db.entity.server.OAuthServer</class>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Thu Sep 12 05:28:14 2013
@@ -226,11 +226,11 @@
<!-- End of Services -->
<!-- Interface Transactional -->
- <bean id="appointmentReminderTypDaoImpl" class="org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao" />
- <bean id="appointmentCategoryDaoImpl" class="org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao" />
+ <bean id="appointmentReminderTypDaoImpl" class="org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao" />
+ <bean id="appointmentCategoryDaoImpl" class="org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao" />
<bean id="roommanagement" class="org.apache.openmeetings.data.conference.RoomManager" />
- <bean id="roomDao" class="org.apache.openmeetings.data.conference.dao.RoomDao"/>
- <bean id="sipDao" class="org.apache.openmeetings.data.conference.dao.SipDao">
+ <bean id="roomDao" class="org.apache.openmeetings.db.dao.room.RoomDao"/>
+ <bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao">
<!-- Should be uncommented and updated with real values for Asterisk
<constructor-arg><value>127.0.0.1</value></constructor-arg>
<constructor-arg><value>5038</value></constructor-arg>
@@ -238,48 +238,48 @@
<constructor-arg><value>12345</value></constructor-arg>
-->
</bean>
- <bean id="invitationDao" class="org.apache.openmeetings.data.conference.dao.InvitationDao" />
+ <bean id="invitationDao" class="org.apache.openmeetings.db.dao.room.InvitationDao" />
<bean id="organisationmanagement" class="org.apache.openmeetings.data.user.OrganisationManager" />
- <bean id="organisationDao" class="org.apache.openmeetings.data.user.dao.OrganisationDao" />
- <bean id="organisationUserDao" class="org.apache.openmeetings.data.user.dao.OrganisationUserDao" />
- <bean id="salutationmanagement" class="org.apache.openmeetings.data.user.dao.SalutationDao" />
- <bean id="errorManagement" class="org.apache.openmeetings.data.basic.dao.ErrorDao" />
- <bean id="navimanagement" class="org.apache.openmeetings.data.basic.NaviBuilder" />
- <bean id="pollManagement" class="org.apache.openmeetings.data.conference.PollManager" />
- <bean id="statemanagement" class="org.apache.openmeetings.data.user.dao.StateDao" />
- <bean id="fieldLanguageDaoImpl" class="org.apache.openmeetings.data.basic.FieldLanguageDao" />
- <bean id="fieldValueDaoImpl" class="org.apache.openmeetings.data.basic.FieldValueDao" />
- <bean id="fieldLanguagesValuesDAO" class="org.apache.openmeetings.data.basic.FieldLanguagesValuesDao" />
+ <bean id="organisationDao" class="org.apache.openmeetings.db.dao.user.OrganisationDao" />
+ <bean id="organisationUserDao" class="org.apache.openmeetings.db.dao.user.OrganisationUserDao" />
+ <bean id="salutationmanagement" class="org.apache.openmeetings.db.dao.user.SalutationDao" />
+ <bean id="errorManagement" class="org.apache.openmeetings.db.dao.basic.ErrorDao" />
+ <bean id="navimanagement" class="org.apache.openmeetings.db.dao.basic.NavigationDao" />
+ <bean id="pollManagement" class="org.apache.openmeetings.db.dao.room.PollDao" />
+ <bean id="statemanagement" class="org.apache.openmeetings.db.dao.user.StateDao" />
+ <bean id="fieldLanguageDaoImpl" class="org.apache.openmeetings.db.dao.label.FieldLanguageDao" />
+ <bean id="fieldValueDaoImpl" class="org.apache.openmeetings.db.dao.label.FieldValueDao" />
+ <bean id="fieldLanguagesValuesDAO" class="org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao" />
<bean id="fieldmanagment" class="org.apache.openmeetings.data.basic.FieldManager" />
- <bean id="configurationDaoImpl" class="org.apache.openmeetings.data.basic.dao.ConfigurationDao" />
- <bean id="appointmentDao" class="org.apache.openmeetings.data.calendar.daos.AppointmentDao" />
+ <bean id="configurationDaoImpl" class="org.apache.openmeetings.db.dao.basic.ConfigurationDao" />
+ <bean id="appointmentDao" class="org.apache.openmeetings.db.dao.calendar.AppointmentDao" />
<bean id="appointmentLogic" class="org.apache.openmeetings.data.calendar.management.AppointmentLogic" />
- <bean id="sessionManagement" class="org.apache.openmeetings.data.basic.SessiondataDao" />
+ <bean id="sessionManagement" class="org.apache.openmeetings.db.dao.server.SessiondataDao" />
<bean id="userManagement" class="org.apache.openmeetings.data.user.UserManager" />
- <bean id="roomModeratorsDao" class="org.apache.openmeetings.data.conference.dao.RoomModeratorsDao" />
- <bean id="conferenceLogDao" class="org.apache.openmeetings.data.logs.ConferenceLogDao" />
- <bean id="conferenceLogTypeDao" class="org.apache.openmeetings.data.logs.ConferenceLogTypeDao" />
+ <bean id="roomModeratorsDao" class="org.apache.openmeetings.db.dao.room.RoomModeratorsDao" />
+ <bean id="conferenceLogDao" class="org.apache.openmeetings.db.dao.log.ConferenceLogDao" />
+ <bean id="conferenceLogTypeDao" class="org.apache.openmeetings.db.dao.log.ConferenceLogTypeDao" />
<bean id="emailManagement" class="org.apache.openmeetings.data.user.EmailManager" />
- <bean id="fileExplorerItemDao" class="org.apache.openmeetings.data.file.dao.FileExplorerItemDao" />
- <bean id="flvRecordingDao" class="org.apache.openmeetings.data.flvrecord.FlvRecordingDao" />
- <bean id="flvRecordingLogDao" class="org.apache.openmeetings.data.flvrecord.FlvRecordingLogDao" />
- <bean id="flvRecordingMetaDataDao" class="org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao" />
- <bean id="flvRecordingMetaDeltaDao" class="org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDeltaDao" />
- <bean id="ldapConfigDao" class="org.apache.openmeetings.data.basic.dao.LdapConfigDao" />
+ <bean id="fileExplorerItemDao" class="org.apache.openmeetings.db.dao.file.FileExplorerItemDao" />
+ <bean id="flvRecordingDao" class="org.apache.openmeetings.db.dao.record.FlvRecordingDao" />
+ <bean id="flvRecordingLogDao" class="org.apache.openmeetings.db.dao.record.FlvRecordingLogDao" />
+ <bean id="flvRecordingMetaDataDao" class="org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao" />
+ <bean id="flvRecordingMetaDeltaDao" class="org.apache.openmeetings.db.dao.record.FlvRecordingMetaDeltaDao" />
+ <bean id="ldapConfigDao" class="org.apache.openmeetings.db.dao.server.LdapConfigDao" />
<bean id="invitationManagement" class="org.apache.openmeetings.data.conference.InvitationManager" />
- <bean id="meetingMemberDao" class="org.apache.openmeetings.data.calendar.daos.MeetingMemberDao" />
- <bean id="privateMessageFolderDao" class="org.apache.openmeetings.data.user.dao.PrivateMessageFolderDao" />
- <bean id="privateMessagesDao" class="org.apache.openmeetings.data.user.dao.PrivateMessagesDao" />
- <bean id="soapLoginDao" class="org.apache.openmeetings.data.basic.dao.SOAPLoginDao" />
- <bean id="userContactsDao" class="org.apache.openmeetings.data.user.dao.UserContactsDao" />
- <bean id="dao" class="org.apache.openmeetings.data.user.dao.AbstractUserDao" />
- <bean id="usersDao" class="org.apache.openmeetings.data.user.dao.UserDao" />
- <bean id="adminUserDao" class="org.apache.openmeetings.data.user.dao.AdminUserDao" />
- <bean id="serverDao" class="org.apache.openmeetings.data.basic.dao.ServerDao" />
- <bean id="chatDao" class="org.apache.openmeetings.data.chat.ChatDao" />
- <bean id="clientDao" class="org.apache.openmeetings.data.conference.dao.ClientDao" />
- <bean id="mailMessageDao" class="org.apache.openmeetings.data.basic.dao.MailMessageDao" />
- <bean id="oauth2Dao" class="org.apache.openmeetings.data.oauth.OAuth2Dao" />
+ <bean id="meetingMemberDao" class="org.apache.openmeetings.db.dao.calendar.MeetingMemberDao" />
+ <bean id="privateMessageFolderDao" class="org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao" />
+ <bean id="privateMessagesDao" class="org.apache.openmeetings.db.dao.user.PrivateMessagesDao" />
+ <bean id="soapLoginDao" class="org.apache.openmeetings.db.dao.server.SOAPLoginDao" />
+ <bean id="userContactsDao" class="org.apache.openmeetings.db.dao.user.UserContactsDao" />
+ <bean id="dao" class="org.apache.openmeetings.db.dao.user.AbstractUserDao" />
+ <bean id="usersDao" class="org.apache.openmeetings.db.dao.user.UserDao" />
+ <bean id="adminUserDao" class="org.apache.openmeetings.db.dao.user.AdminUserDao" />
+ <bean id="serverDao" class="org.apache.openmeetings.db.dao.server.ServerDao" />
+ <bean id="chatDao" class="org.apache.openmeetings.db.dao.basic.ChatDao" />
+ <bean id="clientDao" class="org.apache.openmeetings.db.dao.room.ClientDao" />
+ <bean id="mailMessageDao" class="org.apache.openmeetings.db.dao.basic.MailMessageDao" />
+ <bean id="oauth2Dao" class="org.apache.openmeetings.db.dao.server.OAuth2Dao" />
<!-- No Interface -->
<bean id="manageCryptStyle" class="org.apache.openmeetings.utils.crypt.ManageCryptStyle" />
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java Thu Sep 12 05:28:14 2013
@@ -24,14 +24,14 @@ import static org.junit.Assert.fail;
import java.util.Date;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.UserDao;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.installation.ImportInitvalues;
import org.apache.openmeetings.installation.InstallationConfig;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
-import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.junit.Before;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java Thu Sep 12 05:28:14 2013
@@ -25,12 +25,12 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.io.FileInputStream;
-import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
-import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
import org.apache.openmeetings.data.conference.RoomManager;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
-import org.apache.openmeetings.data.user.dao.AdminUserDao;
-import org.apache.openmeetings.data.user.dao.OrganisationDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
+import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.dao.user.OrganisationDao;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.apache.openmeetings.utils.BackupImport;
import org.junit.Test;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java Thu Sep 12 05:28:14 2013
@@ -23,9 +23,9 @@ import static org.junit.Assert.assertTru
import java.util.Calendar;
-import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java Thu Sep 12 05:28:14 2013
@@ -27,8 +27,8 @@ import java.util.Iterator;
import java.util.List;
import org.apache.log4j.Logger;
-import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java Thu Sep 12 05:28:14 2013
@@ -24,8 +24,8 @@ import java.util.Calendar;
import java.util.List;
import org.apache.log4j.Logger;
-import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
-import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
+import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java Thu Sep 12 05:28:14 2013
@@ -21,8 +21,8 @@ package org.apache.openmeetings.test.cal
import java.util.List;
import org.apache.log4j.Logger;
-import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao;
-import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
+import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
+import org.apache.openmeetings.db.entity.calendar.AppointmentCategory;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java Thu Sep 12 05:28:14 2013
@@ -22,8 +22,8 @@ import java.util.Calendar;
import java.util.List;
import org.apache.log4j.Logger;
-import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
-import org.apache.openmeetings.persistence.beans.calendar.Appointment;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java Thu Sep 12 05:28:14 2013
@@ -19,7 +19,7 @@
package org.apache.openmeetings.test.calendar;
import org.apache.log4j.Logger;
-import org.apache.openmeetings.data.user.dao.UserDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureMeetingMember.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureMeetingMember.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureMeetingMember.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureMeetingMember.java Thu Sep 12 05:28:14 2013
@@ -19,7 +19,7 @@
package org.apache.openmeetings.test.calendar;
-import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
+import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java Thu Sep 12 05:28:14 2013
@@ -21,7 +21,7 @@ package org.apache.openmeetings.test.cal
import org.apache.log4j.Logger;
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java Thu Sep 12 05:28:14 2013
@@ -24,7 +24,7 @@ import java.util.Calendar;
import java.util.GregorianCalendar;
import org.apache.log4j.Logger;
-import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java?rev=1522448&r1=1522447&r2=1522448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java Thu Sep 12 05:28:14 2013
@@ -61,7 +61,7 @@ import net.fortuna.ical4j.model.property
import net.fortuna.ical4j.util.UidGenerator;
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.test.AbstractOpenmeetingsSpringTest;
import org.apache.openmeetings.utils.mail.ByteArrayDataSource;
import org.apache.openmeetings.utils.mail.IcalHandler;