openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebawag...@apache.org
Subject svn commit: r1442455 [5/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
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java Tue Feb  5 02:44:03 2013
@@ -77,8 +77,6 @@ import org.apache.openmeetings.data.user
 import org.apache.openmeetings.data.user.dao.UserContactsDao;
 import org.apache.openmeetings.data.user.dao.UsersDao;
 import org.apache.openmeetings.documents.beans.UploadCompleteMessage;
-import org.apache.openmeetings.persistence.beans.adresses.Adresses;
-import org.apache.openmeetings.persistence.beans.adresses.States;
 import org.apache.openmeetings.persistence.beans.basic.Configuration;
 import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
 import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
@@ -92,15 +90,17 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
 import org.apache.openmeetings.persistence.beans.poll.PollType;
 import org.apache.openmeetings.persistence.beans.poll.RoomPoll;
-import org.apache.openmeetings.persistence.beans.rooms.RoomModerators;
-import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation;
+import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.persistence.beans.room.RoomModerator;
+import org.apache.openmeetings.persistence.beans.room.RoomOrganisation;
+import org.apache.openmeetings.persistence.beans.room.RoomType;
 import org.apache.openmeetings.persistence.beans.sip.asterisk.MeetMe;
+import org.apache.openmeetings.persistence.beans.user.Address;
+import org.apache.openmeetings.persistence.beans.user.PrivateMessage;
 import org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder;
-import org.apache.openmeetings.persistence.beans.user.PrivateMessages;
-import org.apache.openmeetings.persistence.beans.user.UserContacts;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.State;
+import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.persistence.beans.user.UserContact;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.apache.openmeetings.utils.OmFileHelper;
 import org.apache.openmeetings.utils.math.CalendarPatterns;
@@ -267,8 +267,8 @@ public class BackupImportController exte
 		 * ##################### Import Users
 		 */
 		{
-			List<Users> list = readUserList(f, "users.xml", "users");
-			for (Users u : list) {
+			List<User> list = readUserList(f, "users.xml", "users");
+			for (User u : list) {
 				OmTimeZone tz = u.getOmTimeZone();
 				if (tz == null || tz.getJname() == null) {
 					String jNameTimeZone = configurationDao.getConfValue(
@@ -300,11 +300,11 @@ public class BackupImportController exte
 
 			matcher.bind(Long.class, LongTransform.class);
 			matcher.bind(Integer.class, IntegerTransform.class);
-			registry.bind(Users.class, new UserConverter(usersDao, usersMap));
-			registry.bind(RoomTypes.class, new RoomTypeConverter(roommanagement));
+			registry.bind(User.class, new UserConverter(usersDao, usersMap));
+			registry.bind(RoomType.class, new RoomTypeConverter(roommanagement));
 			
-			List<Rooms> list = readList(serializer, f, "rooms.xml", "rooms", Rooms.class);
-			for (Rooms r : list) {
+			List<Room> list = readList(serializer, f, "rooms.xml", "rooms", Room.class);
+			for (Room r : list) {
 				Long roomId = r.getRooms_id();
 
 				// We need to reset ids as openJPA reject to store them
@@ -312,10 +312,12 @@ public class BackupImportController exte
 				r.setRooms_id(null);
 				MeetMe mm = r.getMeetme();
 				r.setMeetme(null);
-				for (Iterator<RoomModerators> i = r.getModerators().iterator(); i.hasNext();) {
-					RoomModerators rm = i.next();
-					if (rm.getUser().getUser_id() == null) {
-						i.remove();
+				if (r.getModerators() != null) {
+					for (Iterator<RoomModerator> i = r.getModerators().iterator(); i.hasNext();) {
+						RoomModerator rm = i.next();
+						if (rm.getUser().getUser_id() == null) {
+							i.remove();
+						}
 					}
 				}
 				r = roomDao.update(r, 1L);
@@ -338,10 +340,10 @@ public class BackupImportController exte
 			Serializer serializer = new Persister(strategy);
 	
 			registry.bind(Organisation.class, new OrganisationConverter(orgDao, organisationsMap));
-			registry.bind(Rooms.class, new RoomConverter(roomDao, roomsMap));
+			registry.bind(Room.class, new RoomConverter(roomDao, roomsMap));
 			
-			List<Rooms_Organisation> list = readList(serializer, f, "rooms_organisation.xml", "room_organisations", Rooms_Organisation.class);
-			for (Rooms_Organisation ro : list) {
+			List<RoomOrganisation> list = readList(serializer, f, "rooms_organisation.xml", "room_organisations", RoomOrganisation.class);
+			for (RoomOrganisation ro : list) {
 				if (!ro.getDeleted()) {
 					// We need to reset this as openJPA reject to store them otherwise
 					ro.setRooms_organisation_id(null);
@@ -360,9 +362,9 @@ public class BackupImportController exte
 			Serializer serializer = new Persister(strategy);
 	
 			registry.bind(AppointmentCategory.class, new AppointmentCategoryConverter(appointmentCategoryDaoImpl));
-			registry.bind(Users.class, new UserConverter(usersDao, usersMap));
+			registry.bind(User.class, new UserConverter(usersDao, usersMap));
 			registry.bind(AppointmentReminderTyps.class, new AppointmentReminderTypeConverter(appointmentReminderTypDaoImpl));
-			registry.bind(Rooms.class, new RoomConverter(roomDao, roomsMap));
+			registry.bind(Room.class, new RoomConverter(roomDao, roomsMap));
 			registry.bind(Date.class, DateConverter.class);
 			
 			List<Appointment> list = readList(serializer, f, "appointements.xml", "appointments", Appointment.class);
@@ -390,7 +392,7 @@ public class BackupImportController exte
 			Strategy strategy = new RegistryStrategy(registry);
 			Serializer serializer = new Persister(strategy);
 	
-			registry.bind(Users.class, new UserConverter(usersDao, usersMap));
+			registry.bind(User.class, new UserConverter(usersDao, usersMap));
 			registry.bind(Appointment.class, new AppointmentConverter(appointmentDao, appointmentsMap));
 			
 			List<MeetingMember> list = readList(serializer, f, "meetingmembers.xml", "meetingmembers", MeetingMember.class);
@@ -479,12 +481,12 @@ public class BackupImportController exte
 			Strategy strategy = new RegistryStrategy(registry);
 			Serializer serializer = new Persister(strategy);
 	
-			registry.bind(Users.class, new UserConverter(usersDao, usersMap));
+			registry.bind(User.class, new UserConverter(usersDao, usersMap));
 			
-			List<UserContacts> list = readList(serializer, f, "userContacts.xml", "usercontacts", UserContacts.class, true);
-			for (UserContacts uc : list) {
+			List<UserContact> list = readList(serializer, f, "userContacts.xml", "usercontacts", UserContact.class, true);
+			for (UserContact uc : list) {
 				Long ucId = uc.getUserContactId();
-				UserContacts storedUC = userContactsDao.getUserContacts(ucId);
+				UserContact storedUC = userContactsDao.getUserContacts(ucId);
 
 				if (storedUC == null && uc.getContact() != null && uc.getContact().getUser_id() != null) {
 					uc.setUserContactId(0);
@@ -503,12 +505,12 @@ public class BackupImportController exte
 			Strategy strategy = new RegistryStrategy(registry);
 			Serializer serializer = new Persister(strategy);
 	
-			registry.bind(Users.class, new UserConverter(usersDao, usersMap));
-			registry.bind(Rooms.class, new RoomConverter(roomDao, roomsMap));
+			registry.bind(User.class, new UserConverter(usersDao, usersMap));
+			registry.bind(Room.class, new RoomConverter(roomDao, roomsMap));
 			registry.bind(Date.class, DateConverter.class);
 			
-			List<PrivateMessages> list = readList(serializer, f, "privateMessages.xml", "privatemessages", PrivateMessages.class, true);
-			for (PrivateMessages p : list) {
+			List<PrivateMessage> list = readList(serializer, f, "privateMessages.xml", "privatemessages", PrivateMessage.class, true);
+			for (PrivateMessage p : list) {
 				p.setPrivateMessageId(0);
 				p.setPrivateMessageFolderId(
 					getNewId(p.getPrivateMessageFolderId(), Maps.MESSAGEFOLDERS));
@@ -561,8 +563,8 @@ public class BackupImportController exte
 			Strategy strategy = new RegistryStrategy(registry);
 			Serializer serializer = new Persister(strategy);
 	
-			registry.bind(Users.class, new UserConverter(usersDao, usersMap));
-			registry.bind(Rooms.class, new RoomConverter(roomDao, roomsMap));
+			registry.bind(User.class, new UserConverter(usersDao, usersMap));
+			registry.bind(Room.class, new RoomConverter(roomDao, roomsMap));
 			registry.bind(PollType.class, new PollTypeConverter(pollManagement));
 			registry.bind(Date.class, DateConverter.class);
 			
@@ -584,7 +586,7 @@ public class BackupImportController exte
 
 			matcher.bind(Long.class, LongTransform.class);
 			registry.bind(Date.class, DateConverter.class);
-			registry.bind(Users.class, new UserConverter(usersDao, usersMap));
+			registry.bind(User.class, new UserConverter(usersDao, usersMap));
 			
 			List<Configuration> list = readList(serializer, f, "configs.xml", "configs", Configuration.class, true);
 			for (Configuration c : list) {
@@ -685,11 +687,11 @@ public class BackupImportController exte
 		return null;
 	}
 	
-	public List<Users> readUserList(InputStream xml, String listNodeName) throws Exception {
+	public List<User> readUserList(InputStream xml, String listNodeName) throws Exception {
 		return readUserList(new InputSource(xml), listNodeName);
 	}
 	
-	public List<Users> readUserList(File baseDir, String fileName, String listNodeName) throws Exception {
+	public List<User> readUserList(File baseDir, String fileName, String listNodeName) throws Exception {
 		File xml = new File(baseDir, fileName);
 		if (!xml.exists()) {
 			throw new Exception(fileName + " missing");
@@ -699,14 +701,14 @@ public class BackupImportController exte
 	}
 	
 	//FIXME (need to be removed in later versions) HACK to fix 2 deleted nodes in users.xml and inline Adresses and sipData
-	private List<Users> readUserList(InputSource xml, String listNodeName) throws Exception {
+	private List<User> readUserList(InputSource xml, String listNodeName) throws Exception {
 		Registry registry = new Registry();
 		Strategy strategy = new RegistryStrategy(registry);
 		Serializer ser = new Persister(strategy);
 
 		registry.bind(Organisation.class, new OrganisationConverter(orgDao, organisationsMap));
 		registry.bind(OmTimeZone.class, new OmTimeZoneConverter(omTimeZoneDaoImpl));
-		registry.bind(States.class, new StateConverter(statemanagement));
+		registry.bind(State.class, new StateConverter(statemanagement));
 		registry.bind(Date.class, DateConverter.class);
 
 		DocumentBuilder dBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
@@ -732,30 +734,30 @@ public class BackupImportController exte
 		Transformer xformer = TransformerFactory.newInstance().newTransformer();
         xformer.transform(new DOMSource(doc), new StreamResult(sw));
         
-		List<Users> list = new ArrayList<Users>();
+		List<User> list = new ArrayList<User>();
 		InputNode root = NodeBuilder.read(new StringReader(sw.toString()));
-		InputNode root1 = NodeBuilder.read(new StringReader(sw.toString())); //HACK to handle Adresses inside user
+		InputNode root1 = NodeBuilder.read(new StringReader(sw.toString())); //HACK to handle Address inside user
 		InputNode listNode = root.getNext();
-		InputNode listNode1 = root1.getNext(); //HACK to handle Adresses inside user
+		InputNode listNode1 = root1.getNext(); //HACK to handle Address inside user
 		if (listNodeName.equals(listNode.getName())) {
 			InputNode item = listNode.getNext();
-			InputNode item1 = listNode1.getNext(); //HACK to handle Adresses inside user
+			InputNode item1 = listNode1.getNext(); //HACK to handle Address inside user
 			while (item != null) {
 				try {
-					Users u = ser.read(Users.class, item, false);
+					User u = ser.read(User.class, item, false);
 					
-					//HACK to handle Adresses inside user
+					//HACK to handle Address inside user
 					if (u.getAdresses() == null) {
-						Adresses a = ser.read(Adresses.class, item1, false);
+						Address a = ser.read(Address.class, item1, false);
 						u.setAdresses(a);
 					}
 					list.add(u);
 				} catch (Exception e) {
-					log.debug("Exception While reading node of type: " + Users.class, e);
+					log.debug("Exception While reading node of type: " + User.class, e);
 				}
 				item = listNode.getNext();
 				do {
-					item1 = listNode1.getNext(); //HACK to handle Adresses inside user
+					item1 = listNode1.getNext(); //HACK to handle Address inside user
 				} while (item != null && !"user".equals(item1.getName()));
 			}
 		}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Export.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Export.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Export.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Export.java Tue Feb  5 02:44:03 2013
@@ -35,7 +35,7 @@ import org.apache.openmeetings.data.user
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.data.user.dao.UsersDao;
 import org.apache.openmeetings.persistence.beans.domain.Organisation;
-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;
@@ -182,7 +182,7 @@ public class Export extends HttpServlet 
 							.longValue();
 					System.out.println("organisation_id: " + organisation_id);
 
-					List<Users> uList = null;
+					List<User> uList = null;
 					String downloadName = "users";
 					if (moduleName.equals("userorganisations")) {
 						Organisation orga = getOrganisationmanagement()

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java Tue Feb  5 02:44:03 2013
@@ -33,7 +33,7 @@ import org.apache.openmeetings.Openmeeti
 import org.apache.openmeetings.data.basic.Fieldmanagment;
 import org.apache.openmeetings.data.basic.Sessionmanagement;
 import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-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.OmFileHelper;
 import org.apache.velocity.VelocityContext;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java Tue Feb  5 02:44:03 2013
@@ -37,7 +37,7 @@ import org.apache.openmeetings.documents
 import org.apache.openmeetings.documents.GenerateThumbs;
 import org.apache.openmeetings.documents.beans.ConverterProcessResultList;
 import org.apache.openmeetings.documents.beans.UploadCompleteMessage;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.apache.openmeetings.utils.OmFileHelper;
 import org.apache.openmeetings.utils.StoredFile;
@@ -297,7 +297,7 @@ public class UploadController extends Ab
 						.generateThumb("_big_", completeName, 240));
 
 				String pictureuri = completeName.getName();
-				Users us = usersDao.get(userId);
+				User us = usersDao.get(userId);
 				us.setUpdatetime(new java.util.Date());
 				us.setPictureuri(pictureuri);
 				usersDao.update(us, userId);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientSessionInfo.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientSessionInfo.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientSessionInfo.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ClientSessionInfo.java Tue Feb  5 02:44:03 2013
@@ -18,7 +18,7 @@
  */
 package org.apache.openmeetings.session;
 
-import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.persistence.beans.room.Client;
 
 
 public class ClientSessionInfo {

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ISessionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ISessionManager.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ISessionManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ISessionManager.java Tue Feb  5 02:44:03 2013
@@ -23,7 +23,7 @@ import java.util.List;
 
 import org.apache.openmeetings.data.beans.basic.SearchResult;
 import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.persistence.beans.room.Client;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 
 /**

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/SessionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/SessionManager.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/SessionManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/SessionManager.java Tue Feb  5 02:44:03 2013
@@ -31,7 +31,7 @@ import java.util.Random;
 import org.apache.openmeetings.OpenmeetingsVariables;
 import org.apache.openmeetings.data.beans.basic.SearchResult;
 import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.persistence.beans.room.Client;
 import org.apache.openmeetings.session.store.IClientPersistenceStore;
 import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
 import org.red5.logging.Red5LoggerFactory;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java Tue Feb  5 02:44:03 2013
@@ -27,7 +27,7 @@ import java.util.Map;
 import org.apache.openmeetings.data.basic.dao.ServerDao;
 import org.apache.openmeetings.data.conference.dao.ClientDao;
 import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.persistence.beans.room.Client;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class DatabaseStore implements IClientPersistenceStore {

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java Tue Feb  5 02:44:03 2013
@@ -27,7 +27,7 @@ import java.util.Map;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
 import org.apache.openmeetings.persistence.beans.basic.Server;
-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;
 

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/IClientPersistenceStore.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/IClientPersistenceStore.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/IClientPersistenceStore.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/IClientPersistenceStore.java Tue Feb  5 02:44:03 2013
@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.persistence.beans.room.Client;
 
 public interface IClientPersistenceStore {
 

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java Tue Feb  5 02:44:03 2013
@@ -30,7 +30,7 @@ import org.apache.openmeetings.data.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.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
 import org.junit.Before;
 import org.junit.runner.RunWith;
@@ -114,8 +114,8 @@ public abstract class AbstractOpenmeetin
 		return ap;
 	}
 
-	public Users createUser(int rnd) throws Exception {
-		Users users = new Users();
+	public User createUser(int rnd) throws Exception {
+		User users = new User();
 		// add user
 		users.setFirstname("firstname" + rnd);
 		users.setLastname("lastname" + rnd);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java Tue Feb  5 02:44:03 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.Usermanagement;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +38,7 @@ public class TestDatabaseStructureUsersS
 
 		try {
 			
-			 SearchResult<Users> users = userManagement.getAllUserByRange("first", 0, 10, "orderby", true);
+			 SearchResult<User> users = userManagement.getAllUserByRange("first", 0, 10, "orderby", true);
 			 log.debug("[result]" + users.getResult().size());
 			 log.debug("[records]"+ users.getRecords());
 			 

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/domain/TestAddGroup.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/domain/TestAddGroup.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/domain/TestAddGroup.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/domain/TestAddGroup.java Tue Feb  5 02:44:03 2013
@@ -21,7 +21,7 @@ package org.apache.openmeetings.test.dom
 import org.apache.log4j.Logger;
 import org.apache.openmeetings.data.user.Organisationmanagement;
 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.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +49,7 @@ public class TestAddGroup extends Abstra
 
 		log.error("new organisation_user: " + organisation_usersid);
 
-		Users us = usersDao.get(new Long(1));
+		User us = usersDao.get(new Long(1));
 
 		log.error(us.getLastname());
 		log.error(us.getAdresses().getTown());

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSession.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSession.java Tue Feb  5 02:44:03 2013
@@ -26,7 +26,7 @@ import org.apache.openmeetings.Openmeeti
 import org.apache.openmeetings.data.basic.dao.ServerDao;
 import org.apache.openmeetings.data.conference.dao.ClientDao;
 import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.persistence.beans.room.Client;
 import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
 import org.junit.Test;
 import org.red5.logging.Red5LoggerFactory;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java Tue Feb  5 02:44:03 2013
@@ -26,7 +26,7 @@ import org.apache.openmeetings.Openmeeti
 import org.apache.openmeetings.data.basic.dao.ServerDao;
 import org.apache.openmeetings.data.conference.dao.ClientDao;
 import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.persistence.beans.room.Client;
 import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
 import org.junit.Test;
 import org.red5.logging.Red5LoggerFactory;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestHashMapSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestHashMapSession.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestHashMapSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestHashMapSession.java Tue Feb  5 02:44:03 2013
@@ -26,7 +26,7 @@ import java.util.Date;
 import java.util.Random;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.persistence.beans.room.Client;
 import org.apache.openmeetings.session.store.HashMapStore;
 import org.apache.openmeetings.session.store.IClientPersistenceStore;
 import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/user/TestUserOrganisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/user/TestUserOrganisation.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/user/TestUserOrganisation.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/user/TestUserOrganisation.java Tue Feb  5 02:44:03 2013
@@ -28,7 +28,7 @@ import org.apache.openmeetings.data.user
 import org.apache.openmeetings.data.user.dao.UsersDao;
 import org.apache.openmeetings.persistence.beans.domain.Organisation;
 import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,8 +39,8 @@ public class TestUserOrganisation extend
 	@Autowired
 	private UsersDao usersDao;
 	
-	private Users getValidUser() {
-		for (Users u : usersDao.getAllUsers()) {
+	private User getValidUser() {
+		for (User u : usersDao.getAllUsers()) {
 			if (!u.getDeleted() && u.getOrganisation_users().size() > 0) {
 				return u;
 			}
@@ -51,9 +51,9 @@ public class TestUserOrganisation extend
 	
 	@Test
 	public void getUsersByOrganisationId() {
-		Users u = getValidUser();
+		User u = getValidUser();
 		Long orgId = u.getOrganisation_users().get(0).getOrganisation().getOrganisation_id();
-		List<Users> ul = orgManagement.getUsersByOrganisationId(orgId, 0, 9999, "login", true);
+		List<User> ul = orgManagement.getUsersByOrganisationId(orgId, 0, 9999, "login", true);
 		assertTrue("Default Organisation should contain at least 1 user: " + ul.size(), ul.size() > 0);
 		
 		Organisation_Users ou = orgManagement.getOrganisation_UserByUserAndOrganisation(u.getUser_id(), orgId);
@@ -65,7 +65,7 @@ public class TestUserOrganisation extend
 		Long orgId = orgManagement.addOrganisation("Test Org", 1); //inserted by not checked
 		assertNotNull("New Organisation have valid id", orgId);
 		
-		List<Users> ul = orgManagement.getUsersByOrganisationId(orgId, 0, 9999, "login", true);
+		List<User> ul = orgManagement.getUsersByOrganisationId(orgId, 0, 9999, "login", true);
 		assertTrue("New Organisation should contain NO users: " + ul.size(), ul.size() == 0);
 		
 		boolean found = false;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/userdata/TestLogin.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/userdata/TestLogin.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/userdata/TestLogin.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/userdata/TestLogin.java Tue Feb  5 02:44:03 2013
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNot
 
 import org.apache.openmeetings.data.user.Usermanagement;
 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.MainService;
 import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
 import org.junit.Test;
@@ -40,7 +40,7 @@ public class TestLogin extends AbstractO
 	public void testTestLogin(){
 		Sessiondata sessionData = mService.getsessiondata();
 		
-		Users us = (Users) userManagement.loginUser(sessionData.getSession_id(), username, userpass, null, null, false);
+		User us = (User) userManagement.loginUser(sessionData.getSession_id(), username, userpass, null, null, false);
 		
 		assertNotNull("User is unable to login", us);
 		

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java Tue Feb  5 02:44:03 2013
@@ -26,7 +26,7 @@ import org.apache.openmeetings.Openmeeti
 import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
 import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
 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;
@@ -48,7 +48,7 @@ public class TimezoneUtil {
 	 * @param user
 	 * @return
 	 */
-	public TimeZone getTimezoneByUser(Users user) {
+	public TimeZone getTimezoneByUser(User user) {
 
 		if (user != null && user.getOmTimeZone() != null) {
 

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java Tue Feb  5 02:44:03 2013
@@ -32,7 +32,7 @@ import org.apache.openmeetings.data.user
 import org.apache.openmeetings.data.user.dao.UsersDao;
 import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
 import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession;
 import org.apache.wicket.authroles.authorization.strategies.role.Roles;
 import org.apache.wicket.request.Request;
@@ -86,8 +86,8 @@ public class WebSession extends Abstract
 		Object u = Application.getBean(Usermanagement.class).loginUser(SID, login, password,
 				null, null, false);
 		
-		if (u instanceof Users) {
-			Users user = (Users)u;
+		if (u instanceof User) {
+			User user = (User)u;
 			userId = user.getUser_id();
 			tz = TimeZone.getTimeZone(user.getOmTimeZone().getIcal());
 			ISO8601FORMAT.setTimeZone(tz);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java Tue Feb  5 02:44:03 2013
@@ -26,7 +26,7 @@ import java.util.List;
 import org.apache.openmeetings.data.user.dao.UsersDao;
 import org.apache.openmeetings.persistence.beans.domain.Organisation;
 import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.web.app.WebSession;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -43,25 +43,25 @@ public class AddUsersForm extends Form<V
 	private static final long serialVersionUID = -2458265250684437277L;
 	private Organisation organisation;
 	private String userSearchText;
-	private List<Users> usersInList = new ArrayList<Users>();
-	private List<Users> usersToAdd = new ArrayList<Users>();
+	private List<User> usersInList = new ArrayList<User>();
+	private List<User> usersToAdd = new ArrayList<User>();
 	
 	public AddUsersForm(String id, final GroupForm groupForm) {
 		super(id);
 		
-		IModel<List<Users>> listUsersModel = new PropertyModel<List<Users>>(AddUsersForm.this, "usersInList");
-		IModel<List<Users>> selectedUsersModel = new PropertyModel<List<Users>>(AddUsersForm.this, "usersToAdd");
-		final ListMultipleChoice<Users> users = new ListMultipleChoice<Users>("users"
+		IModel<List<User>> listUsersModel = new PropertyModel<List<User>>(AddUsersForm.this, "usersInList");
+		IModel<List<User>> selectedUsersModel = new PropertyModel<List<User>>(AddUsersForm.this, "usersToAdd");
+		final ListMultipleChoice<User> users = new ListMultipleChoice<User>("users"
 				, selectedUsersModel
 				, listUsersModel
-				, new IChoiceRenderer<Users>() {
+				, new IChoiceRenderer<User>() {
 			private static final long serialVersionUID = 1L;
 
-			public Object getDisplayValue(Users object) {
+			public Object getDisplayValue(User object) {
 				return getUser(object);
 			}
 
-			public String getIdValue(Users object, int index) {
+			public String getIdValue(User object, int index) {
 				return "" + object.getUser_id();
 			}
 		});
@@ -82,7 +82,7 @@ public class AddUsersForm extends Form<V
 
 			protected void onAfterSubmit(AjaxRequestTarget target, Form<?> form) {
 				UsersDao userDao = Application.getBean(UsersDao.class);
-				for (Users u : usersToAdd) {
+				for (User u : usersToAdd) {
 					List<Organisation_Users> orgUsers = u.getOrganisation_users();
 					boolean found = false;
 					for (Organisation_Users ou : orgUsers) {

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.java Tue Feb  5 02:44:03 2013
@@ -20,7 +20,7 @@ package org.apache.openmeetings.web.comp
 
 import org.apache.openmeetings.data.user.dao.OrganisationUserDao;
 import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.web.app.WebSession;
 import org.apache.openmeetings.web.components.ConfirmCallListener;
@@ -41,7 +41,7 @@ public class GroupUsersPanel extends Pan
 	private static final long serialVersionUID = -1813488722913433227L;
 	private long organisationId;
 	
-	public static String getUser(Users u) {
+	public static String getUser(User u) {
 		return u.getLogin() + " [" + u.getFirstname() + ", " + u.getLastname() + "]";
 	}
 	
@@ -70,7 +70,7 @@ public class GroupUsersPanel extends Pan
 			@Override
 			protected void populateItem(Item<Organisation_Users> item) {
 				final Organisation_Users orgUser = item.getModelObject();
-				Users u = orgUser.getUser();
+				User u = orgUser.getUser();
 				if (u != null) {
 					item.add(new Label("label", Model.of(getUser(u))));
 				} else {

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java Tue Feb  5 02:44:03 2013
@@ -24,9 +24,9 @@ import java.util.List;
 import org.apache.openmeetings.data.conference.Roommanagement;
 import org.apache.openmeetings.data.user.Organisationmanagement;
 import org.apache.openmeetings.persistence.beans.domain.Organisation;
-import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation;
+import org.apache.openmeetings.persistence.beans.room.RoomType;
+import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.persistence.beans.room.RoomOrganisation;
 import org.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.web.app.WebSession;
 import org.apache.openmeetings.web.components.admin.AdminBaseForm;
@@ -45,7 +45,7 @@ import org.apache.wicket.util.time.Durat
 
 import edu.emory.mathcs.backport.java.util.Arrays;
 
-public class RoomForm extends AdminBaseForm<Rooms> {
+public class RoomForm extends AdminBaseForm<Room> {
 
 	private static final long serialVersionUID = 1L;
 
@@ -54,8 +54,8 @@ public class RoomForm extends AdminBaseF
 	@SuppressWarnings("unchecked")
 	List<Long> DROPDOWN_NUMBER_OF_PARTICIPANTS = Arrays.asList(array);
 
-	public RoomForm(String id, final Rooms room) {
-		super(id, new CompoundPropertyModel<Rooms>(room));
+	public RoomForm(String id, final Room room) {
+		super(id, new CompoundPropertyModel<Room>(room));
 		setOutputMarkupId(true);
 		RequiredTextField<String> name = new RequiredTextField<String>("name");
 		name.setLabel(new Model<String>(WebSession.getString(193)));
@@ -73,9 +73,9 @@ public class RoomForm extends AdminBaseF
 					}
 				}));
 
-		add(new DropDownChoice<RoomTypes>("roomtype", Application.getBean(
+		add(new DropDownChoice<RoomType>("roomtype", Application.getBean(
 				Roommanagement.class).getAllRoomTypes(),
-				new ChoiceRenderer<RoomTypes>("name", "roomtypes_id")));
+				new ChoiceRenderer<RoomType>("name", "roomtypes_id")));
 
 		add(new TextArea<String>("comment"));
 
@@ -84,14 +84,14 @@ public class RoomForm extends AdminBaseF
 
 		List<Organisation> orgList = Application.getBean(
 				Organisationmanagement.class).getOrganisations(3L);
-		List<Rooms_Organisation> orgRooms = new ArrayList<Rooms_Organisation>(
+		List<RoomOrganisation> orgRooms = new ArrayList<RoomOrganisation>(
 				orgList.size());
 		for (Organisation org : orgList) {
-			orgRooms.add(new Rooms_Organisation(org));
+			orgRooms.add(new RoomOrganisation(org));
 		}
-		ListMultipleChoice<Rooms_Organisation> orgChoiceList = new ListMultipleChoice<Rooms_Organisation>(
+		ListMultipleChoice<RoomOrganisation> orgChoiceList = new ListMultipleChoice<RoomOrganisation>(
 				"roomOrganisations", orgRooms,
-				new ChoiceRenderer<Rooms_Organisation>("organisation.name",
+				new ChoiceRenderer<RoomOrganisation>("organisation.name",
 						"organisation.organisation_id"));
 		orgChoiceList.setMaxRows(6);
 		add(orgChoiceList);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java Tue Feb  5 02:44:03 2013
@@ -19,7 +19,7 @@
 package org.apache.openmeetings.web.components.admin.rooms;
 
 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.apache.openmeetings.web.components.admin.AdminPanel;
 import org.apache.openmeetings.web.components.admin.SearchableDataView;
 import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
@@ -46,12 +46,12 @@ public class RoomsPanel extends AdminPan
 	@SuppressWarnings("unchecked")
 	public RoomsPanel(String id) {
 		super(id);
-		SearchableDataView<Rooms> dataView = new SearchableDataView<Rooms>("roomList", new SearchableDataProvider<Rooms>(RoomDao.class)) {
+		SearchableDataView<Room> dataView = new SearchableDataView<Room>("roomList", new SearchableDataProvider<Room>(RoomDao.class)) {
 			private static final long serialVersionUID = 8715559628755439596L;
 
 			@Override
-			protected void populateItem(final Item<Rooms> item) {
-				final Rooms room = item.getModelObject();
+			protected void populateItem(final Item<Room> item) {
+				final Room room = item.getModelObject();
 				item.add(new Label("rooms_id", "" + room.getRooms_id()));
 				item.add(new Label("name", "" + room.getName()));
 				item.add(new Label("ispublic", ""+room.getIspublic()));
@@ -71,10 +71,10 @@ public class RoomsPanel extends AdminPan
 		
 		final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
 		add(listContainer.add(dataView).setOutputMarkupId(true));
-		DataViewContainer<Rooms> container = new DataViewContainer<Rooms>(listContainer, dataView);
-		container.setLinks(new OrderByBorder<Rooms>("orderById", "rooms_id", container)
-				, new OrderByBorder<Rooms>("orderByName", "name", container)
-				, new OrderByBorder<Rooms>("orderByPublic", "ispublic", container));
+		DataViewContainer<Room> container = new DataViewContainer<Room>(listContainer, dataView);
+		container.setLinks(new OrderByBorder<Room>("orderById", "rooms_id", container)
+				, new OrderByBorder<Room>("orderByName", "name", container)
+				, new OrderByBorder<Room>("orderByPublic", "ispublic", container));
 		add(container.orderLinks);
 		add(new PagedEntityListPanel("navigator", dataView) {
 			private static final long serialVersionUID = -1L;
@@ -85,7 +85,7 @@ public class RoomsPanel extends AdminPan
 			}
 		});
 		
-		form = new RoomForm("form", new Rooms());
+		form = new RoomForm("form", new Room());
 		form.showNewRecord();
         add(form);
 		

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java Tue Feb  5 02:44:03 2013
@@ -29,13 +29,13 @@ import org.apache.openmeetings.data.user
 import org.apache.openmeetings.data.user.dao.SalutationDao;
 import org.apache.openmeetings.data.user.dao.StateDao;
 import org.apache.openmeetings.data.user.dao.UsersDao;
-import org.apache.openmeetings.persistence.beans.adresses.States;
 import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
 import org.apache.openmeetings.persistence.beans.domain.Organisation;
 import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
 import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
-import org.apache.openmeetings.persistence.beans.user.Salutations;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.Salutation;
+import org.apache.openmeetings.persistence.beans.user.State;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
 import org.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.web.app.WebSession;
@@ -64,20 +64,20 @@ import org.apache.wicket.validation.vali
 import org.apache.wicket.validation.validator.StringValidator;
 
 /**
- * CRUD operations in form for {@link Users}
+ * CRUD operations in form for {@link User}
  * 
  * @author swagner
  * 
  */
-public class UserForm extends AdminBaseForm<Users> {
+public class UserForm extends AdminBaseForm<User> {
 
 	private static final long serialVersionUID = 1L;
 
 	private WebMarkupContainer listContainer;
 
-	private Users user;
+	private User user;
 
-	private final List<Salutations> saluationList = Application.getBean(
+	private final List<Salutation> saluationList = Application.getBean(
 			SalutationDao.class).getUserSalutations(
 			WebSession.getLanguage());
 	private final List<FieldLanguage> languageList = Application.getBean(
@@ -86,27 +86,27 @@ public class UserForm extends AdminBaseF
 	private PasswordTextField passwordField;
 
 	/**
-	 * Get id list of {@link Salutations}
+	 * Get id list of {@link Salutation}
 	 * 
 	 * @return
 	 */
 	private List<Long> getSalutationsIds() {
 		ArrayList<Long> saluationIdList = new ArrayList<Long>(
 				saluationList.size());
-		for (Salutations saluation : saluationList) {
+		for (Salutation saluation : saluationList) {
 			saluationIdList.add(saluation.getSalutations_id());
 		}
 		return saluationIdList;
 	}
 
 	/**
-	 * Get a name for a given id of {@link Salutations}
+	 * Get a name for a given id of {@link Salutation}
 	 * 
 	 * @param id
 	 * @return
 	 */
 	private String getSaluationLabelById(Long id) {
-		for (Salutations saluation : saluationList) {
+		for (Salutation saluation : saluationList) {
 			if (id.equals(saluation.getSalutations_id())) {
 				return saluation.getLabel().getValue();
 			}
@@ -144,8 +144,8 @@ public class UserForm extends AdminBaseF
 	}
 
 	public UserForm(String id, WebMarkupContainer listContainer,
-			final Users user) {
-		super(id, new CompoundPropertyModel<Users>(user));
+			final User user) {
+		super(id, new CompoundPropertyModel<User>(user));
 		setOutputMarkupId(true);
 		this.listContainer = listContainer;
 		this.user = user;
@@ -162,7 +162,7 @@ public class UserForm extends AdminBaseF
 
 	@Override
 	protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
-		Users u = getModelObject();
+		User u = getModelObject();
 		// TODO: Why the password field is not set via the Model is because its
 		// FetchType is Lazy, this extra hook here might be not needed with a
 		// different mechanism to protect the password from being read
@@ -197,12 +197,12 @@ public class UserForm extends AdminBaseF
 
 	@Override
 	protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
-		Users user = getModelObject();
+		User user = getModelObject();
 		if (user.getUser_id() <= 0) {
 			user = Application.getBean(UsersDao.class).get(
 					user.getUser_id());
 		} else {
-			user = new Users();
+			user = new User();
 		}
 		setModelObject(user);
 		target.add(this);
@@ -298,8 +298,8 @@ public class UserForm extends AdminBaseF
 		add(new TextField<String>("adresses.additionalname"));
 		add(new TextField<String>("adresses.zip"));
 		add(new TextField<String>("adresses.town"));
-		add(new DropDownChoice<States>("adresses.states", Application.getBean(
-				StateDao.class).getStates(), new ChoiceRenderer<States>(
+		add(new DropDownChoice<State>("adresses.states", Application.getBean(
+				StateDao.class).getStates(), new ChoiceRenderer<State>(
 				"name", "state_id")));
 
 		final String field159 = WebSession.getString(159);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java Tue Feb  5 02:44:03 2013
@@ -19,7 +19,7 @@
 package org.apache.openmeetings.web.components.admin.users;
 
 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.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.web.app.WebSession;
 import org.apache.openmeetings.web.components.admin.AdminPanel;
@@ -50,13 +50,13 @@ public class UsersPanel extends AdminPan
 	public UsersPanel(String id) {
 		super(id);
 
-		final SearchableDataView<Users> dataView = new SearchableDataView<Users>("userList"
-				, new SearchableDataProvider<Users>(UsersDao.class)) {
+		final SearchableDataView<User> dataView = new SearchableDataView<User>("userList"
+				, new SearchableDataProvider<User>(UsersDao.class)) {
 			private static final long serialVersionUID = 8715559628755439596L;
 
 			@Override
-			protected void populateItem(Item<Users> item) {
-				final Users u = item.getModelObject();
+			protected void populateItem(Item<User> item) {
+				final User u = item.getModelObject();
 				item.add(new Label("userId", "" + u.getUser_id()));
 				item.add(new Label("login", u.getLogin()));
 				item.add(new Label("firstName", u.getFirstname()));
@@ -79,11 +79,11 @@ public class UsersPanel extends AdminPan
 		final WebMarkupContainer listContainer = new WebMarkupContainer(
 				"listContainer");
 		add(listContainer.add(dataView).setOutputMarkupId(true));
-		DataViewContainer<Users> container = new DataViewContainer<Users>(listContainer, dataView);
-		container.setLinks(new OrderByBorder<Users>("orderById", "user_id", container)
-				, new OrderByBorder<Users>("orderByLogin", "login", container)
-				, new OrderByBorder<Users>("orderByFirstName", "firstname", container)
-				, new OrderByBorder<Users>("orderByLastName", "lastname", container));
+		DataViewContainer<User> container = new DataViewContainer<User>(listContainer, dataView);
+		container.setLinks(new OrderByBorder<User>("orderById", "user_id", container)
+				, new OrderByBorder<User>("orderByLogin", "login", container)
+				, new OrderByBorder<User>("orderByFirstName", "firstname", container)
+				, new OrderByBorder<User>("orderByLastName", "lastname", container));
 		add(container.orderLinks);
 		add(new PagedEntityListPanel("navigator", dataView) {
 			private static final long serialVersionUID = 5097048616003411362L;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarForm.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarForm.java Tue Feb  5 02:44:03 2013
@@ -28,8 +28,8 @@ import org.apache.openmeetings.data.user
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
 import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
 import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-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.web.app.Application;
 import org.apache.openmeetings.web.app.WebSession;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -68,18 +68,18 @@ public class CalendarForm extends Form<A
 				, Application.getBean(AppointmentReminderTypDao.class).getAppointmentReminderTypList()
 				, new ChoiceRenderer<AppointmentReminderTyps>("name", "typId")));
 		
-		final DropDownChoice<RoomTypes> roomType = new DropDownChoice<RoomTypes>(
+		final DropDownChoice<RoomType> roomType = new DropDownChoice<RoomType>(
 				"room.roomtype"
 				, Application.getBean(Roommanagement.class).getAllRoomTypes()
-				, new ChoiceRenderer<RoomTypes>("name", "roomtypes_id"));
+				, new ChoiceRenderer<RoomType>("name", "roomtypes_id"));
 		roomType.setEnabled(createRoom);
 		roomType.setOutputMarkupId(true);
 		add(roomType);
 		
-		final DropDownChoice<Rooms> room = new DropDownChoice<Rooms>(
+		final DropDownChoice<Room> room = new DropDownChoice<Room>(
 				"room"
 				, getRoomList()
-				, new ChoiceRenderer<Rooms>("name", "rooms_id"));
+				, new ChoiceRenderer<Room>("name", "rooms_id"));
 		room.setEnabled(!createRoom);
 		room.setOutputMarkupId(true);
 		add(room);
@@ -109,9 +109,9 @@ public class CalendarForm extends Form<A
 		return Boolean.TRUE.equals(getModelObject().getIsPasswordProtected());
 	}
 	
-	private List<Rooms> getRoomList() {
+	private List<Room> getRoomList() {
 		//FIXME need to be reviewed
-		List<Rooms> result = new ArrayList<Rooms>();
+		List<Room> result = new ArrayList<Room>();
 		RoomDao dao = Application.getBean(RoomDao.class);
 		result.addAll(dao.getPublicRooms());
 		for (Organisation_Users ou : Application.getBean(UsersDao.class).get(WebSession.getUserId()).getOrganisation_users()) {

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java Tue Feb  5 02:44:03 2013
@@ -24,7 +24,7 @@ import org.apache.openmeetings.Openmeeti
 import org.apache.openmeetings.data.user.Emailmanagement;
 import org.apache.openmeetings.data.user.Usermanagement;
 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.apache.openmeetings.servlet.outputhandler.BackupImportController;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -44,7 +44,7 @@ public class UserImport {
 	private BackupImportController backupController;
 
 	public Long addUsersByDocument(InputStream is) throws Exception {
-		for(Users us : backupController.readUserList(is, "users")) {
+		for(User us : backupController.readUserList(is, "users")) {
 			
 			boolean mailCheck = true;
 



Mime
View raw message