openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebawag...@apache.org
Subject svn commit: r1442455 [1/5] - in /openmeetings/trunk/singlewebapp: docs/ src/META-INF/ src/org/apache/openmeetings/axis/services/ src/org/apache/openmeetings/backup/ src/org/apache/openmeetings/cli/ src/org/apache/openmeetings/data/basic/ src/org/apache...
Date Tue, 05 Feb 2013 02:44:05 GMT
Author: sebawagner
Date: Tue Feb  5 02:44:03 2013
New Revision: 1442455

URL: http://svn.apache.org/viewvc?rev=1442455&view=rev
Log:
OPENMEETINGS-460 Restructure address object to be in user-package, rename user and room entities and connected entities in the same package to single Object name. Re-factor all possible queries based on those objects to NamedQueries (some for the user and room are missing).
Rename some tables to reflect the new entity names.
Backup seems to work fine with the new Entity names.

Added:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/
      - copied from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java
      - copied, changed from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomModerator.java
      - copied, changed from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomModerators.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomOrganisation.java
      - copied, changed from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms_Organisation.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomType.java
      - copied, changed from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomTypes.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Address.java
      - copied, changed from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/Adresses.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java
      - copied, changed from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessages.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Salutation.java
      - copied, changed from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Salutations.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/State.java
      - copied, changed from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/States.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java
      - copied, changed from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContact.java
      - copied, changed from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContacts.java
Removed:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomModerators.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomTypes.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Rooms.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Rooms_Organisation.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessages.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Salutations.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContacts.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
Modified:
    openmeetings/trunk/singlewebapp/docs/RoomService.html
    openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
    openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
    openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
    openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
    openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomConverter.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomTypeConverter.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/StateConverter.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/UserConverter.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Sessionmanagement.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/rooms/RoomsList.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/ClientDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Emailmanagement.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/RoomStatus.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateImage.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentCategory.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/chat/ChatMessage.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecording.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/invitation/Invitations.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPoll.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPollAnswers.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Client.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Userdata.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Userlevel.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/OrganisationService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PollService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Export.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientSessionInfo.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ISessionManager.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/SessionManager.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/IClientPersistenceStore.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/domain/TestAddGroup.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSession.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestHashMapSession.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/user/TestUserOrganisation.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/userdata/TestLogin.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarForm.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java

Modified: openmeetings/trunk/singlewebapp/docs/RoomService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/RoomService.html?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/RoomService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/RoomService.html Tue Feb  5 02:44:03 2013
@@ -264,7 +264,7 @@ limitations under the License.
  audience rooms.
     			</p>
     			<p>
-                  Return Type: org.apache.openmeetings.persistence.beans.rooms.Rooms[]
+                  Return Type: org.apache.openmeetings.persistence.beans.room.Room[]
                 </p>
     			<p>Params:</p>
     			    			
@@ -636,7 +636,7 @@ limitations under the License.
     			  List of available room types
     			</p>
     			<p>
-                  Return Type: org.apache.openmeetings.persistence.beans.rooms.RoomTypes[]
+                  Return Type: org.apache.openmeetings.persistence.beans.room.RoomType[]
                 </p>
     			<p>Params:</p>
     			    			
@@ -822,7 +822,7 @@ limitations under the License.
     			  returns a conference room object
     			</p>
     			<p>
-                  Return Type: org.apache.openmeetings.persistence.beans.rooms.Rooms
+                  Return Type: org.apache.openmeetings.persistence.beans.room.Room
                 </p>
     			<p>Params:</p>
     			    			
@@ -874,7 +874,7 @@ limitations under the License.
     			  
     			</p>
     			<p>
-                  Return Type: org.apache.openmeetings.persistence.beans.rooms.Rooms
+                  Return Type: org.apache.openmeetings.persistence.beans.room.Room
                 </p>
     			<p>Params:</p>
     			    			

Modified: openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml Tue Feb  5 02:44:03 2013
@@ -22,8 +22,6 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
 	<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
 		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-		<class>org.apache.openmeetings.persistence.beans.adresses.Adresses</class>
-		<class>org.apache.openmeetings.persistence.beans.adresses.States</class>
 		<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.ErrorValues</class>
@@ -54,18 +52,20 @@
 		<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.rooms.Client</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation</class>
-		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessages</class>
-		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
-		<class>org.apache.openmeetings.persistence.beans.user.Salutations</class>
-		<class>org.apache.openmeetings.persistence.beans.user.UserContacts</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.Users</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.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.sip.asterisk.MeetMe</class>

Modified: openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml Tue Feb  5 02:44:03 2013
@@ -22,8 +22,6 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
 	<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
  		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-		<class>org.apache.openmeetings.persistence.beans.adresses.Adresses</class>
-		<class>org.apache.openmeetings.persistence.beans.adresses.States</class>
 		<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.ErrorValues</class>
@@ -54,18 +52,20 @@
 		<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.rooms.Client</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation</class>
-		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessages</class>
-		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
-		<class>org.apache.openmeetings.persistence.beans.user.Salutations</class>
-		<class>org.apache.openmeetings.persistence.beans.user.UserContacts</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.Users</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.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.sip.asterisk.MeetMe</class>

Modified: openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml Tue Feb  5 02:44:03 2013
@@ -22,8 +22,6 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
 	<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
  		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-		<class>org.apache.openmeetings.persistence.beans.adresses.Adresses</class>
-		<class>org.apache.openmeetings.persistence.beans.adresses.States</class>
 		<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.ErrorValues</class>
@@ -54,18 +52,20 @@
 		<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.rooms.Client</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation</class>
-		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessages</class>
-		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
-		<class>org.apache.openmeetings.persistence.beans.user.Salutations</class>
-		<class>org.apache.openmeetings.persistence.beans.user.UserContacts</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.Users</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.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.sip.asterisk.MeetMe</class>

Modified: openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml Tue Feb  5 02:44:03 2013
@@ -22,8 +22,6 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
 	<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
  		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-		<class>org.apache.openmeetings.persistence.beans.adresses.Adresses</class>
-		<class>org.apache.openmeetings.persistence.beans.adresses.States</class>
 		<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.ErrorValues</class>
@@ -54,18 +52,20 @@
 		<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.rooms.Client</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation</class>
-		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessages</class>
-		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
-		<class>org.apache.openmeetings.persistence.beans.user.Salutations</class>
-		<class>org.apache.openmeetings.persistence.beans.user.UserContacts</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.Users</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.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.sip.asterisk.MeetMe</class>

Modified: openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml Tue Feb  5 02:44:03 2013
@@ -22,8 +22,6 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
 	<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
  		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-		<class>org.apache.openmeetings.persistence.beans.adresses.Adresses</class>
-		<class>org.apache.openmeetings.persistence.beans.adresses.States</class>
 		<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.ErrorValues</class>
@@ -54,18 +52,20 @@
 		<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.rooms.Client</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>
-		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation</class>
-		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessages</class>
-		<class>org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder</class>
-		<class>org.apache.openmeetings.persistence.beans.user.Salutations</class>
-		<class>org.apache.openmeetings.persistence.beans.user.UserContacts</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.Users</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.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.sip.asterisk.MeetMe</class>

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java Tue Feb  5 02:44:03 2013
@@ -44,10 +44,10 @@ import org.apache.openmeetings.data.user
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
 import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
 import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
-import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
-import org.apache.openmeetings.persistence.beans.user.UserContacts;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.room.RoomType;
+import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.persistence.beans.user.UserContact;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.utils.math.TimezoneUtil;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -362,7 +362,7 @@ public class CalendarWebService {
 
 				appointmentLogic.getAppointMentById(appointmentId);
 
-				Users user = userManagement.getUserById(users_id);
+				User user = userManagement.getUserById(users_id);
 
 				return appointmentDao.updateAppointmentByTime(appointmentId,
 						appointmentstart, appointmentend, users_id, baseurl,
@@ -474,12 +474,12 @@ public class CalendarWebService {
 
 			log.debug("updateAppointment");
 
-			RoomTypes rt = roommanagement.getRoomTypesById(roomType);
+			RoomType rt = roommanagement.getRoomTypesById(roomType);
 
 			Appointment app = appointmentLogic
 					.getAppointMentById(appointmentId);
 
-			Rooms room = app.getRoom();
+			Room room = app.getRoom();
 			if (room != null) {
 
 				room.setComment(appointmentDescription);
@@ -489,7 +489,7 @@ public class CalendarWebService {
 				roomDao.update(room, users_id);
 			}
 
-			Users user = userManagement.getUserById(users_id);
+			User user = userManagement.getUserById(users_id);
 
 			return appointmentDao.updateAppointment(appointmentId,
 					appointmentName, appointmentDescription, appointmentstart
@@ -703,7 +703,7 @@ public class CalendarWebService {
 			if (authLevelManagement.checkUserLevel(user_level)) {
 				
 				if (!requestUserId.equals(users_id)) {
-					UserContacts userContacts = userContactsDaoImpl
+					UserContact userContacts = userContactsDaoImpl
 							.getUserContactByShareCalendar(requestUserId, true,
 									users_id);
 					if (userContacts == null) {

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebService.java Tue Feb  5 02:44:03 2013
@@ -38,7 +38,7 @@ import org.apache.openmeetings.data.user
 import org.apache.openmeetings.documents.LoadLibraryPresentation;
 import org.apache.openmeetings.documents.beans.ConverterProcessResultList;
 import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.utils.OmFileHelper;
 import org.apache.openmeetings.utils.StoredFile;
 import org.red5.logging.Red5LoggerFactory;
@@ -125,7 +125,7 @@ public class FileWebService {
 				InputStream inputstream = new BufferedInputStream(
 						uc.getInputStream());
 
-				Users externalUser = userManagement.getUserByExternalIdAndType(
+				User externalUser = userManagement.getUserByExternalIdAndType(
 						externalUserId, externalType);
 
 				LinkedHashMap<String, Object> hs = new LinkedHashMap<String, Object>();
@@ -211,7 +211,7 @@ public class FileWebService {
 				InputStream inputstream = new BufferedInputStream(
 						uc.getInputStream());
 
-				Users internalUser = userManagement.getUserById(internalUserId);
+				User internalUser = userManagement.getUserById(internalUserId);
 
 				LinkedHashMap<String, Object> hs = new LinkedHashMap<String, Object>();
 				hs.put("user", internalUser);
@@ -278,7 +278,7 @@ public class FileWebService {
 
 			if (authLevelManagement.checkWebServiceLevel(User_level)) {
 
-				Users userExternal = userManagement.getUserByExternalIdAndType(
+				User userExternal = userManagement.getUserByExternalIdAndType(
 						externalUserId, externalType);
 
 				Long userId = userExternal.getUser_id();

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java Tue Feb  5 02:44:03 2013
@@ -29,9 +29,9 @@ import org.apache.openmeetings.data.conf
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
 import org.apache.openmeetings.persistence.beans.invitation.Invitations;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.persistence.beans.room.RoomOrganisation;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.remote.ConferenceService;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -70,30 +70,30 @@ public class JabberWebService {
 	 * @param SID The SID from UserService.getSession
 	 * @return List&lt;Rooms&gt; of Rooms
 	 */
-	public List<Rooms> getAvailableRooms(String SID) {
+	public List<Room> getAvailableRooms(String SID) {
 		log.debug("getAvailableRooms enter");
 
-		List<Rooms> result = this.conferenceService
+		List<Room> result = this.conferenceService
 				.getAppointedMeetingRoomsWithoutType(SID);
 
-		List<Rooms> pbl = this.conferenceService.getRoomsPublicWithoutType(SID);
+		List<Room> pbl = this.conferenceService.getRoomsPublicWithoutType(SID);
 		if (pbl != null) {
 			result.addAll(pbl);
 		}
 
 		Long users_id = this.sessionManagement.checkSession(SID);
-		Users u = this.userManagement.getUserById(users_id);
+		User u = this.userManagement.getUserById(users_id);
 		for (Organisation_Users ou : u.getOrganisation_users()) {
-			List<Rooms_Organisation> rol = this.conferenceService
+			List<RoomOrganisation> rol = this.conferenceService
 					.getRoomsByOrganisationWithoutType(SID, ou
 							.getOrganisation().getOrganisation_id().longValue());
 			if (rol != null) {
-				for (Rooms_Organisation ro : rol) {
+				for (RoomOrganisation ro : rol) {
 					result.add(ro.getRoom());
 				}
 			}
 		}
-		for (Rooms r : result) {
+		for (Room r : result) {
 			r.setCurrentusers(null);
 		}
 		return result;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java Tue Feb  5 02:44:03 2013
@@ -23,7 +23,7 @@ import javax.servlet.ServletContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
+import org.apache.openmeetings.persistence.beans.room.Room;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -69,8 +69,8 @@ public class JabberWebServiceFacade {
 	 * @param SID The SID from {@link UserWebService.getSession}
 	 * @return array of Rooms
 	 */
-	public Rooms[] getAvailableRooms(String SID) {
-		return getJabberServiceProxy().getAvailableRooms(SID).toArray(new Rooms[0]);
+	public Room[] getAvailableRooms(String SID) {
+		return getJabberServiceProxy().getAvailableRooms(SID).toArray(new Room[0]);
 	}
 
 	/**

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java Tue Feb  5 02:44:03 2013
@@ -42,10 +42,10 @@ import org.apache.openmeetings.data.user
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
 import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
 import org.apache.openmeetings.persistence.beans.invitation.Invitations;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
-import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.persistence.beans.room.RoomType;
+import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.remote.ConferenceService;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.apache.openmeetings.session.ISessionManager;
@@ -104,7 +104,7 @@ public class RoomWebService {
 	 * @return - list of public rooms
 	 * @throws AxisFault
 	 */
-	public Rooms[] getRoomsPublic(String SID, Long roomtypes_id)
+	public Room[] getRoomsPublic(String SID, Long roomtypes_id)
 			throws AxisFault {
 		try {
 
@@ -113,16 +113,16 @@ public class RoomWebService {
 
 			if (authLevelManagement.checkWebServiceLevel(User_level)) {
 
-				List<Rooms> roomList = roommanagement.getPublicRooms(
+				List<Room> roomList = roommanagement.getPublicRooms(
 						User_level, roomtypes_id);
 				// We need to re-marshal the Rooms object cause Axis2 cannot use
 				// our objects
 				if (roomList != null && roomList.size() != 0) {
 					// roomsListObject.setRoomList(roomList);
-					Rooms[] roomItems = new Rooms[roomList.size()];
+					Room[] roomItems = new Room[roomList.size()];
 					int count = 0;
-					for (Iterator<Rooms> it = roomList.iterator(); it.hasNext();) {
-						Rooms room = it.next();
+					for (Iterator<Room> it = roomList.iterator(); it.hasNext();) {
+						Room room = it.next();
 						room.setCurrentusers(null);
 						roomItems[count] = room;
 						count++;
@@ -408,15 +408,15 @@ public class RoomWebService {
 	 * @return - List of available room types
 	 * @throws AxisFault
 	 */
-	public RoomTypes[] getRoomTypes(String SID) throws AxisFault {
+	public RoomType[] getRoomTypes(String SID) throws AxisFault {
 		try {
-			List<RoomTypes> rommTypesList = conferenceService.getRoomTypes(SID);
-			RoomTypes[] roomTypesArray = new RoomTypes[rommTypesList.size()];
+			List<RoomType> rommTypesList = conferenceService.getRoomTypes(SID);
+			RoomType[] roomTypesArray = new RoomType[rommTypesList.size()];
 
 			int count = 0;
-			for (Iterator<RoomTypes> it = rommTypesList.iterator(); it
+			for (Iterator<RoomType> it = rommTypesList.iterator(); it
 					.hasNext();) {
-				RoomTypes roomType = it.next();
+				RoomType roomType = it.next();
 				roomTypesArray[count] = roomType;
 				count++;
 			}
@@ -491,12 +491,12 @@ public class RoomWebService {
 					roomIds.push(roomId10);
 				}
 
-				List<Rooms> rooms = roommanagement.getRoomsByIds(roomIds);
+				List<Room> rooms = roommanagement.getRoomsByIds(roomIds);
 
 				RoomCountBean[] roomsArray = new RoomCountBean[rooms.size()];
 
 				int i = 0;
-				for (Rooms room : rooms) {
+				for (Room room : rooms) {
 					RoomCountBean rCountBean = new RoomCountBean();
 					rCountBean.setRoomId(room.getRooms_id());
 					rCountBean.setRoomName(room.getName());
@@ -528,7 +528,7 @@ public class RoomWebService {
 	 *            the room id
 	 * @return - room with the id given
 	 */
-	public Rooms getRoomById(String SID, long rooms_id) {
+	public Room getRoomById(String SID, long rooms_id) {
 		return conferenceService.getRoomById(SID, rooms_id);
 	}
 
@@ -540,7 +540,7 @@ public class RoomWebService {
 	 * @return - room with the id given
 	 */
 	@Deprecated
-	public Rooms getRoomWithCurrentUsersById(String SID, long rooms_id) {
+	public Room getRoomWithCurrentUsersById(String SID, long rooms_id) {
 		return conferenceService.getRoomWithCurrentUsersById(SID, rooms_id);
 	}
 
@@ -561,7 +561,7 @@ public class RoomWebService {
 
 			if (authLevelManagement.checkWebServiceLevel(user_level)) {
 
-				Rooms room = roommanagement.getRoomById(user_level, rooms_id);
+				Room room = roommanagement.getRoomById(user_level, rooms_id);
 
 				RoomReturn roomReturn = new RoomReturn();
 
@@ -619,7 +619,7 @@ public class RoomWebService {
 	 *            
 	 * @return - List of Objects of Rooms
 	 */
-	public SearchResult<Rooms> getRooms(String SID, int start, int max,
+	public SearchResult<Room> getRooms(String SID, int start, int max,
 			String orderby, boolean asc) {
 		return conferenceService.getRooms(SID, start, max, orderby, asc, "");
 	}
@@ -642,7 +642,7 @@ public class RoomWebService {
 	 *            
 	 * @return - List of Objects of Rooms
 	 */
-	public SearchResult<Rooms> getRoomsWithCurrentUsers(String SID, int start,
+	public SearchResult<Room> getRoomsWithCurrentUsers(String SID, int start,
 			int max, String orderby, boolean asc) {
 		return conferenceService.getRoomsWithCurrentUsers(SID, start, max,
 				orderby, asc);
@@ -1062,7 +1062,7 @@ public class RoomWebService {
 			Long users_id = sessionManagement.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
 			if (authLevelManagement.checkWebServiceLevel(user_level)) {
-				Rooms room = conferenceService.getRoomByExternalId(SID,
+				Room room = conferenceService.getRoomByExternalId(SID,
 						externalRoomId, externalRoomType, roomtypes_id);
 				Long roomId = null;
 				if (room == null) {
@@ -2053,13 +2053,13 @@ public class RoomWebService {
 	public List<RoomReturn> getRoomsWithCurrentUsersByList(String SID,
 			int start, int max, String orderby, boolean asc) throws AxisFault {
 		try {
-			List<Rooms> rooms = conferenceService
+			List<Room> rooms = conferenceService
 					.getRoomsWithCurrentUsersByList(SID, start, max, orderby,
 							asc);
 
 			List<RoomReturn> returnObjList = new LinkedList<RoomReturn>();
 
-			for (Rooms room : rooms) {
+			for (Room room : rooms) {
 
 				RoomReturn roomReturn = new RoomReturn();
 
@@ -2120,13 +2120,13 @@ public class RoomWebService {
 			int start, int max, String orderby, boolean asc,
 			String externalRoomType) throws AxisFault {
 		try {
-			List<Rooms> rooms = conferenceService
+			List<Room> rooms = conferenceService
 					.getRoomsWithCurrentUsersByListAndType(SID, start, max,
 							orderby, asc, externalRoomType);
 
 			List<RoomReturn> returnObjList = new LinkedList<RoomReturn>();
 
-			for (Rooms room : rooms) {
+			for (Room room : rooms) {
 
 				RoomReturn roomReturn = new RoomReturn();
 
@@ -2283,7 +2283,7 @@ public class RoomWebService {
 					return rooms_id;
 				}
 
-				Users us = userManagement.getUserById(users_id);
+				User us = userManagement.getUserById(users_id);
 
 				appointmentDao.addAppointment("appointmentName", users_id,
 						"appointmentLocation", "appointmentDescription", dFrom,
@@ -2500,7 +2500,7 @@ public class RoomWebService {
 			Long user_level = userManagement.getUserLevelByID(users_id);
 			if (authLevelManagement.checkWebServiceLevel(user_level)) {
 				log.debug("closeRoom 1 " + room_id);
-				Rooms r = roomDao.get(room_id);
+				Room r = roomDao.get(room_id);
 				PropertyUtils.setSimpleProperty(r, paramName, paramValue);
 				roomDao.update(r, users_id);
 			} else {

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java Tue Feb  5 02:44:03 2013
@@ -29,8 +29,8 @@ import org.apache.axis2.transport.http.H
 import org.apache.openmeetings.OpenmeetingsVariables;
 import org.apache.openmeetings.data.beans.basic.SearchResult;
 import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
-import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
+import org.apache.openmeetings.persistence.beans.room.RoomType;
+import org.apache.openmeetings.persistence.beans.room.Room;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -70,7 +70,7 @@ public class RoomWebServiceFacade {
 	// organisation_id, roomtypes_id);
 	// }
 
-	public Rooms[] getRoomsPublic(String SID, Long roomtypes_id)
+	public Room[] getRoomsPublic(String SID, Long roomtypes_id)
 			throws AxisFault {
 		return this.getRoomServiceProxy().getRoomsPublic(SID, roomtypes_id);
 	}
@@ -122,7 +122,7 @@ public class RoomWebServiceFacade {
 		return this.getRoomServiceProxy().getFlvRecordingByRoomId(SID, roomId);
 	}
 
-	public RoomTypes[] getRoomTypes(String SID) throws AxisFault {
+	public RoomType[] getRoomTypes(String SID) throws AxisFault {
 		return this.getRoomServiceProxy().getRoomTypes(SID);
 	}
 
@@ -135,7 +135,7 @@ public class RoomWebServiceFacade {
 				roomId9, roomId10);
 	}
 
-	public Rooms getRoomById(String SID, long rooms_id) {
+	public Room getRoomById(String SID, long rooms_id) {
 		return this.getRoomServiceProxy().getRoomById(SID, rooms_id);
 	}
 
@@ -146,7 +146,7 @@ public class RoomWebServiceFacade {
 	 * @return
 	 */
 	@Deprecated
-	public Rooms getRoomWithCurrentUsersById(String SID, long rooms_id)
+	public Room getRoomWithCurrentUsersById(String SID, long rooms_id)
 			throws AxisFault {
 		return this.getRoomServiceProxy().getRoomWithCurrentUsersById(SID,
 				rooms_id);
@@ -158,13 +158,13 @@ public class RoomWebServiceFacade {
 				rooms_id);
 	}
 
-	public SearchResult<Rooms> getRooms(String SID, int start, int max,
+	public SearchResult<Room> getRooms(String SID, int start, int max,
 			String orderby, boolean asc) throws AxisFault {
 		return this.getRoomServiceProxy().getRooms(SID, start, max, orderby,
 				asc);
 	}
 
-	public SearchResult<Rooms> getRoomsWithCurrentUsers(String SID, int start,
+	public SearchResult<Room> getRoomsWithCurrentUsers(String SID, int start,
 			int max, String orderby, boolean asc) throws AxisFault {
 		return this.getRoomServiceProxy().getRoomsWithCurrentUsers(SID, start,
 				max, orderby, asc);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebService.java Tue Feb  5 02:44:03 2013
@@ -37,7 +37,7 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.basic.RemoteSessionObject;
 import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
 import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.remote.MainService;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -230,7 +230,7 @@ public class UserWebService {
 					return user_id;
 				}
 
-				Users user = userManagement.getUserById(user_id);
+				User user = userManagement.getUserById(user_id);
 
 				// activate the User
 				user.setStatus(1);
@@ -317,7 +317,7 @@ public class UserWebService {
 					return user_id;
 				}
 
-				Users user = userManagement.getUserById(user_id);
+				User user = userManagement.getUserById(user_id);
 
 				// activate the User
 				user.setStatus(1);
@@ -392,7 +392,7 @@ public class UserWebService {
 
 			if (authLevelManagement.checkAdminLevel(user_level)) {
 
-				Users testUser = userManagement.getUserByExternalIdAndType(
+				User testUser = userManagement.getUserByExternalIdAndType(
 						externalUserId, externalUserType);
 
 				if (testUser != null) {
@@ -410,7 +410,7 @@ public class UserWebService {
 					return user_id;
 				}
 
-				Users user = userManagement.getUserById(user_id);
+				User user = userManagement.getUserById(user_id);
 
 				// activate the User
 				user.setStatus(1);
@@ -488,7 +488,7 @@ public class UserWebService {
 
 			if (authLevelManagement.checkAdminLevel(user_level)) {
 
-				Users userExternal = userManagement.getUserByExternalIdAndType(
+				User userExternal = userManagement.getUserByExternalIdAndType(
 						externalUserId, externalUserType);
 
 				Long userId = userExternal.getUser_id();
@@ -1258,7 +1258,7 @@ public class UserWebService {
 	 *            asc or desc
 	 * @return - users found
 	 */
-	public SearchResult<Users> getUsersByOrganisation(String SID,
+	public SearchResult<User> getUsersByOrganisation(String SID,
 			long organisation_id, int start, int max, String orderby,
 			boolean asc) {
 		try {
@@ -1270,7 +1270,7 @@ public class UserWebService {
 								start, max, orderby, asc);
 			} else {
 				log.error("Need Administration Account");
-				SearchResult<Users> sResult = new SearchResult<Users>();
+				SearchResult<User> sResult = new SearchResult<User>();
 				sResult.setErrorId(-26L);
 				return sResult;
 			}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebServiceFacade.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebServiceFacade.java Tue Feb  5 02:44:03 2013
@@ -27,7 +27,7 @@ import org.apache.openmeetings.Openmeeti
 import org.apache.openmeetings.data.beans.basic.ErrorResult;
 import org.apache.openmeetings.data.beans.basic.SearchResult;
 import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -302,7 +302,7 @@ public class UserWebServiceFacade {
 				organisation_id, insertedby);
 	}
 
-	public SearchResult<Users> getUsersByOrganisation(String SID,
+	public SearchResult<User> getUsersByOrganisation(String SID,
 			long organisation_id, int start, int max, String orderby,
 			boolean asc) throws AxisFault {
 		return getUserServiceProxy().getUsersByOrganisation(SID,

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomConverter.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomConverter.java Tue Feb  5 02:44:03 2013
@@ -21,11 +21,11 @@ package org.apache.openmeetings.backup;
 import java.util.Map;
 
 import org.apache.openmeetings.data.conference.dao.RoomDao;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
+import org.apache.openmeetings.persistence.beans.room.Room;
 import org.simpleframework.xml.stream.InputNode;
 import org.simpleframework.xml.stream.OutputNode;
 
-public class RoomConverter extends OmConverter<Rooms> {
+public class RoomConverter extends OmConverter<Room> {
 	private RoomDao roomDao;
 	private Map<Long, Long> idMap;
 	
@@ -38,15 +38,15 @@ public class RoomConverter extends OmCon
 		this.idMap = idMap;
 	}
 	
-	public Rooms read(InputNode node) throws Exception {
+	public Room read(InputNode node) throws Exception {
 		long oldId = getlongValue(node);
 		long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId;
 
-		Rooms r = roomDao.get(newId);
-		return r == null ? new Rooms() : r;
+		Room r = roomDao.get(newId);
+		return r == null ? new Room() : r;
 	}
 
-	public void write(OutputNode node, Rooms value) throws Exception {
+	public void write(OutputNode node, Room value) throws Exception {
 		node.setData(true);
 		node.setValue(value == null ? "0" : "" + value.getRooms_id());
 	}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomTypeConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomTypeConverter.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomTypeConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomTypeConverter.java Tue Feb  5 02:44:03 2013
@@ -19,11 +19,11 @@
 package org.apache.openmeetings.backup;
 
 import org.apache.openmeetings.data.conference.Roommanagement;
-import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
+import org.apache.openmeetings.persistence.beans.room.RoomType;
 import org.simpleframework.xml.stream.InputNode;
 import org.simpleframework.xml.stream.OutputNode;
 
-public class RoomTypeConverter extends OmConverter<RoomTypes> {
+public class RoomTypeConverter extends OmConverter<RoomType> {
 	private Roommanagement roommanagement;
 	
 	public RoomTypeConverter() {
@@ -34,12 +34,12 @@ public class RoomTypeConverter extends O
 		this.roommanagement = roommanagement;
 	}
 	
-	public RoomTypes read(InputNode node) throws Exception {
-		RoomTypes rt = roommanagement.getRoomTypesById(getlongValue(node));
+	public RoomType read(InputNode node) throws Exception {
+		RoomType rt = roommanagement.getRoomTypesById(getlongValue(node));
 		return rt != null ? rt : roommanagement.getRoomTypesById(1); // conference type will be used in case of bad type
 	}
 
-	public void write(OutputNode node, RoomTypes value) throws Exception {
+	public void write(OutputNode node, RoomType value) throws Exception {
 		node.setData(true);
 		node.setValue(value == null ? "0" : "" + value.getRoomtypes_id());
 	}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/StateConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/StateConverter.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/StateConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/StateConverter.java Tue Feb  5 02:44:03 2013
@@ -19,11 +19,11 @@
 package org.apache.openmeetings.backup;
 
 import org.apache.openmeetings.data.user.dao.StateDao;
-import org.apache.openmeetings.persistence.beans.adresses.States;
+import org.apache.openmeetings.persistence.beans.user.State;
 import org.simpleframework.xml.stream.InputNode;
 import org.simpleframework.xml.stream.OutputNode;
 
-public class StateConverter extends OmConverter<States> {
+public class StateConverter extends OmConverter<State> {
 	private StateDao statemanagement;
 	
 	public StateConverter() {
@@ -34,11 +34,11 @@ public class StateConverter extends OmCo
 		this.statemanagement = statemanagement;
 	}
 	
-	public States read(InputNode node) throws Exception {
+	public State read(InputNode node) throws Exception {
 		return statemanagement.getStateById(getlongValue(node));
 	}
 
-	public void write(OutputNode node, States value) throws Exception {
+	public void write(OutputNode node, State value) throws Exception {
 		node.setData(true);
 		node.setValue(value == null ? "0" : "" + value.getState_id());
 	}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/UserConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/UserConverter.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/UserConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/UserConverter.java Tue Feb  5 02:44:03 2013
@@ -21,11 +21,11 @@ package org.apache.openmeetings.backup;
 import java.util.Map;
 
 import org.apache.openmeetings.data.user.dao.UsersDao;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.simpleframework.xml.stream.InputNode;
 import org.simpleframework.xml.stream.OutputNode;
 
-public class UserConverter extends OmConverter<Users> {
+public class UserConverter extends OmConverter<User> {
 	private UsersDao userDao;
 	private Map<Long, Long> idMap;
 	
@@ -38,15 +38,15 @@ public class UserConverter extends OmCon
 		this.idMap = idMap;
 	}
 	
-	public Users read(InputNode node) throws Exception {
+	public User read(InputNode node) throws Exception {
 		long oldId = getlongValue(node);
 		long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId;
 		
-		Users u = userDao.get(newId);
-		return u == null ? new Users() : u;
+		User u = userDao.get(newId);
+		return u == null ? new User() : u;
 	}
 
-	public void write(OutputNode node, Users value) throws Exception {
+	public void write(OutputNode node, User value) throws Exception {
 		node.setData(true);
 		node.setValue(value == null ? "0" : "" + value.getUser_id());
 	}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java Tue Feb  5 02:44:03 2013
@@ -45,7 +45,7 @@ import org.apache.openmeetings.installat
 import org.apache.openmeetings.installation.InstallationConfig;
 import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
 import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.servlet.outputhandler.BackupExport;
 import org.apache.openmeetings.servlet.outputhandler.BackupImportController;
 import org.apache.openmeetings.utils.ImportHelper;
@@ -342,7 +342,7 @@ public class Admin {
 						for (File profile : profiles.listFiles()) {
 							long pSize = OmFileHelper.getSize(profile);
 							long userId = getUserIdByProfile(profile.getName());
-							Users u = udao.get(userId);
+							User u = udao.get(userId);
 							if (profile.isFile() || userId < 0 || u == null) {
 								if (cleanup) {
 									FileHelper.removeRec(profile);
@@ -358,7 +358,7 @@ public class Admin {
 							}
 						}
 						long missing = 0;
-						for (Users u : udao.getAllUsersDeleted()) {
+						for (User u : udao.getAllUsersDeleted()) {
 							if (!u.getDeleted() && !new File(OmFileHelper.getUploadProfilesUserDir(u.getUser_id()), u.getPictureuri()).exists()) {
 								missing++;
 							}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Sessionmanagement.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Sessionmanagement.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Sessionmanagement.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Sessionmanagement.java Tue Feb  5 02:44:03 2013
@@ -33,7 +33,7 @@ import javax.persistence.criteria.Root;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
 import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.persistence.beans.room.Client;
 import org.apache.openmeetings.session.ISessionManager;
 import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
 import org.red5.logging.Red5LoggerFactory;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java Tue Feb  5 02:44:03 2013
@@ -27,7 +27,7 @@ import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
 import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,7 +54,7 @@ public class OmTimeZoneDao {
 	 *            can be null
 	 * @return
 	 */
-	public OmTimeZone getDefaultOmTimeZone(Users user) {
+	public OmTimeZone getDefaultOmTimeZone(User user) {
 		
 		if (user != null && user.getOmTimeZone() != null) {
 			return user.getOmTimeZone();

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/rooms/RoomsList.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/rooms/RoomsList.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/rooms/RoomsList.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/rooms/RoomsList.java Tue Feb  5 02:44:03 2013
@@ -18,16 +18,16 @@
  */
 package org.apache.openmeetings.data.basic.rooms;
 
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
+import org.apache.openmeetings.persistence.beans.room.Room;
 
 public class RoomsList {
 	
-	Rooms[] roomList = null;
+	Room[] roomList = null;
 
-	public Rooms[] getRoomList() {
+	public Room[] getRoomList() {
 		return roomList;
 	}
-	public void setRoomList(Rooms[] roomList) {
+	public void setRoomList(Room[] roomList) {
 		this.roomList = roomList;
 	}
 

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java Tue Feb  5 02:44:03 2013
@@ -46,8 +46,8 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
 import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
 import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.utils.math.CalendarPatterns;
 import org.apache.openmeetings.utils.math.TimezoneUtil;
 import org.red5.logging.Red5LoggerFactory;
@@ -192,7 +192,7 @@ public class AppointmentDao {
 			String appointmentLocation, String appointmentDescription,
 			Date appointmentstart, Date appointmentend, Boolean isDaily,
 			Boolean isWeekly, Boolean isMonthly, Boolean isYearly,
-			Long categoryId, Long remind, Rooms room, Long language_id,
+			Long categoryId, Long remind, Room room, Long language_id,
 			Boolean isPasswordProtected, String password,
 			Boolean isConnectedEvent, String jNameTimeZone) {
 		try {
@@ -460,7 +460,7 @@ public class AppointmentDao {
 			}
 
 			// Adding Invitor as Meetingmember
-			Users user = userManagement.getUserById(users_id);
+			User user = userManagement.getUserById(users_id);
 
 			String invitorName = user.getFirstname() + " " + user.getLastname()
 					+ " [" + user.getAdresses().getEmail() + "]";
@@ -558,7 +558,7 @@ public class AppointmentDao {
 						// timezone from his profile otherwise get the timezones
 						// from the variable jNameTimeZone
 						if (sendToUserId > 0) {
-							Users interalUser = userManagement
+							User interalUser = userManagement
 									.getUserById(sendToUserId);
 							timezoneMember = timezoneUtil
 									.getTimezoneByUser(interalUser);
@@ -649,7 +649,7 @@ public class AppointmentDao {
 					.getMeetingMemberByAppointmentId(ap.getAppointmentId());
 
 			// Adding Invitor Name
-			Users user = userManagement.getUserById(users_id);
+			User user = userManagement.getUserById(users_id);
 			String invitorName = user.getFirstname() + " " + user.getLastname()
 					+ " [" + user.getAdresses().getEmail() + "]";
 

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java Tue Feb  5 02:44:03 2013
@@ -37,8 +37,8 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
 import org.apache.openmeetings.persistence.beans.invitation.Invitations;
 import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.utils.math.CalendarPatterns;
 import org.apache.openmeetings.utils.math.TimezoneUtil;
 import org.red5.logging.Red5LoggerFactory;
@@ -107,7 +107,7 @@ public class AppointmentLogic {
 	public Appointment getAppointmentByRoom(Long room_id) throws Exception {
 		log.debug("getAppointmentByRoom");
 
-		Rooms room = roomDao.get(room_id);
+		Room room = roomDao.get(room_id);
 
 		if (room == null)
 			throw new Exception("Room does not exist in database!");
@@ -159,7 +159,7 @@ public class AppointmentLogic {
 		try {
 
 			// Adding creator as MeetingMember
-			Users user = userManagement.getUserById(userId);
+			User user = userManagement.getUserById(userId);
 			
 			Long room_id = roomId > 0 ? roomId : roommanagement.addRoom(3, // user level
 					appointmentName, // name
@@ -199,7 +199,7 @@ public class AppointmentLogic {
 			log.debug("Appointmentlogic.saveAppointment : Room - " + room_id);
 			log.debug("Appointmentlogic.saveAppointment : Reminder - " + remind);
 	
-			Rooms room = roomDao.get(room_id);
+			Room room = roomDao.get(room_id);
 
 			// Re-factor the given time ignoring the Date is always UTC!
 			TimeZone timezone = timezoneUtil.getTimezoneByUser(user);
@@ -257,7 +257,7 @@ public class AppointmentLogic {
 					// timezone from his profile otherwise get the timezones
 					// from the variable jNameTimeZone
 					if (sendToUserId > 0) {
-						Users interalUser = userManagement
+						User interalUser = userManagement
 								.getUserById(sendToUserId);
 						phone = interalUser.getPhoneForSMS();
 						timezoneMember = timezoneUtil
@@ -343,7 +343,7 @@ public class AppointmentLogic {
 
 			}
 
-			Rooms room = point.getRoom();
+			Room room = point.getRoom();
 
 			// Deleting/Notifing Meetingmembers
 			List<MeetingMember> members = meetingMemberDao

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java Tue Feb  5 02:44:03 2013
@@ -29,7 +29,7 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
 import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
 import org.apache.openmeetings.persistence.beans.invitation.Invitations;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.utils.math.CalendarPatterns;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -337,7 +337,7 @@ public class MeetingMemberLogic {
 				return null;
 			}
 
-			Users user = userManagement.getUserById(users_id);
+			User user = userManagement.getUserById(users_id);
 
 			if (user == null) {
 				log.error("could not retrieve user!");

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java Tue Feb  5 02:44:03 2013
@@ -45,7 +45,7 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
 import org.apache.openmeetings.persistence.beans.invitation.Invitations;
 import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.templates.InvitationTemplate;
 import org.apache.openmeetings.utils.crypt.MD5;
 import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
@@ -174,7 +174,7 @@ public class Invitationmanagement {
 
 				invitation.setDeleted(false);
 
-				Users us = usersDao.get(createdBy);
+				User us = usersDao.get(createdBy);
 				String hashRaw = "HASH" + (System.currentTimeMillis());
 				invitation.setHash(MD5.do_checksum(hashRaw));
 
@@ -223,7 +223,7 @@ public class Invitationmanagement {
 
 		log.debug("cancelInvitation");
 
-		Users user;
+		User user;
 
 		try {
 			user = userManagement.getUserById(canceling_user_id);
@@ -238,7 +238,7 @@ public class Invitationmanagement {
 			return;
 		}
 
-		Users us = member.getUserid();
+		User us = member.getUserid();
 		TimeZone timezone = null;
 		// external users have no user object stored so we will need to get the
 		// timezone from the stored string
@@ -287,7 +287,7 @@ public class Invitationmanagement {
 	}
 
 	private String formatCancelSubject(Long language_id,
-			Appointment appointment, Users user, TimeZone timezone) {
+			Appointment appointment, User user, TimeZone timezone) {
 		try {
 			String message = fieldmanagment.getString(1157L, language_id)
 					+ appointment.getAppointmentName();
@@ -307,7 +307,7 @@ public class Invitationmanagement {
 	}
 
 	private String formatCancelMessage(Long language_id,
-			Appointment appointment, Users user, TimeZone timezone) {
+			Appointment appointment, User user, TimeZone timezone) {
 		try {
 			String message = fieldmanagment.getString(1157L, language_id)
 					+ appointment.getAppointmentName();
@@ -366,7 +366,7 @@ public class Invitationmanagement {
 
 		log.debug("updateInvitation");
 
-		Users user = userManagement.getUserById(canceling_user_id);
+		User user = userManagement.getUserById(canceling_user_id);
 		if (user == null) {
 			log.error("Cancelling user cant be retrieved");
 			return;
@@ -380,7 +380,7 @@ public class Invitationmanagement {
 
 		log.debug("Remindertype : " + appointment.getRemind().getTypId());
 
-		Users us = member.getUserid();
+		User us = member.getUserid();
 		TimeZone timezone = null;
 		// external users have no user object stored so we will need to get the
 		// timezone from the stored string
@@ -420,7 +420,7 @@ public class Invitationmanagement {
 	}
 
 	private String formatUpdateSubject(Long language_id,
-			Appointment appointment, Users user, TimeZone timezone) {
+			Appointment appointment, User user, TimeZone timezone) {
 		try {
 
 			String message = fieldmanagment.getString(1155L, language_id) + " "
@@ -451,7 +451,7 @@ public class Invitationmanagement {
 	}
 
 	private String formatUpdateMessage(Long language_id,
-			Appointment appointment, Users user, TimeZone timezone,
+			Appointment appointment, User user, TimeZone timezone,
 			String invitorName) {
 		try {
 
@@ -560,7 +560,7 @@ public class Invitationmanagement {
 
 				invitation.setDeleted(false);
 
-				Users us = usersDao.get(createdBy);
+				User us = usersDao.get(createdBy);
 				String hashRaw = "InvitationHash"
 						+ (System.currentTimeMillis());
 				log.debug("addInvitationIcalLink : rawHash = " + hashRaw);
@@ -593,7 +593,7 @@ public class Invitationmanagement {
 	}
 
 	// ---------------------------------------------------------------------------------------------------------
-	public String sendInvitionLink(Users us, Invitations inv, String message, String baseurl, String subject, Long language_id) {
+	public String sendInvitionLink(User us, Invitations inv, String message, String baseurl, String subject, Long language_id) {
 		return sendInvitionLink(us != null ? us.getAdresses().getEmail() : inv.getInvitedEMail()
 				, inv.getInvitedname()
 				, message, baseurl, inv.getInvitedEMail(), subject, inv.getHash()
@@ -749,7 +749,7 @@ public class Invitationmanagement {
 		log.debug("sendInvitationIcalCancelMail");
 
 		// Defining Organizer
-		Users user = userManagement.getUserById(organizer_userId);
+		User user = userManagement.getUserById(organizer_userId);
 
 		// TODO: Check time zone handling in iCal Mail
 		// OmTimeZone omTimeZone =
@@ -800,7 +800,7 @@ public class Invitationmanagement {
 		log.debug("sendInvitationIcalUpdateMail");
 
 		// Defining Organizer
-		Users user = userManagement.getUserById(organizer_userId);
+		User user = userManagement.getUserById(organizer_userId);
 
 		IcalHandler handler = new IcalHandler(IcalHandler.ICAL_METHOD_REQUEST);
 
@@ -883,7 +883,7 @@ public class Invitationmanagement {
 			atts.add(attendeeList);
 
 			// Defining Organizer
-			Users user = userManagement.getUserById(organizer_userId);
+			User user = userManagement.getUserById(organizer_userId);
 
 			HashMap<String, String> organizerAttendee = handler
 					.getAttendeeData(email, username, invitor);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java Tue Feb  5 02:44:03 2013
@@ -33,7 +33,7 @@ import org.apache.openmeetings.data.user
 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.rooms.Client;
+import org.apache.openmeetings.persistence.beans.room.Client;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;



Mime
View raw message