openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebawag...@apache.org
Subject svn commit: r1442455 [4/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
Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Address.java (from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/Adresses.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Address.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Address.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/Adresses.java&r1=1442415&r2=1442455&rev=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/Adresses.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Address.java Tue Feb  5 02:44:03 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.persistence.beans.adresses;
+package org.apache.openmeetings.persistence.beans.user;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -36,9 +36,9 @@ import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
 
 @Entity
-@Table(name = "adresses")
+@Table(name = "address")
 @Root(name="address")
-public class Adresses implements Serializable {
+public class Address implements Serializable {
 
 	private static final long serialVersionUID = 1387576041912128161L;
 	@Id
@@ -66,7 +66,7 @@ public class Adresses implements Seriali
 	@ManyToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name = "state_id")
 	@Element(name="state_id", data=true, required=false)
-	private States states;
+	private State states;
 	
 	@Column(name = "street")
 	@Element(data=true, required=false)
@@ -134,11 +134,11 @@ public class Adresses implements Seriali
 		this.starttime = starttime;
 	}
 
-	public States getStates() {
+	public State getStates() {
 		return states;
 	}
 
-	public void setStates(States states) {
+	public void setStates(State states) {
 		this.states = states;
 	}
 

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java (from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessages.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessages.java&r1=1442415&r2=1442455&rev=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessages.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java Tue Feb  5 02:44:03 2013
@@ -21,26 +21,51 @@ package org.apache.openmeetings.persiste
 import java.io.Serializable;
 import java.util.Date;
 
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
-import org.simpleframework.xml.Element;
-import org.simpleframework.xml.Root;
-
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
-import javax.persistence.JoinColumn;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
+import org.apache.openmeetings.persistence.beans.room.Room;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+
 @Entity
-@Table(name = "private_messages")
+@NamedQueries({
+	@NamedQuery(name = "getPrivateMessages", query = "select c from PrivateMessage c"),
+	@NamedQuery(name = "getPrivateMessagesById", query = "select c from PrivateMessage c " +
+			"where c.privateMessageId = :privateMessageId "),
+	@NamedQuery(name = "getNumberMessages", query = "select COUNT(c.privateMessageId) from PrivateMessage c " +
+			"where c.to.user_id = :toUserId " +
+			"AND c.isTrash = :isTrash " +
+			"AND c.owner.user_id = :toUserId " +
+			"AND c.isRead = :isRead " +
+			"AND c.privateMessageFolderId = :privateMessageFolderId "),
+	@NamedQuery(name = "updatePrivateMessagesToTrash", query = "UPDATE PrivateMessage c " +
+			"SET c.isTrash = :isTrash,c.privateMessageFolderId = :privateMessageFolderId " +
+			"where c.privateMessageId IN (:privateMessageIds) "),
+	@NamedQuery(name = "updatePrivateMessagesReadStatus", query = "UPDATE PrivateMessage c " +
+			"SET c.isRead = :isRead " +
+			"where c.privateMessageId IN (:privateMessageIds) "),
+	@NamedQuery(name = "moveMailsToFolder", query = "UPDATE PrivateMessage c " +
+			"SET c.privateMessageFolderId = :privateMessageFolderId, c.isTrash = false " +
+			"where c.privateMessageId IN (:privateMessageIds) "),		
+	@NamedQuery(name = "deletePrivateMessages", query = "DELETE FROM PrivateMessage c " +
+			"where c.privateMessageId IN (:privateMessageIds) "),	
+	@NamedQuery(name = "getPrivateMessagesByRoom", query = "select c from PrivateMessage c " +
+			"where c.room.rooms_id = :roomId "),				
+})
+@Table(name = "private_message")
 @Root(name="privatemessage")
-public class PrivateMessages implements Serializable {
+public class PrivateMessage implements Serializable {
 	private static final long serialVersionUID = 7541117437029707792L;
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -67,17 +92,17 @@ public class PrivateMessages implements 
 	@ManyToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name="from_id")
 	@Element(data=true, required=false)
-	private Users from;
+	private User from;
 	
 	@ManyToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name="to_id")
 	@Element(data=true, required=false)
-	private Users to;
+	private User to;
 	
 	@ManyToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name="owner_id")
 	@Element(data=true, required=false)
-	private Users owner;
+	private User owner;
 	
 		
 	@Column(name="booked_room")
@@ -87,7 +112,7 @@ public class PrivateMessages implements 
 	@ManyToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name="rooms_id")
 	@Element(data=true, required=false)
-	private Rooms room;
+	private Room room;
 	
 	@Column(name="is_read")
 	@Element(data=true)
@@ -141,24 +166,24 @@ public class PrivateMessages implements 
 		this.inserted = inserted;
 	}
 
-	public Users getFrom() {
+	public User getFrom() {
 		return from;
 	}
-	public void setFrom(Users from) {
+	public void setFrom(User from) {
 		this.from = from;
 	}
 
-	public Users getTo() {
+	public User getTo() {
 		return to;
 	}
-	public void setTo(Users to) {
+	public void setTo(User to) {
 		this.to = to;
 	}
 	
-	public Users getOwner() {
+	public User getOwner() {
 		return owner;
 	}
-	public void setOwner(Users owner) {
+	public void setOwner(User owner) {
 		this.owner = owner;
 	}
 	
@@ -169,10 +194,10 @@ public class PrivateMessages implements 
 		this.bookedRoom = bookedRoom;
 	}
 
-	public Rooms getRoom() {
+	public Room getRoom() {
 		return room;
 	}
-	public void setRoom(Rooms room) {
+	public void setRoom(Room room) {
 		this.room = room;
 	}
 

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Salutation.java (from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Salutations.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Salutation.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Salutation.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Salutations.java&r1=1442415&r2=1442455&rev=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Salutations.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Salutation.java Tue Feb  5 02:44:03 2013
@@ -21,10 +21,6 @@ package org.apache.openmeetings.persiste
 import java.io.Serializable;
 import java.util.Date;
 
-import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.simpleframework.xml.Element;
-import org.simpleframework.xml.Root;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -33,10 +29,14 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
+import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+
 @Entity
-@Table(name = "salutations")
+@Table(name = "salutation")
 @Root
-public class Salutations implements Serializable {
+public class Salutation implements Serializable {
 	private static final long serialVersionUID = -5806449519074435223L;
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/State.java (from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/States.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/State.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/State.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/States.java&r1=1442415&r2=1442455&rev=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/adresses/States.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/State.java Tue Feb  5 02:44:03 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.persistence.beans.adresses;
+package org.apache.openmeetings.persistence.beans.user;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -26,11 +26,18 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "states")
-public class States implements Serializable {
+@NamedQueries({
+	@NamedQuery(name = "getStateById", query = "select c from State as c " +
+			"where c.state_id = :state_id AND c.deleted <> :deleted"),
+	@NamedQuery(name = "getStates", query = "select c from State as c where c.deleted <> :deleted"),
+})
+@Table(name = "state")
+public class State implements Serializable {
 	private static final long serialVersionUID = -1629546369219451403L;
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java (from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java&r1=1442415&r2=1442455&rev=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java Tue Feb  5 02:44:03 2013
@@ -49,8 +49,6 @@ import org.apache.openjpa.persistence.Fe
 import org.apache.openjpa.persistence.LoadFetchGroup;
 import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
 import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
-import org.apache.openmeetings.persistence.beans.adresses.Adresses;
-import org.apache.openmeetings.persistence.beans.adresses.States;
 import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
 import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
 import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
@@ -75,20 +73,36 @@ import org.simpleframework.xml.Root;
  })
 })
 @NamedQueries({
-		@NamedQuery(name = "getAllUsers", query = "SELECT u FROM Users u"),
-		@NamedQuery(name = "checkPassword", query = "select count(c.user_id) from Users c "
-				+ "where c.deleted = false " //
-				+ "AND c.user_id = :userId " //
-				+ "AND c.password LIKE :password"), //
-		@NamedQuery(name = "updatePassword", query = "UPDATE Users u " //
-				+ "SET u.password = :password " //
-				+ "WHERE u.user_id = :userId"), //
-		@NamedQuery(name = "getNondeletedUsers", query = "SELECT u FROM Users u WHERE u.deleted = false"),
-		@NamedQuery(name = "countNondeletedUsers", query = "SELECT COUNT(u) FROM Users u WHERE u.deleted = false"),
-		@NamedQuery(name = "getUsersByOrganisationId", query = "SELECT u FROM Users u WHERE u.deleted = false AND u.organisation_users.organisation.organisation_id = :organisation_id") })
-@Table(name = "users")
+	@NamedQuery(name = "getUserById", query = "select c from User as c where c.user_id = :user_id"),
+	@NamedQuery(name = "checkUserLogin", query = "select c from User as c where c.login = :DataValue AND c.deleted <> :deleted"),
+	@NamedQuery(name = "getUserByName", query = "SELECT u FROM User as u "
+			+ " where u.login = :login" + " AND u.deleted <> :deleted"),
+	@NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User as u "
+			+ " where u.adresses.email = :email"
+			+ " AND u.deleted <> :deleted"),
+	@NamedQuery(name = "getUserByHash", query = "SELECT u FROM User as u "
+			+ " where u.resethash = :resethash"
+			+ " AND u.deleted <> :deleted"),
+	@NamedQuery(name = "selectMaxFromUsersWithSearch", query = "select count(c.user_id) from User c "
+			+ "where c.deleted = false " + "AND ("
+			+ "lower(c.login) LIKE :search "
+			+ "OR lower(c.firstname) LIKE :search "
+			+ "OR lower(c.lastname) LIKE :search )"),
+	@NamedQuery(name = "getAllUsers", query = "SELECT u FROM User u"),
+	@NamedQuery(name = "checkPassword", query = "select count(c.user_id) from User c "
+			+ "where c.deleted = false " //
+			+ "AND c.user_id = :userId " //
+			+ "AND c.password LIKE :password"), //
+	@NamedQuery(name = "updatePassword", query = "UPDATE User u " //
+			+ "SET u.password = :password " //
+			+ "WHERE u.user_id = :userId"), //
+	@NamedQuery(name = "getNondeletedUsers", query = "SELECT u FROM User u WHERE u.deleted = false"),
+	@NamedQuery(name = "countNondeletedUsers", query = "SELECT COUNT(u) FROM User u WHERE u.deleted = false"),
+	@NamedQuery(name = "getUsersByOrganisationId", query = "SELECT u FROM User u WHERE u.deleted = false AND u.organisation_users.organisation.organisation_id = :organisation_id") 
+})
+@Table(name = "user")
 @Root(name = "user")
-public class Users implements Serializable, IDataProviderEntity {
+public class User implements Serializable, IDataProviderEntity {
 
 	private static final long serialVersionUID = -2265479712596674065L;
 
@@ -176,7 +190,7 @@ public class Users implements Serializab
 	@ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
 	@JoinColumn(name = "adresses_id", insertable = true, updatable = true)
 	@Element(name = "address", required = false)
-	private Adresses adresses;
+	private Address adresses;
 
 	@Transient
 	private Userlevel userlevel;
@@ -247,19 +261,19 @@ public class Users implements Serializab
 		this.user_id = user_id;
 	}
 
-	public Adresses getAdresses() {
+	public Address getAdresses() {
 		return adresses;
 	}
 
-	public void setAdresses(Adresses adresses) {
+	public void setAdresses(Address adresses) {
 		this.adresses = adresses;
 	}
 
 	public void setAdresses(String street, String zip, String town,
-			States state, String additionalname, String comment, String fax,
+			State state, String additionalname, String comment, String fax,
 			String phone, String email) {
 		if (this.adresses == null) {
-			this.adresses = new Adresses();
+			this.adresses = new Address();
 		}
 		this.adresses.setStreet(street);
 		this.adresses.setZip(zip);

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContact.java (from r1442415, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContacts.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContact.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContact.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContacts.java&r1=1442415&r2=1442455&rev=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContacts.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContact.java Tue Feb  5 02:44:03 2013
@@ -21,24 +21,53 @@ package org.apache.openmeetings.persiste
 import java.io.Serializable;
 import java.util.Date;
 
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.ManyToOne;
 import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
 
 @Entity
-@Table(name = "user_contacts")
+@NamedQueries({
+	@NamedQuery(name = "deleteUserContact", query = "delete from UserContact u where u.userContactId = :userContactDeleteId"),
+	@NamedQuery(name = "deleteAllUserContacts", query = "delete from UserContact u where u.owner.user_id = :ownerId"),
+	@NamedQuery(name = "checkUserContacts", query = "select count(c.userContactId) from UserContact c " +
+			"where c.contact.user_id = :user_id AND c.owner.user_id = :ownerId "),
+	@NamedQuery(name = "getContactsByHash", query = "select c from UserContacts c " +
+			"where c.hash like :hash "),
+	@NamedQuery(name = "getContactsByUserAndStatus", query = "select c from UserContact c " +
+			"where c.owner.user_id = :ownerId " +
+			"AND c.pending = :pending " +
+			"AND c.contact.deleted <> true"),
+	@NamedQuery(name = "getUserContactByShareCalendar", query = "select c from UserContact c "
+			+ "where c.contact.user_id = :userId "
+			+ "AND c.owner.user_id = :contactId "
+			+ "AND c.shareCalendar = :shareCalendar "
+			+ "AND c.contact.deleted <> true"),
+	@NamedQuery(name = "getContactsByShareCalendar", query = "select c from UserContact c " +
+			"where c.contact.user_id = :contactId " +
+			"AND c.shareCalendar = :shareCalendar " +
+			"AND c.contact.deleted <> true"),
+	@NamedQuery(name = "getContactRequestsByUserAndStatus", query = "select c from UserContact c " +
+			"where c.contact.user_id = :user_id " +
+			"AND c.pending = :pending " +
+			"AND c.contact.deleted <> true"),
+	@NamedQuery(name = "getUserContactsById", query = "select c from UserContact c " +
+			"where c.userContactId = :userContactId"),
+	@NamedQuery(name = "getUserContacts", query = "select c from UserContact c"),	
+})
+@Table(name = "user_contact")
 @Root(name="usercontact")
-public class UserContacts implements Serializable {
+public class UserContact implements Serializable {
 	private static final long serialVersionUID = 2391405538978996206L;
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -49,12 +78,12 @@ public class UserContacts implements Ser
 	@ManyToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name="user_id")
 	@Element(data=true, required=false)
-	private Users contact;
+	private User contact;
 	
 	@ManyToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name="owner_id")
 	@Element(data=true, required=false)
-	private Users owner;
+	private User owner;
 	
 	@Column(name="pending")
 	@Element(data=true)
@@ -81,17 +110,17 @@ public class UserContacts implements Ser
 		this.userContactId = userContactId;
 	}
 	
-	public Users getContact() {
+	public User getContact() {
 		return contact;
 	}
-	public void setContact(Users contact) {
+	public void setContact(User contact) {
 		this.contact = contact;
 	}
 	
-	public Users getOwner() {
+	public User getOwner() {
 		return owner;
 	}
-	public void setOwner(Users owner) {
+	public void setOwner(User owner) {
 		this.owner = owner;
 	}
 	

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Userdata.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Userdata.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Userdata.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Userdata.java Tue Feb  5 02:44:03 2013
@@ -21,7 +21,6 @@ package org.apache.openmeetings.persiste
 import java.io.Serializable;
 import java.util.Date;
 
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -31,7 +30,7 @@ import javax.persistence.Lob;
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "userdata")
+@Table(name = "user_data")
 public class Userdata implements Serializable {
 	private static final long serialVersionUID = 8365799229794940172L;
 	@Id

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Userlevel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Userlevel.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Userlevel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Userlevel.java Tue Feb  5 02:44:03 2013
@@ -29,7 +29,7 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "userlevel")
+@Table(name = "user_level")
 public class Userlevel implements Serializable {
 	private static final long serialVersionUID = -1779037202328443340L;
 	@Id

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java Tue Feb  5 02:44:03 2013
@@ -35,9 +35,9 @@ 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.Users;
+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.utils.math.TimezoneUtil;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -141,7 +141,7 @@ public class CalendarService {
 
 			if (authLevelManagement.checkUserLevel(user_level)) {
 				
-				Users us = userManagement.getUserById(users_id);
+				User us = userManagement.getUserById(users_id);
 				
 				// Refactor the given time ignoring the Date is always UTC!
 				TimeZone timezone = timezoneUtil.getTimezoneByUser(us);
@@ -187,7 +187,7 @@ public class CalendarService {
 
 				log.debug("appointmentId " + appointmentId);
 				
-				Users us = userManagement.getUserById(users_id);
+				User us = userManagement.getUserById(users_id);
 				
 				// Refactor the given time ignoring the Date is always UTC!
 				TimeZone timezone = timezoneUtil.getTimezoneByUser(us);
@@ -206,7 +206,7 @@ public class CalendarService {
 				appointmentLogic
 						.getAppointMentById(appointmentId);
 
-				Users user = userManagement.getUserById(users_id);
+				User user = userManagement.getUserById(users_id);
 				
 				return appointmentDao.updateAppointmentByTime(appointmentId,
 						appointmentstart, appointmentend, users_id, baseurl,
@@ -238,7 +238,7 @@ public class CalendarService {
 				log.debug("updateAppointment");
 
 				Appointment app = appointmentLogic.getAppointMentById(appointmentId);
-				Rooms room = app.getRoom();
+				Room room = app.getRoom();
 				if (roomId > 0) {
 					if ( room.getRooms_id() != roomId) {
 						app.setRoom(roomDao.get(roomId));
@@ -249,7 +249,7 @@ public class CalendarService {
 						}
 					}
 				} else {
-					RoomTypes rt = roommanagement.getRoomTypesById(roomType);
+					RoomType rt = roommanagement.getRoomTypesById(roomType);
 	
 					if (room != null) {
 	
@@ -260,7 +260,7 @@ public class CalendarService {
 						roomDao.update(room, users_id);
 					}
 				}
-				Users user = userManagement.getUserById(users_id);
+				User user = userManagement.getUserById(users_id);
 				
 				// Refactor the given time ignoring the Date is always UTC!
 				TimeZone timezone = timezoneUtil.getTimezoneByUser(user);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java Tue Feb  5 02:44:03 2013
@@ -33,8 +33,8 @@ import org.apache.openmeetings.Openmeeti
 import org.apache.openmeetings.data.conference.Roommanagement;
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.data.whiteboard.EmoticonsManager;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
+import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.persistence.beans.room.Room;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.apache.openmeetings.remote.util.SessionVariablesUtil;
 import org.apache.openmeetings.session.ISessionManager;
@@ -116,7 +116,7 @@ public class ChatService implements IPen
 				return 1; //TODO weird
 			}
 			Long user_level = usermanagement.getUserLevelByID(currentClient.getUser_id());
-			Rooms room = roommanagement.getRoomById(user_level, room_id);
+			Room room = roommanagement.getRoomById(user_level, room_id);
 			@SuppressWarnings("rawtypes")
 			ArrayList messageMap = (ArrayList) newMessage;
 			// adding delimiter space, cause otherwise an emoticon in the last
@@ -203,7 +203,7 @@ public class ChatService implements IPen
 			Client currentClient = this.sessionManager.getClientByStreamId(current.getClient().getId(), null);
 			Long room_id = currentClient.getRoom_id();
 			Long user_level = usermanagement.getUserLevelByID(currentClient.getUser_id());
-			Rooms room = roommanagement.getRoomById(user_level, room_id);
+			Room room = roommanagement.getRoomById(user_level, room_id);
 			log.debug("room_id: " + room_id);
 
 			@SuppressWarnings("rawtypes")

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java Tue Feb  5 02:44:03 2013
@@ -39,7 +39,7 @@ import org.apache.openmeetings.documents
 import org.apache.openmeetings.documents.LibraryWmlLoader;
 import org.apache.openmeetings.documents.LoadLibraryPresentation;
 import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
-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.openmeetings.utils.crypt.MD5;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java Tue Feb  5 02:44:03 2013
@@ -44,12 +44,12 @@ import org.apache.openmeetings.data.conf
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.persistence.beans.basic.Server;
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
-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.user.Users;
+import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.persistence.beans.room.RoomModerator;
+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.persistence.beans.user.User;
 import org.apache.openmeetings.session.ISessionManager;
 import org.apache.openmeetings.utils.math.CalendarPatterns;
 import org.apache.openmeetings.utils.math.TimezoneUtil;
@@ -98,7 +98,7 @@ public class ConferenceService {
 	 * @param organisation_id
 	 * @return - all available Rooms of this organization
 	 */
-	public List<Rooms_Organisation> getRoomsByOrganisationAndType(String SID,
+	public List<RoomOrganisation> getRoomsByOrganisationAndType(String SID,
 			long organisation_id, long roomtypes_id) {
 		try {
 			Long users_id = sessionManagement.checkSession(SID);
@@ -109,15 +109,15 @@ public class ConferenceService {
 			if (user_level == null) {
 				return null;
 			}
-			List<Rooms_Organisation> roomOrgsList = roommanagement
+			List<RoomOrganisation> roomOrgsList = roommanagement
 					.getRoomsOrganisationByOrganisationIdAndRoomType(
 							user_level, organisation_id, roomtypes_id);
 
-			List<Rooms_Organisation> filtered = new ArrayList<Rooms_Organisation>();
+			List<RoomOrganisation> filtered = new ArrayList<RoomOrganisation>();
 
-			for (Iterator<Rooms_Organisation> iter = roomOrgsList.iterator(); iter
+			for (Iterator<RoomOrganisation> iter = roomOrgsList.iterator(); iter
 					.hasNext();) {
-				Rooms_Organisation orgRoom = iter.next();
+				RoomOrganisation orgRoom = iter.next();
 
 				if (!orgRoom.getRoom().getAppointment()) {
 					orgRoom.getRoom().setCurrentusers(
@@ -133,7 +133,7 @@ public class ConferenceService {
 		return null;
 	}
 
-	public List<Rooms_Organisation> getRoomsByOrganisationWithoutType(
+	public List<RoomOrganisation> getRoomsByOrganisationWithoutType(
 			String SID, long organisation_id) {
 		try {
 			Long users_id = sessionManagement.checkSession(SID);
@@ -144,11 +144,11 @@ public class ConferenceService {
 			if (user_level == null) {
 				return null;
 			}
-			List<Rooms_Organisation> roomOrgsList = roommanagement
+			List<RoomOrganisation> roomOrgsList = roommanagement
 					.getRoomsOrganisationByOrganisationId(user_level,
 							organisation_id);
 			
-			for (Rooms_Organisation roomOrg : roomOrgsList) {
+			for (RoomOrganisation roomOrg : roomOrgsList) {
 				roomOrg.getRoom().setCurrentusers(sessionManager.getClientListByRoom(roomOrg.getRoom().getRooms_id()));
 			}
 
@@ -167,7 +167,7 @@ public class ConferenceService {
 	 * @param organisation_id
 	 * @return - all rooms of an organization
 	 */
-	public SearchResult<Rooms_Organisation> getRoomsByOrganisation(String SID,
+	public SearchResult<RoomOrganisation> getRoomsByOrganisation(String SID,
 			long organisation_id, int start, int max, String orderby,
 			boolean asc) {
 
@@ -188,7 +188,7 @@ public class ConferenceService {
 	 * @param roomtypes_id
 	 * @return - public rooms with given type, null in case of the error
 	 */
-	public List<Rooms> getRoomsPublic(String SID, Long roomtypes_id) {
+	public List<Room> getRoomsPublic(String SID, Long roomtypes_id) {
 		try {
 			log.debug("getRoomsPublic");
 
@@ -196,14 +196,14 @@ public class ConferenceService {
 			Long User_level = userManagement.getUserLevelByID(users_id);
 			log.error("getRoomsPublic user_level: " + User_level);
 
-			List<Rooms> roomList = roommanagement.getPublicRooms(User_level,
+			List<Room> roomList = roommanagement.getPublicRooms(User_level,
 					roomtypes_id);
 
 			// Filter : no appointed meetings
-			List<Rooms> filtered = new ArrayList<Rooms>();
+			List<Room> filtered = new ArrayList<Room>();
 
-			for (Iterator<Rooms> iter = roomList.iterator(); iter.hasNext();) {
-				Rooms rooms = iter.next();
+			for (Iterator<Room> iter = roomList.iterator(); iter.hasNext();) {
+				Room rooms = iter.next();
 
 				if (!rooms.getAppointment()) {
 					rooms.setCurrentusers(this.getRoomClientsListByRoomId(rooms
@@ -219,16 +219,16 @@ public class ConferenceService {
 		return null;
 	}
 
-	public List<Rooms> getRoomsPublicWithoutType(String SID) {
+	public List<Room> getRoomsPublicWithoutType(String SID) {
 		try {
 
 			Long users_id = sessionManagement.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
 			log.debug("getRoomsPublic user_level: " + user_level);
 
-			List<Rooms> roomList = roomDao.getPublicRooms();
+			List<Room> roomList = roomDao.getPublicRooms();
 			
-			for (Rooms room : roomList) {
+			for (Room room : roomList) {
 				room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id()));
 			}
 
@@ -264,7 +264,7 @@ public class ConferenceService {
 	public Appointment getAppointMentDataForRoom(Long room_id) {
 		log.debug("getAppointMentDataForRoom");
 
-		Rooms room = roomDao.get(room_id);
+		Room room = roomDao.get(room_id);
 
 		if (room.getAppointment() == false)
 			return null;
@@ -294,7 +294,7 @@ public class ConferenceService {
 			Client currentClient = this.sessionManager
 					.getClientByStreamId(streamid, null);
 	
-			Rooms room = roomDao.get(room_id);
+			Room room = roomDao.get(room_id);
 	
 			if (room.getAppointment() == false) {
 				throw new IllegalStateException("Room has no appointment");
@@ -307,7 +307,7 @@ public class ConferenceService {
 
 			returnMap.put("appointment", appointment);
 
-			Users us = userManagement.getUserById(currentClient.getUser_id());
+			User us = userManagement.getUserById(currentClient.getUser_id());
 			TimeZone timezone = timezoneUtil.getTimezoneByUser(us);
 
 			returnMap.put("appointment", appointment);
@@ -334,7 +334,7 @@ public class ConferenceService {
 	 * 
 	 */
 	// --------------------------------------------------------------------------------------------
-	public List<Rooms> getAppointedMeetings(String SID, Long room_types_id) {
+	public List<Room> getAppointedMeetings(String SID, Long room_types_id) {
 		log.debug("ConferenceService.getAppointedMeetings");
 
 		Long users_id = sessionManagement.checkSession(SID);
@@ -344,14 +344,14 @@ public class ConferenceService {
 
 			List<Appointment> points = appointmentLogic
 					.getTodaysAppointmentsForUser(users_id);
-			List<Rooms> result = new ArrayList<Rooms>();
+			List<Room> result = new ArrayList<Room>();
 
 			if (points != null) {
 				for (int i = 0; i < points.size(); i++) {
 					Appointment ment = points.get(i);
 
 					Long rooms_id = ment.getRoom().getRooms_id();
-					Rooms rooom = roomDao.get(rooms_id);
+					Room rooom = roomDao.get(rooms_id);
 
 					if (!rooom.getRoomtype().getRoomtypes_id()
 							.equals(room_types_id))
@@ -374,7 +374,7 @@ public class ConferenceService {
 
 	// --------------------------------------------------------------------------------------------
 
-	public List<Rooms> getAppointedMeetingRoomsWithoutType(String SID) {
+	public List<Room> getAppointedMeetingRoomsWithoutType(String SID) {
 		log.debug("ConferenceService.getAppointedMeetings");
 		try {
 			Long users_id = sessionManagement.checkSession(SID);
@@ -383,14 +383,14 @@ public class ConferenceService {
 			if (authLevelManagement.checkUserLevel(user_level)) {
 				List<Appointment> appointments = appointmentLogic
 						.getTodaysAppointmentsForUser(users_id);
-				List<Rooms> result = new ArrayList<Rooms>();
+				List<Room> result = new ArrayList<Room>();
 
 				if (appointments != null) {
 					for (int i = 0; i < appointments.size(); i++) {
 						Appointment ment = appointments.get(i);
 
 						Long rooms_id = ment.getRoom().getRooms_id();
-						Rooms rooom = roomDao.get(rooms_id);
+						Room rooom = roomDao.get(rooms_id);
 
 						rooom.setCurrentusers(this
 								.getRoomClientsListByRoomId(rooom.getRooms_id()));
@@ -412,7 +412,7 @@ public class ConferenceService {
 	 * @param SID
 	 * @return - all room types available
 	 */
-	public List<RoomTypes> getRoomTypes(String SID) {
+	public List<RoomType> getRoomTypes(String SID) {
 		Long users_id = sessionManagement.checkSession(SID);
 		Long user_level = userManagement.getUserLevelByID(users_id);
 		if (authLevelManagement.checkUserLevel(user_level)) {
@@ -427,16 +427,16 @@ public class ConferenceService {
 	 * @param rooms_id
 	 * @return - room with the id given
 	 */
-	public Rooms getRoomById(String SID, long rooms_id) {
+	public Room getRoomById(String SID, long rooms_id) {
 		Long users_id = sessionManagement.checkSession(SID);
 		Long user_level = userManagement.getUserLevelByID(users_id);
 		return roommanagement.getRoomById(user_level, rooms_id);
 	}
 
-	public Rooms getRoomWithCurrentUsersById(String SID, long rooms_id) {
+	public Room getRoomWithCurrentUsersById(String SID, long rooms_id) {
 		Long users_id = sessionManagement.checkSession(SID);
 		Long user_level = userManagement.getUserLevelByID(users_id);
-		Rooms room = roommanagement.getRoomById(user_level, rooms_id);
+		Room room = roommanagement.getRoomById(user_level, rooms_id);
 		room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id()));
 		return room;
 	}
@@ -449,7 +449,7 @@ public class ConferenceService {
 	 * @param roomtypes_id
 	 * @return - room with the given external id
 	 */
-	public Rooms getRoomByExternalId(String SID, Long externalUserId,
+	public Room getRoomByExternalId(String SID, Long externalUserId,
 			String externalUserType, long roomtypes_id) {
 		Long users_id = sessionManagement.checkSession(SID);
 		Long user_level = userManagement.getUserLevelByID(users_id);
@@ -467,7 +467,7 @@ public class ConferenceService {
 	 * @param asc
 	 * @return - list of rooms being searched
 	 */
-	public SearchResult<Rooms> getRooms(String SID, int start, int max,
+	public SearchResult<Room> getRooms(String SID, int start, int max,
 			String orderby, boolean asc, String search) {
 		log.debug("getRooms");
 
@@ -477,7 +477,7 @@ public class ConferenceService {
 				search);
 	}
 
-	public SearchResult<Rooms> getRoomsWithCurrentUsers(String SID, int start,
+	public SearchResult<Room> getRoomsWithCurrentUsers(String SID, int start,
 			int max, String orderby, boolean asc) {
 		log.debug("getRooms");
 
@@ -494,7 +494,7 @@ public class ConferenceService {
 	 * @param rooms_id
 	 * @return - all Organisations of a room
 	 */
-	public List<Rooms_Organisation> getOrganisationByRoom(String SID,
+	public List<RoomOrganisation> getOrganisationByRoom(String SID,
 			long rooms_id) {
 		Long users_id = sessionManagement.checkSession(SID);
 		Long user_level = userManagement.getUserLevelByID(users_id);
@@ -620,7 +620,7 @@ public class ConferenceService {
 		return null;
 	}
 
-	public List<RoomModerators> getRoomModeratorsByRoomId(String SID,
+	public List<RoomModerator> getRoomModeratorsByRoomId(String SID,
 			Long roomId) {
 		try {
 
@@ -661,7 +661,7 @@ public class ConferenceService {
 	 */
 	public boolean isRoomFull(Long room_id) {
 		try {
-			Rooms room = roomDao.get(room_id);
+			Room room = roomDao.get(room_id);
 			
 			if (room.getNumberOfPartizipants() <= this.sessionManager
 					.getClientListByRoom(room_id).size()) {
@@ -729,7 +729,7 @@ public class ConferenceService {
 		return null;
 	}
 
-	public List<Rooms> getRoomsWithCurrentUsersByList(String SID, int start,
+	public List<Room> getRoomsWithCurrentUsersByList(String SID, int start,
 			int max, String orderby, boolean asc) {
 		log.debug("getRooms");
 
@@ -739,7 +739,7 @@ public class ConferenceService {
 				max, orderby, asc);
 	}
 
-	public List<Rooms> getRoomsWithCurrentUsersByListAndType(String SID,
+	public List<Room> getRoomsWithCurrentUsersByListAndType(String SID,
 			int start, int max, String orderby, boolean asc,
 			String externalRoomType) {
 		log.debug("getRooms");
@@ -750,7 +750,7 @@ public class ConferenceService {
 				start, max, orderby, asc, externalRoomType);
 	}
 
-	public Rooms getRoomByOwnerAndType(String SID, Long roomtypesId,
+	public Room getRoomByOwnerAndType(String SID, Long roomtypesId,
 			String roomName) {
 		Long users_id = sessionManagement.checkSession(SID);
 		Long user_level = userManagement.getUserLevelByID(users_id);
@@ -806,10 +806,10 @@ public class ConferenceService {
 			//per room
 			
 			//TODO / FIXME: Get room's maxUser in a single query instead a query for each room
-			final Map<Server,List<Rooms>> serverRoomMap = new HashMap<Server,List<Rooms>>();
+			final Map<Server,List<Room>> serverRoomMap = new HashMap<Server,List<Room>>();
 			
 			//Locally handled sessions are serverId = null
-			List<Rooms> localRoomList = new ArrayList<Rooms>();
+			List<Room> localRoomList = new ArrayList<Room>();
 			for (Long activeRoomId : sessionManager.getActiveRoomIdsByServer(null)) {
 				//FIXME / TODO: This is the single query to get the room by its id
 				localRoomList.add(roomDao.get(activeRoomId));
@@ -818,7 +818,7 @@ public class ConferenceService {
 			
 			//Slave/Server rooms
 			for (Server server : serverList) {
-				List<Rooms> roomList = new ArrayList<Rooms>();
+				List<Room> roomList = new ArrayList<Room>();
 				for (Long activeRoomId : sessionManager.getActiveRoomIdsByServer(server)) {
 					//FIXME / TODO: This is the single query to get the room by its id
 					roomList.add(roomDao.get(activeRoomId));
@@ -833,13 +833,13 @@ public class ConferenceService {
 		          public int compare(Server s1, Server s2) {
 		        	  int maxUsersInRoomS1 = 0;
 		        	  log.debug("serverRoomMap.get(s1) SIZE "+serverRoomMap.get(s1).size());
-		        	  for (Rooms room : serverRoomMap.get(s1)) {
+		        	  for (Room room : serverRoomMap.get(s1)) {
 		        		  log.debug("s1 room: "+room);
 		        		  maxUsersInRoomS1 += room.getNumberOfPartizipants();
 		        	  }
 		        	  int maxUsersInRoomS2 = 0;
 		        	  log.debug("serverRoomMap.get(s2) SIZE "+serverRoomMap.get(s2).size());
-		        	  for (Rooms room : serverRoomMap.get(s2)) {
+		        	  for (Room room : serverRoomMap.get(s2)) {
 		        		  log.debug("s2 room: "+room);
 		        		  maxUsersInRoomS2 += room.getNumberOfPartizipants();
 		        	  }
@@ -848,22 +848,22 @@ public class ConferenceService {
 		          }
 		     });
 			
-			LinkedHashMap<Server, List<Rooms>> serverRoomMapOrdered = new LinkedHashMap<Server, List<Rooms>>();
+			LinkedHashMap<Server, List<Room>> serverRoomMapOrdered = new LinkedHashMap<Server, List<Room>>();
 			for (Server server : list) {
 				serverRoomMapOrdered.put(server, serverRoomMap.get(server));
 			}
 
 			if (log.isDebugEnabled()) {
 				log.debug("Resulting order: ");
-				for (Entry<Server, List<Rooms>> entry : serverRoomMapOrdered
+				for (Entry<Server, List<Room>> entry : serverRoomMapOrdered
 						.entrySet()) {
 					int maxUsersInRoom = 0;
-					for (Rooms room : entry.getValue()) {
+					for (Room room : entry.getValue()) {
 						maxUsersInRoom += room.getNumberOfPartizipants();
 					}
 					
 					String roomids = "";
-					for (Rooms r : entry.getValue()) { 
+					for (Room r : entry.getValue()) { 
 						roomids += " " + r.getRooms_id(); 
 					}
 					

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java Tue Feb  5 02:44:03 2013
@@ -46,7 +46,7 @@ import org.apache.openmeetings.data.user
 import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
 import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingLog;
 import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.persistence.beans.room.Client;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.apache.openmeetings.session.ISessionManager;
 import org.apache.openmeetings.utils.OmFileHelper;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java Tue Feb  5 02:44:03 2013
@@ -31,7 +31,7 @@ import org.apache.openmeetings.data.user
 import org.apache.openmeetings.data.user.dao.UsersDao;
 import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
 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.red5.logging.Red5LoggerFactory;
 import org.red5.server.api.service.IPendingServiceCall;
 import org.red5.server.api.service.IPendingServiceCallback;
@@ -160,7 +160,7 @@ public class InvitationService implement
 	}
 
 	public String sendInvitationByHash(String SID, String invitationHash, String message, String baseurl, String subject, Long language_id) {
-		Users us = userDAO.get(sessionManagement.checkSession(SID));
+		User us = userDAO.get(sessionManagement.checkSession(SID));
 		Invitations inv = (Invitations)invitationManagement.getInvitationByHashCode(invitationHash, true);
 		return invitationManagement.sendInvitionLink(us, inv, message, baseurl, subject, language_id);
 	}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java Tue Feb  5 02:44:03 2013
@@ -43,7 +43,6 @@ import org.apache.openmeetings.data.user
 import org.apache.openmeetings.data.user.dao.StateDao;
 import org.apache.openmeetings.data.user.dao.UsersDao;
 import org.apache.openmeetings.ldap.LdapLoginManagement;
-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.Naviglobal;
@@ -51,9 +50,10 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.basic.RemoteSessionObject;
 import org.apache.openmeetings.persistence.beans.basic.SOAPLogin;
 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.persistence.beans.user.State;
 import org.apache.openmeetings.persistence.beans.user.Userdata;
-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.remote.util.SessionVariablesUtil;
 import org.apache.openmeetings.rss.LoadAtomRssFeed;
@@ -147,8 +147,8 @@ public class MainService implements IPen
 	 * @param USER_ID
 	 * @return - user with SID given
 	 */
-	public Users getUser(String SID, int USER_ID) {
-		Users users = new Users();
+	public User getUser(String SID, int USER_ID) {
+		User users = new User();
 		Long users_id = sessionManagement.checkSession(SID);
 		long user_level = userManagement.getUserLevelByID(users_id);
 		if (user_level > 2) {
@@ -216,13 +216,13 @@ public class MainService implements IPen
 		return -1L;
 	}
 
-	public Users loginByRemember(String SID, String remoteHashId) {
+	public User loginByRemember(String SID, String remoteHashId) {
 		try {
 
 			Client currentClient;
 			IConnection current = Red5.getConnectionLocal();
 
-			Users o = null;
+			User o = null;
 
 			currentClient = sessionManager.getClientByStreamId(current
 					.getClient().getId(), null);
@@ -267,8 +267,8 @@ public class MainService implements IPen
 
 		if (returnValue instanceof Long) {
 			return returnValue;
-		} else if (returnValue instanceof Users) {
-			Users us = (Users) returnValue;
+		} else if (returnValue instanceof User) {
+			User us = (User) returnValue;
 			if (authLevelManagement.checkUserLevel(
 					us.getLevel_id())) {
 				return us;
@@ -344,13 +344,13 @@ public class MainService implements IPen
 			if (o == null)
 				return null;
 
-			if (!o.getClass().isAssignableFrom(Users.class))
+			if (!o.getClass().isAssignableFrom(User.class))
 				return o;
 
 			if (currentClient.getUser_id() != null
 					&& currentClient.getUser_id() > 0) {
 
-				Users u = (Users) o;
+				User u = (User) o;
 				currentClient.setFirstname(u.getFirstname());
 				currentClient.setLastname(u.getLastname());
 
@@ -606,7 +606,7 @@ public class MainService implements IPen
 						// If so we need to check that we create this user in
 						// OpenMeetings and update its record
 
-						Users user = userManagement.getUserByExternalIdAndType(
+						User user = userManagement.getUserByExternalIdAndType(
 								userObject.getExternalUserId(),
 								userObject.getExternalUserType());
 
@@ -676,15 +676,15 @@ public class MainService implements IPen
 	 * 
 	 * @param SID
 	 */
-	public Users markSessionAsLogedIn(String SID) {
+	public User markSessionAsLogedIn(String SID) {
 		try {
 			sessionManagement.updateUserWithoutSession(SID, -1L);
 			
 			Long defaultRpcUserid = configDao.getConfValue(
 					"default.rpc.userid", Long.class, "-1");
-			Users defaultRpcUser = userManagement.getUserById(defaultRpcUserid);
+			User defaultRpcUser = userManagement.getUserById(defaultRpcUserid);
 			
-			Users user = new Users();
+			User user = new User();
 			user.setOrganisation_users(defaultRpcUser.getOrganisation_users());
 			
 			return user;
@@ -724,7 +724,7 @@ public class MainService implements IPen
 	 * 
 	 * @return List of State-Objects or null
 	 */
-	public List<States> getStates() {
+	public List<State> getStates() {
 		return statemanagement.getStates();
 	}
 

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/OrganisationService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/OrganisationService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/OrganisationService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/OrganisationService.java Tue Feb  5 02:44:03 2013
@@ -28,7 +28,7 @@ import org.apache.openmeetings.data.bean
 import org.apache.openmeetings.data.user.Organisationmanagement;
 import org.apache.openmeetings.data.user.Usermanagement;
 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.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -150,7 +150,7 @@ public class OrganisationService {
 	 * @param asc
 	 * @return all users of a given organisation
 	 */
-	public SearchResult<Users> getUsersByOrganisation(String SID,
+	public SearchResult<User> getUsersByOrganisation(String SID,
 			long organisation_id, int start, int max, String orderby,
 			boolean asc) {
 		try {
@@ -162,7 +162,7 @@ public class OrganisationService {
 								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/remote/PollService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PollService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PollService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PollService.java Tue Feb  5 02:44:03 2013
@@ -30,7 +30,7 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.poll.RoomPoll;
 import org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.persistence.beans.room.Client;
 import org.apache.openmeetings.session.ISessionManager;
 import org.red5.logging.Red5LoggerFactory;
 import org.red5.server.api.IConnection;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java Tue Feb  5 02:44:03 2013
@@ -52,13 +52,13 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.domain.Organisation;
 import org.apache.openmeetings.persistence.beans.invitation.Invitations;
 import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
+import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.persistence.beans.room.Room;
 import org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder;
-import org.apache.openmeetings.persistence.beans.user.PrivateMessages;
-import org.apache.openmeetings.persistence.beans.user.Salutations;
-import org.apache.openmeetings.persistence.beans.user.UserContacts;
-import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.persistence.beans.user.PrivateMessage;
+import org.apache.openmeetings.persistence.beans.user.Salutation;
+import org.apache.openmeetings.persistence.beans.user.UserContact;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.apache.openmeetings.session.ISessionManager;
 import org.apache.openmeetings.templates.RequestContactConfirmTemplate;
@@ -74,7 +74,7 @@ import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * Provides method to manipulate {@link Users}
+ * Provides method to manipulate {@link User}
  * 
  * @author sebawagner
  * 
@@ -143,7 +143,7 @@ public class UserService {
 	 * @param SID
 	 * @return get the user bound to this session
 	 */
-	public Users getUserSelf(String SID) {
+	public User getUserSelf(String SID) {
 		Long users_id = sessionManagement.checkSession(SID);
 		return usersDao.get(users_id);
 	}
@@ -171,7 +171,7 @@ public class UserService {
 	 * @param user_id
 	 * @return User with the id given
 	 */
-	public Users getUserById(String SID, long user_id) {
+	public User getUserById(String SID, long user_id) {
 		Long users_id = sessionManagement.checkSession(SID);
 		Long user_level = userManagement.getUserLevelByID(users_id);
 		return userManagement.checkAdmingetUserById(user_level, user_id);
@@ -199,7 +199,7 @@ public class UserService {
 	 * @param SID
 	 * @return all availible Salutations
 	 */
-	public List<Salutations> getUserSalutations(String SID, long language_id) {
+	public List<Salutation> getUserSalutations(String SID, long language_id) {
 		return salutationmanagement.getUserSalutations(language_id);
 	}
 
@@ -216,7 +216,7 @@ public class UserService {
 	 * @param asc
 	 * @return List of the users found
 	 */
-	public List<Users> searchUser(String SID, String searchcriteria,
+	public List<User> searchUser(String SID, String searchcriteria,
 			String searchstring, int max, int start, String orderby, boolean asc) {
 		Long users_id = sessionManagement.checkSession(SID);
 		Long user_level = userManagement.getUserLevelByID(users_id);
@@ -235,13 +235,13 @@ public class UserService {
 	 * @param asc
 	 * @return list of all users of an organisation
 	 */
-	public List<Users> getOrgUserList(String SID, long organisation_id,
+	public List<User> getOrgUserList(String SID, long organisation_id,
 			int start, int max, String orderby, boolean asc) {
 		return organisationmanagement.getUsersByOrganisationId(organisation_id,
 				start, max, orderby, asc);
 	}
 
-	public List<Users> getUserListByModForm(String SID) {
+	public List<User> getUserListByModForm(String SID) {
 		Long users_id = sessionManagement.checkSession(SID);
 		Long user_level = userManagement.getUserLevelByID(users_id);
 		return userManagement.getUserByMod(user_level, users_id);
@@ -294,7 +294,7 @@ public class UserService {
 	 * @param orderby
 	 * @return whole user-list
 	 */
-	public SearchResult<Users> getUserList(String SID, int start, int max,
+	public SearchResult<User> getUserList(String SID, int start, int max,
 			String orderby, boolean asc) {
 		Long users_id = sessionManagement.checkSession(SID);
 		Long user_level = userManagement.getUserLevelByID(users_id);
@@ -302,7 +302,7 @@ public class UserService {
 				.getUsersList(user_level, start, max, orderby, asc);
 	}
 
-	public SearchResult<Users> getUserListWithSearch(String SID, int start,
+	public SearchResult<User> getUserListWithSearch(String SID, int start,
 			int max, String orderby, boolean asc, String search) {
 		Long users_id = sessionManagement.checkSession(SID);
 		Long user_level = userManagement.getUserLevelByID(users_id);
@@ -320,7 +320,7 @@ public class UserService {
 	 * @param orderby
 	 * @return user-list by search criteria
 	 */
-	public SearchResult<Users> getAllUserBySearchRange(String SID,
+	public SearchResult<User> getAllUserBySearchRange(String SID,
 			String search, int start, int max, String orderby, boolean asc) {
 		return userManagement.getAllUserByRange(search, start, max, orderby,
 				asc);
@@ -579,14 +579,14 @@ public class UserService {
 		return false;
 	}
 
-	public Users updateUserSelfTimeZone(String SID, String jname) {
+	public User updateUserSelfTimeZone(String SID, String jname) {
 		try {
 			Long users_id = sessionManagement.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				Users us = userManagement.getUserById(users_id);
+				User us = userManagement.getUserById(users_id);
 
 				us.setOmTimeZone(omTimeZoneDaoImpl.getOmTimeZone(jname));
 				us.setForceTimeZoneCheck(false);
@@ -603,7 +603,7 @@ public class UserService {
 		return null;
 	}
 
-	public SearchResult<Users> searchUserProfile(String SID, String searchTxt,
+	public SearchResult<User> searchUserProfile(String SID, String searchTxt,
 			String userOffers, String userSearchs, String orderBy, int start,
 			int max, boolean asc) {
 		try {
@@ -612,9 +612,9 @@ public class UserService {
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				SearchResult<Users> searchResult = new SearchResult<Users>();
-				searchResult.setObjectName(Users.class.getName());
-				List<Users> userList = userManagement.searchUserProfile(
+				SearchResult<User> searchResult = new SearchResult<User>();
+				searchResult.setObjectName(User.class.getName());
+				List<User> userList = userManagement.searchUserProfile(
 						searchTxt, userOffers, userSearchs, orderBy, start,
 						max, asc);
 				searchResult.setResult(userList);
@@ -654,9 +654,9 @@ public class UserService {
 				Long userContactId = userContactsDao.addUserContact(
 						userToAdd_id, users_id, true, hash);
 
-				Users user = userManagement.getUserById(users_id);
+				User user = userManagement.getUserById(users_id);
 
-				Users userToAdd = userManagement.getUserById(userToAdd_id);
+				User userToAdd = userManagement.getUserById(userToAdd_id);
 
 				Long language_id = userToAdd.getLanguage_id();
 				if (language_id == null) {
@@ -729,14 +729,14 @@ public class UserService {
 		return null;
 	}
 
-	public List<UserContacts> getPendingUserContacts(String SID) {
+	public List<UserContact> getPendingUserContacts(String SID) {
 		try {
 			Long users_id = sessionManagement.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				List<UserContacts> uList = userContactsDao
+				List<UserContact> uList = userContactsDao
 						.getContactRequestsByUserAndStatus(users_id, true);
 
 				return uList;
@@ -756,7 +756,7 @@ public class UserService {
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				UserContacts userContact = userContactsDao
+				UserContact userContact = userContactsDao
 						.getContactsByHash(hash);
 
 				if (userContact == null) {
@@ -783,14 +783,14 @@ public class UserService {
 		return null;
 	}
 
-	public List<UserContacts> getUserContacts(String SID) {
+	public List<UserContact> getUserContacts(String SID) {
 		try {
 			Long users_id = sessionManagement.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				List<UserContacts> uList = userContactsDao
+				List<UserContact> uList = userContactsDao
 						.getContactsByUserAndStatus(users_id, false);
 
 				return uList;
@@ -809,7 +809,7 @@ public class UserService {
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				UserContacts userContacts = userContactsDao
+				UserContact userContacts = userContactsDao
 						.getUserContacts(userContactId);
 
 				if (userContacts == null) {
@@ -836,7 +836,7 @@ public class UserService {
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				UserContacts userContacts = userContactsDao
+				UserContact userContacts = userContactsDao
 						.getUserContacts(userContactId);
 
 				if (userContacts == null) {
@@ -860,7 +860,7 @@ public class UserService {
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				UserContacts userContacts = userContactsDao
+				UserContact userContacts = userContactsDao
 						.getUserContacts(userContactId);
 
 				if (userContacts == null) {
@@ -882,7 +882,7 @@ public class UserService {
 					userContactsDao.addUserContact(userContacts.getOwner()
 							.getUser_id(), users_id, false, "");
 
-					Users user = userContacts.getOwner();
+					User user = userContacts.getOwner();
 
 					if (user.getAdresses() != null) {
 
@@ -967,7 +967,7 @@ public class UserService {
 			Long user_level = userManagement.getUserLevelByID(users_id);
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
-				Users from = userManagement.getUserById(users_id);
+				User from = userManagement.getUserById(users_id);
 				TimeZone timezone = timezoneUtil.getTimezoneByUser(from);
 
 				Date appointmentstart = createCalendarDate(timezone,
@@ -982,7 +982,7 @@ public class UserService {
 						+ CalendarPatterns
 								.getDateWithTimeByMiliSeconds(appointmentend));
 
-				Rooms room = null;
+				Room room = null;
 
 				String baseURL = "http://" + domain + ":" + port + webapp;
 				if (port.equals("80")) {
@@ -1056,7 +1056,7 @@ public class UserService {
 						language_id = configurationDaoImpl.getConfValue("default_lang_id", Long.class, "1");
 					}
 					String invitation_link = null;
-					Users to = userManagement.getUserByEmail(email);
+					User to = userManagement.getUserByEmail(email);
 
 					if (bookedRoom) {
 						// Add the appointment to the calendar of the user (if
@@ -1189,8 +1189,8 @@ public class UserService {
 	 * Date appointmentstart = calFrom.getTime(); Date appointmentend =
 	 * calTo.getTime();
 	 */
-	private Long addAppointmentToUser(String subject, String message, Users to,
-			List<String> recipients, Rooms room, Date appointmentstart,
+	private Long addAppointmentToUser(String subject, String message, User to,
+			List<String> recipients, Room room, Date appointmentstart,
 			Date appointmentend, Boolean invitor, Boolean isConnectedEvent,
 			String sendJNameTimeZone) throws Exception {
 
@@ -1201,7 +1201,7 @@ public class UserService {
 
 		for (String email : recipients) {
 
-			Users meetingMember = userManagement.getUserByEmail(email);
+			User meetingMember = userManagement.getUserByEmail(email);
 
 			if (meetingMember != null) {
 
@@ -1235,8 +1235,8 @@ public class UserService {
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				SearchResult<PrivateMessages> searchResult = new SearchResult<PrivateMessages>();
-				searchResult.setObjectName(Users.class.getName());
+				SearchResult<PrivateMessage> searchResult = new SearchResult<PrivateMessage>();
+				searchResult.setObjectName(User.class.getName());
 				return privateMessagesDao
 						.getNumberMessages(users_id, 0L, false);
 
@@ -1247,7 +1247,7 @@ public class UserService {
 		return null;
 	}
 
-	public SearchResult<PrivateMessages> getInbox(String SID, String search,
+	public SearchResult<PrivateMessage> getInbox(String SID, String search,
 			String orderBy, int start, Boolean asc, Integer max) {
 		try {
 
@@ -1256,9 +1256,9 @@ public class UserService {
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				SearchResult<PrivateMessages> searchResult = new SearchResult<PrivateMessages>();
-				searchResult.setObjectName(Users.class.getName());
-				List<PrivateMessages> userList = privateMessagesDao
+				SearchResult<PrivateMessage> searchResult = new SearchResult<PrivateMessage>();
+				searchResult.setObjectName(User.class.getName());
+				List<PrivateMessage> userList = privateMessagesDao
 						.getPrivateMessagesByUser(users_id, search, orderBy,
 								start, asc, 0L, max);
 
@@ -1279,7 +1279,7 @@ public class UserService {
 		return null;
 	}
 
-	public SearchResult<PrivateMessages> getSend(String SID, String search,
+	public SearchResult<PrivateMessage> getSend(String SID, String search,
 			String orderBy, Integer start, Boolean asc, Integer max) {
 		try {
 
@@ -1288,9 +1288,9 @@ public class UserService {
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				SearchResult<PrivateMessages> searchResult = new SearchResult<PrivateMessages>();
-				searchResult.setObjectName(Users.class.getName());
-				List<PrivateMessages> userList = privateMessagesDao
+				SearchResult<PrivateMessage> searchResult = new SearchResult<PrivateMessage>();
+				searchResult.setObjectName(User.class.getName());
+				List<PrivateMessage> userList = privateMessagesDao
 						.getSendPrivateMessagesByUser(users_id, search,
 								orderBy, start, asc, 0L, max);
 
@@ -1311,7 +1311,7 @@ public class UserService {
 		return null;
 	}
 
-	public SearchResult<PrivateMessages> getTrash(String SID, String search,
+	public SearchResult<PrivateMessage> getTrash(String SID, String search,
 			String orderBy, Integer start, Boolean asc, Integer max) {
 		try {
 
@@ -1320,9 +1320,9 @@ public class UserService {
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				SearchResult<PrivateMessages> searchResult = new SearchResult<PrivateMessages>();
-				searchResult.setObjectName(Users.class.getName());
-				List<PrivateMessages> userList = privateMessagesDao
+				SearchResult<PrivateMessage> searchResult = new SearchResult<PrivateMessage>();
+				searchResult.setObjectName(User.class.getName());
+				List<PrivateMessage> userList = privateMessagesDao
 						.getTrashPrivateMessagesByUser(users_id, search,
 								orderBy, start, asc, max);
 
@@ -1343,7 +1343,7 @@ public class UserService {
 		return null;
 	}
 
-	public SearchResult<PrivateMessages> getFolder(String SID,
+	public SearchResult<PrivateMessage> getFolder(String SID,
 			Long privateMessageFolderId, String search, String orderBy,
 			Integer start, Boolean asc, Integer max) {
 		try {
@@ -1353,9 +1353,9 @@ public class UserService {
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				SearchResult<PrivateMessages> searchResult = new SearchResult<PrivateMessages>();
-				searchResult.setObjectName(Users.class.getName());
-				List<PrivateMessages> userList = privateMessagesDao
+				SearchResult<PrivateMessage> searchResult = new SearchResult<PrivateMessage>();
+				searchResult.setObjectName(User.class.getName());
+				List<PrivateMessage> userList = privateMessagesDao
 						.getFolderPrivateMessagesByUser(users_id, search,
 								orderBy, start, asc, privateMessageFolderId,
 								max);
@@ -1575,10 +1575,10 @@ public class UserService {
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				List<UserContacts> uList = userContactsDao
+				List<UserContact> uList = userContactsDao
 						.getContactsByUserAndStatus(users_id, false);
 
-				for (UserContacts userContact : uList) {
+				for (UserContact userContact : uList) {
 
 					if (userContact.getContact().getUser_id().equals(user_id)) {
 						return true;
@@ -1605,7 +1605,7 @@ public class UserService {
 			// users only
 			if (authLevelManagement.checkUserLevel(user_level)) {
 
-				UserContacts userContacts = userContactsDao
+				UserContact userContacts = userContactsDao
 						.getUserContacts(userContactId);
 
 				userContacts.setShareCalendar(shareCalendar);
@@ -1668,7 +1668,7 @@ public class UserService {
 		return null;
 	}
 
-	public List<UserContacts> getUserContactsWithShareCalendar(String SID) {
+	public List<UserContact> getUserContactsWithShareCalendar(String SID) {
 		try {
 			Long users_id = sessionManagement.checkSession(SID);
 			Long user_level = userManagement.getUserLevelByID(users_id);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java Tue Feb  5 02:44:03 2013
@@ -38,7 +38,7 @@ import org.apache.openmeetings.data.whit
 import org.apache.openmeetings.data.whiteboard.dto.WhiteboardObject;
 import org.apache.openmeetings.data.whiteboard.dto.WhiteboardObjectList;
 import org.apache.openmeetings.data.whiteboard.dto.WhiteboardSyncLockObject;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.apache.openmeetings.persistence.beans.room.Client;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.apache.openmeetings.session.ISessionManager;
 import org.apache.openmeetings.utils.OmFileHelper;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Tue Feb  5 02:44:03 2013
@@ -48,9 +48,9 @@ import org.apache.openmeetings.documents
 import org.apache.openmeetings.persistence.beans.basic.Server;
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
 import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
-import org.apache.openmeetings.persistence.beans.rooms.Client;
-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.Room;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.remote.FLVRecorderService;
 import org.apache.openmeetings.remote.WhiteBoardService;
 import org.apache.openmeetings.remote.util.SessionVariablesUtil;
@@ -1223,7 +1223,7 @@ public class ScopeApplicationAdapter ext
 				return 2L;
 			} else {
 				// No moderator in this room at the moment
-				Rooms room = roomDao.get(currentClient.getRoom_id());
+				Room room = roomDao.get(currentClient.getRoom_id());
 
 				if (room.getIsModeratedRoom()) {
 					return 3L;
@@ -1337,7 +1337,7 @@ public class ScopeApplicationAdapter ext
 		try {
 
 			// appointed meeting or moderated Room?
-			Rooms room = roomDao.get(room_id);
+			Room room = roomDao.get(room_id);
 
 			// not really - default logic
 			if (room.getAppointment() == null || room.getAppointment() == false) {
@@ -1431,7 +1431,7 @@ public class ScopeApplicationAdapter ext
 			// Inject externalUserId if nothing is set yet
 			if (currentClient.getExternalUserId() == null) {
 				if (currentClient.getUser_id() != null) {
-					Users us = usersDao.get(currentClient.getUser_id());
+					User us = usersDao.get(currentClient.getUser_id());
 					if (us != null) {
 						currentClient.setExternalUserId(us.getExternalUserId());
 						currentClient.setExternalUserType(us.getExternalUserType());
@@ -1445,7 +1445,7 @@ public class ScopeApplicationAdapter ext
 			this.sessionManager.updateClientByStreamId(streamid,
 					currentClient, true, null);
 
-            Rooms room = roomDao.get(room_id);
+            Room room = roomDao.get(room_id);
             if (room.getShowMicrophoneStatus()) {
             	currentClient.setCanGiveAudio(true);
             }
@@ -1724,7 +1724,7 @@ public class ScopeApplicationAdapter ext
 			// cause invited users have no associated User, so
 			// you cannot set the firstname,lastname from the UserRecord
 			if (userId != null) {
-				Users us = usersDao.get(userId);
+				User us = usersDao.get(userId);
 				
 				if (us != null) {
 					currentClient.setExternalUserId(us.getExternalUserId());
@@ -1771,7 +1771,7 @@ public class ScopeApplicationAdapter ext
 			log.debug("UDPATE SESSION " + SID + ", " + userId);
 			sessionManagement.updateUserWithoutSession(SID, userId);
 
-			Users user = userManagement.getUserById(userId);
+			User user = userManagement.getUserById(userId);
 
 			if (user != null) {
 				currentClient.setExternalUserId(user.getExternalUserId());
@@ -1781,7 +1781,7 @@ public class ScopeApplicationAdapter ext
 			// only fill this value from User-Record
 			// cause invited users have non
 			// you cannot set the firstname,lastname from the UserRecord
-			Users us = usersDao.get(userId);
+			User us = usersDao.get(userId);
 			if (us != null && us.getPictureuri() != null) {
 				// set Picture-URI
 				currentClient.setPicture_uri(us.getPictureuri());
@@ -2821,7 +2821,7 @@ public class ScopeApplicationAdapter ext
     }
 
     public synchronized String getSipNumber(Long room_id) {
-        Rooms rooms = roomDao.get(room_id);
+        Room rooms = roomDao.get(room_id);
         if(rooms != null && rooms.getMeetme() != null) {
             log.debug("getSipNumber: room_id: {}, sipNumber: {}", new Object[]{room_id, rooms.getMeetme().getConfno()});
             return rooms.getMeetme().getConfno();

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java Tue Feb  5 02:44:03 2013
@@ -28,7 +28,7 @@ import org.apache.openmeetings.data.basi
 import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
 import org.apache.openmeetings.data.user.Usermanagement;
 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.red5.ScopeApplicationAdapter;
 import org.apache.velocity.Template;
 import org.apache.velocity.context.Context;
@@ -120,7 +120,7 @@ public class ActivateUser extends Veloci
 						"activation_template.vm");
 			}
 			//
-			Users user = getUsermanagement().getUserByActivationHash(hash);
+			User user = getUsermanagement().getUserByActivationHash(hash);
 
 			if (user == null) {
 				// No User Found with this Hash

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java?rev=1442455&r1=1442454&r2=1442455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java Tue Feb  5 02:44:03 2013
@@ -64,7 +64,6 @@ import org.apache.openmeetings.data.user
 import org.apache.openmeetings.data.user.dao.PrivateMessagesDao;
 import org.apache.openmeetings.data.user.dao.UserContactsDao;
 import org.apache.openmeetings.data.user.dao.UsersDao;
-import org.apache.openmeetings.persistence.beans.adresses.States;
 import org.apache.openmeetings.persistence.beans.basic.Configuration;
 import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
@@ -75,10 +74,11 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
 import org.apache.openmeetings.persistence.beans.poll.PollType;
 import org.apache.openmeetings.persistence.beans.poll.RoomPoll;
-import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
-import org.apache.openmeetings.persistence.beans.rooms.Rooms;
-import org.apache.openmeetings.persistence.beans.user.PrivateMessages;
-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.PrivateMessage;
+import org.apache.openmeetings.persistence.beans.user.State;
+import org.apache.openmeetings.persistence.beans.user.User;
 import org.apache.openmeetings.utils.OmFileHelper;
 import org.apache.openmeetings.utils.math.CalendarPatterns;
 import org.red5.logging.Red5LoggerFactory;
@@ -169,8 +169,8 @@ public class BackupExport {
 			Strategy strategy = new RegistryStrategy(registry);
 			Serializer serializer = new Persister(strategy);
 	
-			registry.bind(Users.class, UserConverter.class);
-			registry.bind(RoomTypes.class, RoomTypeConverter.class);
+			registry.bind(User.class, UserConverter.class);
+			registry.bind(RoomType.class, RoomTypeConverter.class);
 			
 			writeList(serializer, backup_dir, "rooms.xml",
 					"rooms", roommanagement.getBackupRooms());
@@ -185,7 +185,7 @@ public class BackupExport {
 			Serializer serializer = new Persister(strategy);
 	
 			registry.bind(Organisation.class, OrganisationConverter.class);
-			registry.bind(Rooms.class, RoomConverter.class);
+			registry.bind(Room.class, RoomConverter.class);
 			
 			writeList(serializer, backup_dir, "rooms_organisation.xml",
 					"room_organisations", roommanagement.getRoomsOrganisations());
@@ -201,9 +201,9 @@ public class BackupExport {
 			Serializer serializer = new Persister(strategy);
 	
 			registry.bind(AppointmentCategory.class, AppointmentCategoryConverter.class);
-			registry.bind(Users.class, UserConverter.class);
+			registry.bind(User.class, UserConverter.class);
 			registry.bind(AppointmentReminderTyps.class, AppointmentReminderTypeConverter.class);
-			registry.bind(Rooms.class, RoomConverter.class);
+			registry.bind(Room.class, RoomConverter.class);
 			if (list != null && list.size() > 0) {
 				registry.bind(list.get(0).getAppointmentStarttime().getClass(), DateConverter.class);
 			}
@@ -219,7 +219,7 @@ public class BackupExport {
 			Strategy strategy = new RegistryStrategy(registry);
 			Serializer serializer = new Persister(strategy);
 	
-			registry.bind(Users.class, UserConverter.class);
+			registry.bind(User.class, UserConverter.class);
 			registry.bind(Appointment.class, AppointmentConverter.class);
 			
 			writeList(serializer, backup_dir, "meetingmembers.xml",
@@ -236,13 +236,13 @@ public class BackupExport {
 		 * ##################### Private Messages
 		 */
 		{
-			List<PrivateMessages> list = privateMessagesDao.getPrivateMessages();
+			List<PrivateMessage> list = privateMessagesDao.getPrivateMessages();
 			Registry registry = new Registry();
 			Strategy strategy = new RegistryStrategy(registry);
 			Serializer serializer = new Persister(strategy);
 	
-			registry.bind(Users.class, UserConverter.class);
-			registry.bind(Rooms.class, RoomConverter.class);
+			registry.bind(User.class, UserConverter.class);
+			registry.bind(Room.class, RoomConverter.class);
 			if (list != null && list.size() > 0) {
 				registry.bind(list.get(0).getInserted().getClass(), DateConverter.class);
 			}
@@ -265,7 +265,7 @@ public class BackupExport {
 			Strategy strategy = new RegistryStrategy(registry);
 			Serializer serializer = new Persister(strategy);
 	
-			registry.bind(Users.class, UserConverter.class);
+			registry.bind(User.class, UserConverter.class);
 			
 			writeList(serializer, backup_dir, "userContacts.xml",
 					"usercontacts", userContactsDao.getUserContacts());
@@ -314,8 +314,8 @@ public class BackupExport {
 			Strategy strategy = new RegistryStrategy(registry);
 			Serializer serializer = new Persister(strategy);
 	
-			registry.bind(Users.class, UserConverter.class);
-			registry.bind(Rooms.class, RoomConverter.class);
+			registry.bind(User.class, UserConverter.class);
+			registry.bind(Room.class, RoomConverter.class);
 			registry.bind(PollType.class, PollTypeConverter.class);
 			if (list != null && list.size() > 0) {
 				registry.bind(list.get(0).getCreated().getClass(), DateConverter.class);
@@ -332,8 +332,8 @@ public class BackupExport {
 					0, Integer.MAX_VALUE, "c.configuration_id", true);
 			Registry registry = new Registry();
 			registry.bind(OmTimeZone.class, OmTimeZoneConverter.class);
-			registry.bind(States.class, StateConverter.class);
-			registry.bind(Users.class, UserConverter.class);
+			registry.bind(State.class, StateConverter.class);
+			registry.bind(User.class, UserConverter.class);
 			Strategy strategy = new RegistryStrategy(registry);
 			Serializer serializer = new Persister(strategy);
 	
@@ -419,19 +419,19 @@ public class BackupExport {
 		root.commit();
 	}
 
-	public void exportUsers(File backup_dir, List<Users> list) throws Exception {
+	public void exportUsers(File backup_dir, List<User> list) throws Exception {
 		FileOutputStream fos
 			= new FileOutputStream(new File(backup_dir, "users.xml"));
 		exportUsers(fos, list);
 	}
-	public void exportUsers(OutputStream os, List<Users> list) throws Exception {
+	public void exportUsers(OutputStream os, List<User> list) throws Exception {
 		Registry registry = new Registry();
 		Strategy strategy = new RegistryStrategy(registry);
 		Serializer serializer = new Persister(strategy);
 
 		registry.bind(Organisation.class, OrganisationConverter.class);
 		registry.bind(OmTimeZone.class, OmTimeZoneConverter.class);
-		registry.bind(States.class, StateConverter.class);
+		registry.bind(State.class, StateConverter.class);
 		if (list != null && list.size() > 0) {
 			registry.bind(list.get(0).getRegdate().getClass(), DateConverter.class);
 		}



Mime
View raw message