svn commit: r1683280 [3/7] - in /openmeetings/trunk/singlewebapp: openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/ openmeetings-core/src/main/java/org/...

[so...@apache.org]

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java Wed Jun  3 10:59:16 2015
@@ -20,18 +20,12 @@ package org.apache.openmeetings.db.dao.s
 
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
-import java.util.Calendar;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 
 import org.apache.openmeetings.db.entity.room.Client;
 import org.apache.openmeetings.db.entity.server.Sessiondata;
@@ -69,11 +63,10 @@ public class SessiondataDao {
 
 			long thistime = new Date().getTime();
 			Sessiondata sessiondata = new Sessiondata();
-			sessiondata.setSession_id(ManageCryptStyle.getInstanceOfCrypt()
-					.createPassPhrase(String.valueOf(thistime).toString()));
-			sessiondata.setRefresh_time(new Date());
-			sessiondata.setStarttermin_time(new Date());
-			sessiondata.setUser_id(null);
+			sessiondata.setSessionId(ManageCryptStyle.getInstanceOfCrypt().createPassPhrase(String.valueOf(thistime).toString()));
+			sessiondata.setRefreshed(new Date());
+			sessiondata.setCreated(new Date());
+			sessiondata.setUserId(null);
 
 			sessiondata = em.merge(sessiondata);
 
@@ -89,13 +82,7 @@ public class SessiondataDao {
 		try {
 			log.debug("updateUser User SID: " + SID);
 
-			CriteriaBuilder cb = em.getCriteriaBuilder();
-			CriteriaQuery<Sessiondata> cq = cb.createQuery(Sessiondata.class);
-			Root<Sessiondata> c = cq.from(Sessiondata.class);
-			Predicate condition = cb.equal(c.get("session_id"), SID);
-			cq.where(condition);
-
-			TypedQuery<Sessiondata> q = em.createQuery(cq);
+			TypedQuery<Sessiondata> q = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID);
 
 			List<Sessiondata> fullList = q.getResultList();
 			if (fullList.size() == 0) {
@@ -119,8 +106,7 @@ public class SessiondataDao {
 	 */
 	public Long checkSession(String SID) {
 		try {
-			TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class);
-			query.setParameter("session_id", SID);
+			TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID);
 			List<Sessiondata> sessions = query.getResultList();
 
 			Sessiondata sessiondata = null;
@@ -134,11 +120,11 @@ public class SessiondataDao {
 
 			// Checks if wether the Session or the User Object of that Session
 			// is set yet
-			if (sessiondata == null || sessiondata.getUser_id() == null
-					|| sessiondata.getUser_id().equals(new Long(0))) {
+			if (sessiondata == null || sessiondata.getUserId() == null
+					|| sessiondata.getUserId().equals(new Long(0))) {
 				return new Long(0);
 			} else {
-				return sessiondata.getUser_id();
+				return sessiondata.getUserId();
 			}
 		} catch (Exception ex2) {
 			log.error("[checkSession]: ", ex2);
@@ -151,14 +137,13 @@ public class SessiondataDao {
 	 * the session is loggedin
 	 * 
 	 * @param SID
-	 * @param USER_ID
+	 * @param userId
 	 */
-	public Boolean updateUser(String SID, long USER_ID) {
+	public Boolean updateUser(String SID, long userId) {
 		try {
-			log.debug("updateUser User: " + USER_ID + " || " + SID);
+			log.debug("updateUser User: " + userId + " || " + SID);
 
-			TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class);
-			query.setParameter("session_id", SID);
+			TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID);
 
 			List<Sessiondata> sessions = query.getResultList();
 
@@ -171,11 +156,11 @@ public class SessiondataDao {
 				log.error("Could not find session to Update");
 				return false;
 			}
-			log.debug("Found session to update: " + sessiondata.getSession_id()
-					+ " userId: " + USER_ID);
+			log.debug("Found session to update: " + sessiondata.getSessionId()
+					+ " userId: " + userId);
 
-			sessiondata.setRefresh_time(new Date());
-			sessiondata.setUser_id(USER_ID);
+			sessiondata.setRefreshed(new Date());
+			sessiondata.setUserId(userId);
 			if (sessiondata.getId() == null) {
 				em.persist(sessiondata);
 			} else {
@@ -190,11 +175,10 @@ public class SessiondataDao {
 		return null;
 	}
 
-	public boolean updateUser(String SID, long USER_ID, boolean storePermanent, Long language_id) {
+	public boolean updateUser(String SID, long userId, boolean permanent, Long languageId) {
 		try {
-			log.debug("updateUser User: " + USER_ID + " || " + SID);
-			TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class);
-			query.setParameter("session_id", SID);
+			log.debug("updateUser User: " + userId + " || " + SID);
+			TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID);
 
 			List<Sessiondata> sessions = query.getResultList();
 
@@ -207,14 +191,12 @@ public class SessiondataDao {
 				log.error("Could not find session to Update");
 				return false;
 			}
-			log.debug("Found session to update: " + sessiondata.getSession_id() + " userId: " + USER_ID);
+			log.debug("Found session to update: " + sessiondata.getSessionId() + " userId: " + userId);
 
-			sessiondata.setRefresh_time(new Date());
-			sessiondata.setUser_id(USER_ID);
-			if (storePermanent) {
-				sessiondata.setStorePermanent(storePermanent);
-			}
-			sessiondata.setLanguage_id(language_id);
+			sessiondata.setRefreshed(new Date());
+			sessiondata.setUserId(userId);
+			sessiondata.setPermanent(permanent);
+			sessiondata.setLanguageId(languageId);
 			if (sessiondata.getId() == null) {
 				em.persist(sessiondata);
 			} else {
@@ -223,7 +205,6 @@ public class SessiondataDao {
 				}
 			}
 
-			// log.debug("session updated User: "+USER_ID);
 			return true;
 		} catch (Exception ex2) {
 			log.error("[updateUser]: ", ex2);
@@ -231,11 +212,10 @@ public class SessiondataDao {
 		return false;
 	}
 
-	public Boolean updateUserOrg(String SID, Long organization_id) {
+	public Boolean updateUserOrg(String SID, Long organizationId) {
 		try {
-			log.debug("updateUserOrg User: " + organization_id + " || " + SID);
-			TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class);
-			query.setParameter("session_id", SID);
+			log.debug("updateUserOrg User: " + organizationId + " || " + SID);
+			TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID);
 
 			List<Sessiondata> sessions = query.getResultList();
 
@@ -248,11 +228,11 @@ public class SessiondataDao {
 				log.error("Could not find session to Update");
 				return false;
 			}
-			log.debug("Found session to update: " + sessiondata.getSession_id()
-					+ " organisation_id: " + organization_id);
+			log.debug("Found session to update: " + sessiondata.getSessionId()
+					+ " organisationId: " + organizationId);
 
-			sessiondata.setRefresh_time(new Date());
-			sessiondata.setOrganization_id(organization_id);
+			sessiondata.setRefreshed(new Date());
+			sessiondata.setOrganizationId(organizationId);
 			if (sessiondata.getId() == null) {
 				em.persist(sessiondata);
 			} else {
@@ -267,11 +247,10 @@ public class SessiondataDao {
 		return null;
 	}
 
-	public Boolean updateUserWithoutSession(String SID, Long USER_ID) {
+	public Boolean updateUserWithoutSession(String SID, Long userId) {
 		try {
-			log.debug("updateUser User: " + USER_ID + " || " + SID);
-			TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class);
-			query.setParameter("session_id", SID);
+			log.debug("updateUser User: " + userId + " || " + SID);
+			TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID);
 
 			List<Sessiondata> sessions = query.getResultList();
 
@@ -284,11 +263,11 @@ public class SessiondataDao {
 				log.error("Could not find session to Update");
 				return false;
 			}
-			log.debug("Found session to update: " + sessiondata.getSession_id()
-					+ " userId: " + USER_ID);
+			log.debug("Found session to update: " + sessiondata.getSessionId()
+					+ " userId: " + userId);
 
-			sessiondata.setRefresh_time(new Date());
-			sessiondata.setUser_id(USER_ID);
+			sessiondata.setRefreshed(new Date());
+			sessiondata.setUserId(userId);
 			if (sessiondata.getId() == null) {
 				em.persist(sessiondata);
 			} else {
@@ -307,13 +286,7 @@ public class SessiondataDao {
 		try {
 			log.debug("updateUser User SID: " + SID);
 
-			CriteriaBuilder cb = em.getCriteriaBuilder();
-			CriteriaQuery<Sessiondata> cq = cb.createQuery(Sessiondata.class);
-			Root<Sessiondata> c = cq.from(Sessiondata.class);
-			Predicate condition = cb.equal(c.get("session_id"), SID);
-			cq.where(condition);
-
-			TypedQuery<Sessiondata> q = em.createQuery(cq);
+			TypedQuery<Sessiondata> q = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID);
 			List<Sessiondata> fullList = q.getResultList();
 
 			if (fullList.size() == 0) {
@@ -323,8 +296,8 @@ public class SessiondataDao {
 				// log.error("Found session to update: "+SID);
 			}
 			Sessiondata sd = fullList.get(0);
-			sd.setRefresh_time(new Date());
-			sd.setSessionXml(sessionXml);
+			sd.setRefreshed(new Date());
+			sd.setXml(sessionXml);
 
 			if (sd.getId() == null) {
 				em.persist(sd);
@@ -347,13 +320,7 @@ public class SessiondataDao {
 	 */
 	private void updatesession(String SID) {
 		try {
-			CriteriaBuilder cb = em.getCriteriaBuilder();
-			CriteriaQuery<Sessiondata> cq = cb.createQuery(Sessiondata.class);
-			Root<Sessiondata> c = cq.from(Sessiondata.class);
-			Predicate condition = cb.equal(c.get("session_id"), SID);
-			cq.where(condition);
-
-			TypedQuery<Sessiondata> q = em.createQuery(cq);
+			TypedQuery<Sessiondata> q = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID);
 
 			List<Sessiondata> fullList = q.getResultList();
 			if (fullList.size() == 0) {
@@ -362,8 +329,7 @@ public class SessiondataDao {
 			} else {
 				// log.debug("Found session to updateSession: ");
 				Sessiondata sd = fullList.iterator().next();
-				// log.debug("Found session to updateSession sd "+sd.getUser_id()+" "+sd.getSession_id());
-				sd.setRefresh_time(new Date());
+				sd.setRefreshed(new Date());
 
 				if (sd.getId() == null) {
 					em.persist(sd);
@@ -384,10 +350,10 @@ public class SessiondataDao {
 	 * @param date
 	 * @return
 	 */
-	private List<Sessiondata> getSessionToDelete(Date refresh_time) {
+	private List<Sessiondata> getSessionToDelete(Date refreshed) {
 		try {
 			TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionToDelete", Sessiondata.class);
-			query.setParameter("refresh_time", refresh_time);
+			query.setParameter("refreshed", refreshed);
 			return query.getResultList();
 		} catch (Exception ex2) {
 			log.error("[getSessionToDelete]: ", ex2);
@@ -399,15 +365,12 @@ public class SessiondataDao {
 	 * 
 	 *
 	 */
-	public void clearSessionTable() {
+	public void clearSessionTable(long timeout) {
 		try {
 			log.debug("****** clearSessionTable: ");
-			Calendar rightNow = Calendar.getInstance();
-			rightNow.setTimeInMillis(rightNow.getTimeInMillis() - 1800000);
-			List<Sessiondata> l = this.getSessionToDelete(rightNow.getTime());
+			List<Sessiondata> l = getSessionToDelete(new Date(System.currentTimeMillis() - timeout));
 			log.debug("clearSessionTable: " + l.size());
-			for (Iterator<Sessiondata> it = l.iterator(); it.hasNext();) {
-				Sessiondata sData = it.next();
+			for (Sessiondata sData : l) {
 				sData = em.find(Sessiondata.class, sData.getId());
 				em.remove(sData);
 			}
@@ -417,11 +380,11 @@ public class SessiondataDao {
 	}
 
 	/**
-	 * @param room_id
+	 * @param roomId
 	 */
-	public void clearSessionByRoomId(Long room_id) {
+	public void clearSessionByRoomId(Long roomId) {
 		try {
-			for (Client rcl : sessionManager.getClientListByRoom(room_id)) {
+			for (Client rcl : sessionManager.getClientListByRoom(roomId)) {
 				String aux = rcl.getSwfurl();
 
 				int init_pos = aux.indexOf("sid=") + 4;
@@ -430,7 +393,7 @@ public class SessiondataDao {
 					end_pos = aux.length();
 				String SID = aux.substring(init_pos, end_pos);
 
-				Sessiondata sData = this.getSessionByHash(SID);
+				Sessiondata sData = getSessionByHash(SID);
 
 				sData = em.find(Sessiondata.class, sData.getId());
 				em.remove(sData);

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java Wed Jun  3 10:59:16 2015
@@ -31,14 +31,14 @@ public interface IUserManager {
 	
 	Long registerUser(String login, String Userpass, String lastname,
 			String firstname, String email, Date age, String street,
-			String additionalname, String fax, String zip, long states_id,
-			String town, long language_id, String phone, boolean sendSMS,
+			String additionalname, String fax, String zip, long stateId,
+			String town, long languageId, String phone, boolean sendSMS,
 			boolean generateSipUserData, String jNameTimeZone);
 	
 	Long registerUserInit(Set<Right> rights, String login, String password, String lastname,
 			String firstname, String email, Date age, String street,
-			String additionalname, String fax, String zip, long states_id,
-			String town, long language_id, boolean sendWelcomeMessage,
+			String additionalname, String fax, String zip, long stateId,
+			String town, long languageId, boolean sendWelcomeMessage,
 			List<Long> organisations, String phone, boolean sendSMS, Boolean sendConfirmation,
 			TimeZone timezone, Boolean forceTimeZoneCheck,
 			String userOffers, String userSearchs, Boolean showContactData,
@@ -47,14 +47,14 @@ public interface IUserManager {
 	Long registerUserNoEmail(String login, String Userpass,
 			String lastname, String firstname, String email, Date age,
 			String street, String additionalname, String fax, String zip,
-			long states_id, String town, long language_id, String phone, boolean sendSMS, 
+			long stateId, String town, long languageId, String phone, boolean sendSMS, 
 			boolean generateSipUserData, String jNameTimeZone);
 	
-	Boolean kickUserByStreamId(String SID, Long room_id);
+	Boolean kickUserByStreamId(String SID, Long roomId);
 	
 	Boolean kickUserByPublicSID(String SID, String publicSID);
 	
-	Long logout(String SID, long USER_ID);
+	Long logout(String SID, long userId);
 	
-	List<Userdata> getUserdataDashBoard(Long user_id);
+	List<Userdata> getUserdataDashBoard(Long userId);
 }

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java Wed Jun  3 10:59:16 2015
@@ -40,7 +40,7 @@ public class OrganisationDao implements
 
 	public Organisation get(long id) {
 		TypedQuery<Organisation> query = em.createNamedQuery("getOrganisationById", Organisation.class);
-		query.setParameter("organisation_id", id);
+		query.setParameter("organisationId", id);
 		Organisation o = null;
 		try {
 			o = query.getSingleResult();
@@ -83,13 +83,13 @@ public class OrganisationDao implements
 			if (userId != null) {
 				entity.setInsertedby(userId);
 			}
-			entity.setStarttime(new Date());
+			entity.setInserted(new Date());
 			em.persist(entity);
 		} else {
 			if (userId != null) {
 				entity.setUpdatedby(userId);
 			}
-			entity.setUpdatetime(new Date());
+			entity.setUpdated(new Date());
 			em.merge(entity);
 		}
 		return entity;

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java Wed Jun  3 10:59:16 2015
@@ -38,7 +38,7 @@ public class OrganisationUserDao impleme
 	private EntityManager em;
 	@Autowired
 	private UserDao usersDao;
-	public final static String[] searchFields = {"user.lastname", "user.firstname", "user.login", "user.adresses.email"};
+	public final static String[] searchFields = {"user.lastname", "user.firstname", "user.login", "user.address.email"};
 
 	public OrganisationUser get(long id) {
 		TypedQuery<OrganisationUser> q = em.createNamedQuery("getOrganisationUsersById", OrganisationUser.class);
@@ -115,10 +115,10 @@ public class OrganisationUserDao impleme
 	
 	public OrganisationUser update(OrganisationUser entity, Long userId) {
 		if (entity.getId() == null) {
-			entity.setStarttime(new Date());
+			entity.setInserted(new Date());
 			em.persist(entity);
 		} else {
-			entity.setUpdatetime(new Date());
+			entity.setUpdated(new Date());
 			entity = em.merge(entity);
 		}
 		updateUser(entity, false, userId);

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java Wed Jun  3 10:59:16 2015
@@ -115,7 +115,7 @@ public class PrivateMessagesDao implemen
 				.append("OR lower(m.from.firstname) LIKE :search ")
 				.append("OR lower(m.from.lastname) LIKE :search ")
 				.append("OR lower(m.from.login) LIKE :search ")
-				.append("OR lower(m.from.adresses.email) LIKE :search ")
+				.append("OR lower(m.from.address.email) LIKE :search ")
 				.append(" ) ");
 		}
 		

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.java Wed Jun  3 10:59:16 2015
@@ -48,19 +48,18 @@ public class SalutationDao {
 	 * Adds a new Salutation to the table Titles
 	 * 
 	 * @param titelname
-	 * @param fieldvalues_id
+	 * @param labelId
 	 * @return
 	 */
-	public Long addUserSalutation(String titelname, long fieldvalues_id) {
+	public Long addUserSalutation(String titelname, long labelId) {
 		try {
 			Salutation ti = new Salutation();
 			ti.setName(titelname);
 			ti.setDeleted(false);
-			ti.setFieldvalues_id(fieldvalues_id);
-			ti.setStarttime(new Date());
+			ti.setLabelId(labelId);
+			ti.setInserted(new Date());
 			ti = em.merge(ti);
-			Long salutations_id = ti.getSalutations_id();
-			return salutations_id;
+			return ti.getId();
 		} catch (Exception ex2) {
 			log.error("[addUserSalutation]", ex2);
 		}
@@ -71,10 +70,9 @@ public class SalutationDao {
 	 * get a Salutation by given id
 	 * 
 	 * @param id
-	 * @param language_id
 	 * @return
 	 */
-	public Salutation get(Long id, long language_id) {
+	public Salutation get(Long id) {
 		List<Salutation> ll = em.createNamedQuery("getSalutationById", Salutation.class)
 				.setParameter("id", id).getResultList();
 		return ll.isEmpty() ? null : ll.get(0);
@@ -83,10 +81,9 @@ public class SalutationDao {
 	/**
 	 * get a list of all availible Salutations
 	 * 
-	 * @param language_id
 	 * @return
 	 */
-	public List<Salutation> getUserSalutations(long language_id) {
+	public List<Salutation> get() {
 		List<Salutation> ll = em.createNamedQuery("getSalutations", Salutation.class).getResultList();
 		return ll;
 	}

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java Wed Jun  3 10:59:16 2015
@@ -51,8 +51,8 @@ public class StateDao {
 	 * @param name
 	 * @return the id of the new state or null if an error occurred
 	 */
-	public Long addState(String name) {
-		return addState(name, "", 0);
+	public Long add(String name) {
+		return add(name, "", 0);
 	}
 	
 	/**
@@ -63,14 +63,14 @@ public class StateDao {
 	 * @param code the code of the country
 	 * @return the id of the new state or null if an error occurred
 	 */
-	public Long addState(String name, String shortName, int code) {
+	public Long add(String name, String shortName, int code) {
 		try {
 
 			State st = new State();
 			st.setName(name);
 			st.setShortName(shortName);
 			st.setCode(code);
-			st.setStarttime(new Date());
+			st.setInserted(new Date());
 			st.setDeleted(false);
 
 			st = em.merge(st);
@@ -88,13 +88,13 @@ public class StateDao {
 	/**
 	 * selects a state by its id
 	 * 
-	 * @param state_id
+	 * @param id
 	 * @return the state-object or null
 	 */
-	public State getStateById(long state_id) {
+	public State get(long id) {
 		try {
 			TypedQuery<State> query = em.createNamedQuery("getStateById", State.class);
-			query.setParameter("state_id", state_id);
+			query.setParameter("id", id);
 			List<State> ll = query.getResultList();
 			if (ll.size() > 0) {
 				return ll.get(0);
@@ -108,10 +108,10 @@ public class StateDao {
 	/**
 	 * selects a state by its name
 	 * 
-	 * @param state_id
+	 * @param name
 	 * @return the state-object or null
 	 */
-	public State getStateByName(String name) {
+	public State get(String name) {
 		try {
 			if (name == null) {
 				return null;
@@ -133,7 +133,7 @@ public class StateDao {
 	 * 
 	 * @return List of State Objects or null
 	 */
-	public List<State> getStates() {
+	public List<State> get() {
 		try {
 			TypedQuery<State> query = em.createNamedQuery("getStates", State.class);
 			List<State> ll = query.getResultList();

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java Wed Jun  3 10:59:16 2015
@@ -43,13 +43,13 @@ public class UserContactsDao {
     @Autowired
     private UserDao userDao;
 
-	public Long addUserContact(Long user_id, Long ownerId, Boolean pending, String hash) {
+	public Long addUserContact(Long userId, Long ownerId, Boolean pending, String hash) {
 		try {
 			
 			UserContact userContact = new UserContact();
 			userContact.setInserted(new Date());
 			userContact.setOwner(userDao.get(ownerId));
-			userContact.setContact(userDao.get(user_id));
+			userContact.setContact(userDao.get(userId));
 			userContact.setPending(pending);
 			userContact.setHash(hash);
 			
@@ -108,10 +108,10 @@ public class UserContactsDao {
 		return null;
 	}
 	
-	public Long checkUserContacts(Long user_id, Long ownerId) {
+	public Long checkUserContacts(Long userId, Long ownerId) {
 		try {
 			TypedQuery<Long> query = em.createNamedQuery("checkUserContacts", Long.class); 
-			query.setParameter("user_id", user_id);
+			query.setParameter("userId", userId);
 			query.setParameter("ownerId", ownerId);
 			List<Long> ll = query.getResultList();
 			
@@ -127,7 +127,7 @@ public class UserContactsDao {
 	
 	public List<UserContact> get(long ownerId, int first, int count) {
 		TypedQuery<UserContact> q = em.createNamedQuery("getContactsByUser", UserContact.class);
-		q.setParameter("user_id", ownerId);
+		q.setParameter("userId", ownerId);
 		q.setFirstResult(first);
 		q.setMaxResults(count);
 		return q.getResultList();
@@ -135,7 +135,7 @@ public class UserContactsDao {
 	
 	public long count(long ownerId) {
 		TypedQuery<Long> q = em.createNamedQuery("countContactsByUser", Long.class);
-		q.setParameter("user_id", ownerId);
+		q.setParameter("userId", ownerId);
 		return q.getSingleResult();
 	}
 	
@@ -181,10 +181,10 @@ public class UserContactsDao {
 		return null;
 	}
 	
-	public List<UserContact> getContactRequestsByUserAndStatus(Long user_id, Boolean pending) {
+	public List<UserContact> getContactRequestsByUserAndStatus(Long userId, Boolean pending) {
 		try {
 			TypedQuery<UserContact> query = em.createNamedQuery("getContactRequestsByUserAndStatus", UserContact.class); 
-			query.setParameter("user_id", user_id);
+			query.setParameter("userId", userId);
 			query.setParameter("pending", pending);
 			return query.getResultList();
 		} catch (Exception e) {

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java Wed Jun  3 10:59:16 2015
@@ -71,7 +71,7 @@ import org.springframework.transaction.a
 public class UserDao implements IDataProviderDao<User> {
 	private static final Logger log = Red5LoggerFactory.getLogger(UserDao.class, webAppRootKey);
 
-	public final static String[] searchFields = {"lastname", "firstname", "login", "adresses.email", "adresses.town"};
+	public final static String[] searchFields = {"lastname", "firstname", "login", "address.email", "address.town"};
 
 	@PersistenceContext
 	private EntityManager em;
@@ -99,16 +99,16 @@ public class UserDao implements IDataPro
 	 */
 	public User getNewUserInstance(User currentUser) {
 		User user = new User();
-		user.setSalutations_id(1L); // TODO: Fix default selection to be configurable
+		user.setSalutationId(1L); // TODO: Fix default selection to be configurable
 		user.setRights(getDefaultRights());
 		user.setLanguageId(cfgDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1"));
 		user.setTimeZoneId(timezoneUtil.getTimeZone(currentUser).getID());
 		user.setForceTimeZoneCheck(false);
 		user.setSendSMS(false);
 		user.setAge(new Date());
-		Address adresses = new Address();
-		adresses.setStates(stateDao.getStateById(1L));
-		user.setAdresses(adresses);
+		Address address = new Address();
+		address.setState(stateDao.get(1L));
+		user.setAddress(address);
 		user.setShowContactData(false);
 		user.setShowContactDataToContacts(false);
 
@@ -208,10 +208,10 @@ public class UserDao implements IDataPro
 			}
 		}
 		if (u.getId() == null) {
-			u.setStarttime(new Date());
+			u.setInserted(new Date());
 			em.persist(u);
 		} else {
-			u.setUpdatetime(new Date());
+			u.setUpdated(new Date());
 			u =	em.merge(u);
 		}
 		//this is necessary due to organisation details are lost on update
@@ -240,17 +240,17 @@ public class UserDao implements IDataPro
 		deleteUserID(u.getId());
 	}
 
-	public User get(long user_id) {
-		return get(user_id, false);
+	public User get(long id) {
+		return get(id, false);
 	}
 	
-	private User get(long user_id, boolean force) {
+	private User get(long id, boolean force) {
 		User u = null;
-		if (user_id > 0) {
+		if (id > 0) {
 			OpenJPAEntityManager oem = OpenJPAPersistence.cast(em);
 			boolean qrce = oem.getFetchPlan().getQueryResultCacheEnabled();
 			oem.getFetchPlan().setQueryResultCacheEnabled(false); //FIXME update in cache during update
-			TypedQuery<User> q = oem.createNamedQuery("getUserById", User.class).setParameter("id", user_id);
+			TypedQuery<User> q = oem.createNamedQuery("getUserById", User.class).setParameter("id", id);
 			@SuppressWarnings("unchecked")
 			OpenJPAQuery<User> kq = OpenJPAPersistence.cast(q);
 			kq.getFetchPlan().addFetchGroup("orgUsers");
@@ -264,7 +264,7 @@ public class UserDao implements IDataPro
 			}
 			oem.getFetchPlan().setQueryResultCacheEnabled(qrce);
 		} else {
-			log.info("[get] " + "Info: No USER_ID given");
+			log.info("[get] " + "Info: No user id given");
 		}
 		return u;
 	}
@@ -278,9 +278,9 @@ public class UserDao implements IDataPro
 				}
 				us.setOrganisationUsers(null);
 				us.setDeleted(true);
-				us.setUpdatetime(new Date());
+				us.setUpdated(new Date());
 				us.setSipUser(null);
-				Address adr = us.getAdresses();
+				Address adr = us.getAddress();
 				if (adr != null) {
 					adr.setDeleted(true);
 				}
@@ -482,8 +482,8 @@ public class UserDao implements IDataPro
 			to.setLastname(lastName);
 			to.setLanguageId(null == langId ? owner.getLanguageId() : langId);
 			to.setOwnerId(owner.getId());
-			to.setAdresses(new Address());
-			to.getAdresses().setEmail(email);
+			to.setAddress(new Address());
+			to.getAddress().setEmail(email);
 			to.setTimeZoneId(null == tzId ? owner.getTimeZoneId() : tzId);
 		}
 		return to;
@@ -527,8 +527,8 @@ public class UserDao implements IDataPro
 			sb.append(" AND (LOWER(u.login) LIKE :search ")
 				.append("OR LOWER(u.firstname) LIKE :search ")
 				.append("OR LOWER(u.lastname) LIKE :search ")
-				.append("OR LOWER(u.adresses.email) LIKE :search ")
-				.append("OR LOWER(u.adresses.town) LIKE :search " + ") ");
+				.append("OR LOWER(u.address.email) LIKE :search ")
+				.append("OR LOWER(u.address.town) LIKE :search " + ") ");
 			params.put("search", getStringParam(text));
 		}
 		if (!count && !Strings.isEmpty(orderBy)) {
@@ -623,12 +623,12 @@ public class UserDao implements IDataPro
 		return update(u, u.getId());
 	}
 	
-	public Address getAddress(String street, String zip, String town, long states_id, String additionalname, String fax, String phone, String email) {
+	public Address getAddress(String street, String zip, String town, long stateId, String additionalname, String fax, String phone, String email) {
 		Address a =  new Address();
 		a.setStreet(street);
 		a.setZip(zip);
 		a.setTown(town);
-		a.setStates(stateDao.getStateById(states_id));
+		a.setState(stateDao.get(stateId));
 		a.setAdditionalname(additionalname);
 		a.setComment("");
 		a.setFax(fax);
@@ -637,7 +637,7 @@ public class UserDao implements IDataPro
 		return a;
 	}
 	
-	public User addUser(Set<Right> rights, String firstname, String login, String lastname, long language_id,
+	public User addUser(Set<Right> rights, String firstname, String login, String lastname, long languageId,
 			String userpass, Address adress, boolean sendSMS, Date age, String hash, TimeZone timezone,
 			Boolean forceTimeZoneCheck, String userOffers, String userSearchs, Boolean showContactData,
 			Boolean showContactDataToContacts, String externalId, String externalType, List<OrganisationUser> orgList, String pictureuri) throws NoSuchAlgorithmException {
@@ -647,18 +647,18 @@ public class UserDao implements IDataPro
 		u.setLogin(login);
 		u.setLastname(lastname);
 		u.setAge(age);
-		u.setAdresses(adress);
+		u.setAddress(adress);
 		u.setSendSMS(sendSMS);
 		u.setRights(rights);
 		u.setLastlogin(new Date());
 		u.setLasttrans(new Long(0));
-		u.setSalutations_id(1L);
-		u.setStarttime(new Date());
+		u.setSalutationId(1L);
+		u.setInserted(new Date());
 		u.setActivatehash(hash);
 		u.setTimeZoneId(timezone.getID());
 		u.setForceTimeZoneCheck(forceTimeZoneCheck);
-		u.setExternalUserId(externalId);
-		u.setExternalUserType(externalType);
+		u.setExternalId(externalId);
+		u.setExternalType(externalType);
 
 		u.setUserOffers(userOffers);
 		u.setUserSearchs(userSearchs);
@@ -666,7 +666,7 @@ public class UserDao implements IDataPro
 		u.setShowContactDataToContacts(showContactDataToContacts);
 
 		// this is needed cause the language is not a needed data at registering
-		u.setLanguageId(language_id != 0 ? language_id : null);
+		u.setLanguageId(languageId != 0 ? languageId : null);
 		if (!Strings.isEmpty(userpass)) {
 			u.updatePassword(cfgDao, userpass);
 		}

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java Wed Jun  3 10:59:16 2015
@@ -22,18 +22,18 @@ import java.util.Date;
 
 public class RoomReturn {
 
-	private Long room_id;
+	private Long roomId;
 	private String name;
 	private String creator;
 	private Date created;
 	private RoomUser[] roomUser;
 
-	public Long getRoom_id() {
-		return room_id;
+	public Long getRoomId() {
+		return roomId;
 	}
 
-	public void setRoom_id(Long roomId) {
-		room_id = roomId;
+	public void setRoomId(Long roomId) {
+		this.roomId = roomId;
 	}
 
 	public String getName() {

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java Wed Jun  3 10:59:16 2015
@@ -23,14 +23,14 @@ import java.util.Map;
 
 public class WhiteboardObjectList {
 
-	private Long room_id;
+	private Long roomId;
 	private Map<Long,WhiteboardObject> whiteboardObjects = new HashMap<Long,WhiteboardObject>();
 	
-	public Long getRoom_id() {
-		return room_id;
+	public Long getRoomId() {
+		return roomId;
 	}
-	public void setRoom_id(Long roomId) {
-		room_id = roomId;
+	public void setRoomId(Long roomId) {
+		this.roomId = roomId;
 	}
 	public Map<Long, WhiteboardObject> getWhiteboardObjects() {
 		return whiteboardObjects;

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.java Wed Jun  3 10:59:16 2015
@@ -27,7 +27,7 @@ public class WhiteboardSyncLockObject {
 	private boolean isCurrentLoadingItem = false;
 
 	private Date addtime;
-	private Date starttime;
+	private Date inserted;
 
 	public String getPublicSID() {
 		return publicSID;
@@ -45,12 +45,12 @@ public class WhiteboardSyncLockObject {
 		this.isInitialLoaded = isInitialLoaded;
 	}
 
-	public Date getStarttime() {
-		return starttime;
+	public Date getInserted() {
+		return inserted;
 	}
 
-	public void setStarttime(Date starttime) {
-		this.starttime = starttime;
+	public void setInserted(Date inserted) {
+		this.inserted = inserted;
 	}
 
 	public boolean isCurrentLoadingItem() {

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java Wed Jun  3 10:59:16 2015
@@ -33,7 +33,7 @@ public class UserDTO {
 	private String lastname;
 	private Set<Right> rights;
 	private Long languageId;
-	private Address adresses;
+	private Address address;
 	private String timeZoneId;
 	private Type type = Type.user;
 
@@ -46,7 +46,7 @@ public class UserDTO {
 		rights = u.getRights();
 		login = u.getLogin();
 		languageId = u.getLanguageId();
-		adresses = u.getAdresses();
+		address = u.getAddress();
 		timeZoneId = u.getTimeZoneId();
 		type = u.getType();
 	}
@@ -99,12 +99,12 @@ public class UserDTO {
 		this.languageId = languageId;
 	}
 
-	public Address getAdresses() {
-		return adresses;
+	public Address getAddress() {
+		return address;
 	}
 
-	public void setAdresses(Address adresses) {
-		this.adresses = adresses;
+	public void setAddress(Address address) {
+		this.address = address;
 	}
 
 	public String getTimeZoneId() {

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java Wed Jun  3 10:59:16 2015
@@ -42,13 +42,13 @@ import org.simpleframework.xml.Root;
 @Entity
 @NamedQueries({
 		@NamedQuery(name = "forceGetConfigurationByKey", query = "SELECT c FROM Configuration c " 
-				+ "WHERE c.conf_key LIKE :conf_key"),
+				+ "WHERE c.key LIKE :key"),
 		@NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c FROM Configuration c "
-				+ "WHERE c.conf_key IN :conf_keys and c.deleted = false"),
+				+ "WHERE c.key IN :keys and c.deleted = false"),
 		@NamedQuery(name = "getNondeletedConfiguration", query = "SELECT c FROM Configuration c  "
 				+ "LEFT JOIN FETCH c.user WHERE c.deleted = false"),
 		@NamedQuery(name = "getConfigurationById", query = "SELECT c FROM Configuration c "
-				+ "LEFT JOIN FETCH c.user WHERE c.id = :configuration_id and c.deleted = false"),
+				+ "LEFT JOIN FETCH c.user WHERE c.id = :id and c.deleted = false"),
 		@NamedQuery(name = "countConfigurations", query = "SELECT COUNT(c) FROM Configuration c WHERE c.deleted = false")
 })
 @Table(name = "configuration")
@@ -62,21 +62,21 @@ public class Configuration implements ID
 	@Element(name = "id", data = true)
 	private Long id;
 	
-	@Column(name = "conf_key", unique = true)
+	@Column(name = "key", unique = true)
 	@Element(name = "key", data = true, required = false)
-	private String conf_key;
+	private String key;
 
-	@Column(name = "conf_value")
+	@Column(name = "value")
 	@Element(name = "value", data = true, required = false)
-	private String conf_value;
+	private String value;
 
-	@Column(name = "starttime")
+	@Column(name = "inserted")
 	@Element(name = "created", data = true, required = false)
-	private Date starttime;
+	private Date inserted;
 
-	@Column(name = "updatetime")
+	@Column(name = "updated")
 	@Element(name = "updated", data = true, required = false)
-	private Date updatetime;
+	private Date updated;
 
 	@Lob
 	@Column(name = "comment_field", length = 2048)
@@ -101,20 +101,20 @@ public class Configuration implements ID
 		this.comment = comment;
 	}
 
-	public String getConf_key() {
-		return conf_key;
+	public String getKey() {
+		return key;
 	}
 
-	public void setConf_key(String conf_key) {
-		this.conf_key = conf_key;
+	public void setKey(String key) {
+		this.key = key;
 	}
 
-	public String getConf_value() {
-		return conf_value;
+	public String getValue() {
+		return value;
 	}
 
-	public void setConf_value(String conf_value) {
-		this.conf_value = conf_value;
+	public void setValue(String value) {
+		this.value = value;
 	}
 
 	public Long getId() {
@@ -125,20 +125,20 @@ public class Configuration implements ID
 		this.id = id;
 	}
 
-	public Date getStarttime() {
-		return starttime;
+	public Date getInserted() {
+		return inserted;
 	}
 
-	public void setStarttime(Date starttime) {
-		this.starttime = starttime;
+	public void setInserted(Date inserted) {
+		this.inserted = inserted;
 	}
 
-	public Date getUpdatetime() {
-		return updatetime;
+	public Date getUpdated() {
+		return updated;
 	}
 
-	public void setUpdatetime(Date updatetime) {
-		this.updatetime = updatetime;
+	public void setUpdated(Date updated) {
+		this.updated = updated;
 	}
 
 	public boolean isDeleted() {

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java Wed Jun  3 10:59:16 2015
@@ -42,14 +42,14 @@ public class ErrorType implements IDataP
 	@Column(name = "id")
 	private Long id;
 
-	@Column(name = "fieldvalues_id")
-	private Long fieldvalues_id;
+	@Column(name = "label_id")
+	private Long labelId;
 
-	@Column(name = "starttime")
-	private Date starttime;
+	@Column(name = "inserted")
+	private Date inserted;
 	
-	@Column(name = "updatetime")
-	private Date updatetime;
+	@Column(name = "updated")
+	private Date updated;
 	
 	@Column(name = "deleted")
 	private boolean deleted;
@@ -62,20 +62,20 @@ public class ErrorType implements IDataP
 		this.id = id;
 	}
 
-	public Date getStarttime() {
-		return starttime;
+	public Date getInserted() {
+		return inserted;
 	}
 
-	public void setStarttime(Date starttime) {
-		this.starttime = starttime;
+	public void setInserted(Date inserted) {
+		this.inserted = inserted;
 	}
 
-	public Date getUpdatetime() {
-		return updatetime;
+	public Date getUpdated() {
+		return updated;
 	}
 
-	public void setUpdatetime(Date updatetime) {
-		this.updatetime = updatetime;
+	public void setUpdated(Date updated) {
+		this.updated = updated;
 	}
 
 	public boolean isDeleted() {
@@ -86,12 +86,12 @@ public class ErrorType implements IDataP
 		this.deleted = deleted;
 	}
 
-	public Long getFieldvalues_id() {
-		return this.fieldvalues_id;
+	public Long getLabelId() {
+		return this.labelId;
 	}
 
-	public void setFieldvalues_id(Long fieldvalues_id) {
-		this.fieldvalues_id = fieldvalues_id;
+	public void setLabelId(Long labelId) {
+		this.labelId = labelId;
 	}
 
 }

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java Wed Jun  3 10:59:16 2015
@@ -42,16 +42,16 @@ public class ErrorValue implements IData
 	private Long id;
 
 	@Column(name = "errortype_id")
-	private Long errortype_id;
+	private Long typeId;
 	
-	@Column(name = "fieldvalues_id")
-	private Long fieldvalues_id;
+	@Column(name = "label_id")
+	private Long labelId;
 	
-	@Column(name = "starttime")
-	private Date starttime;
+	@Column(name = "inserted")
+	private Date inserted;
 	
-	@Column(name = "updatetime")
-	private Date updatetime;
+	@Column(name = "updated")
+	private Date updated;
 	
 	@Column(name = "deleted")
 	private boolean deleted;
@@ -64,20 +64,20 @@ public class ErrorValue implements IData
 		this.id = id;
 	}
 
-	public Date getStarttime() {
-		return starttime;
+	public Date getInserted() {
+		return inserted;
 	}
 
-	public void setStarttime(Date starttime) {
-		this.starttime = starttime;
+	public void setInserted(Date inserted) {
+		this.inserted = inserted;
 	}
 
-	public Date getUpdatetime() {
-		return updatetime;
+	public Date getUpdated() {
+		return updated;
 	}
 
-	public void setUpdatetime(Date updatetime) {
-		this.updatetime = updatetime;
+	public void setUpdated(Date updated) {
+		this.updated = updated;
 	}
 
 	public boolean isDeleted() {
@@ -88,20 +88,19 @@ public class ErrorValue implements IData
 		this.deleted = deleted;
 	}
 	
-	public Long getFieldvalues_id() {
-		return fieldvalues_id;
+	public Long getLabelId() {
+		return labelId;
 	}
 
-	public void setFieldvalues_id(Long fieldvalues_id) {
-		this.fieldvalues_id = fieldvalues_id;
+	public void setLabelId(Long labelId) {
+		this.labelId = labelId;
 	}
 
-	public Long getErrortype_id() {
-		//return errorType.getErrortype_id();
-		return errortype_id;
+	public Long getTypeId() {
+		return typeId;
 	}
 
-	public void setErrortype_id(Long errortype_id) {
-		this.errortype_id = errortype_id;
+	public void setTypeId(Long typeId) {
+		this.typeId = typeId;
 	}
 }

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java Wed Jun  3 10:59:16 2015
@@ -41,7 +41,7 @@ import org.apache.openmeetings.db.entity
 @Entity
 @NamedQueries({
 		@NamedQuery(name = "getNavigation", query = "SELECT DISTINCT ng from Naviglobal ng JOIN ng.mainnavi nm "
-				+ "WHERE nm.deleted = false AND ng.level_id <= :level_id AND nm.level_id <= :level_id "
+				+ "WHERE nm.deleted = false AND ng.levelId <= :levelId AND nm.levelId <= :levelId "
 				+ "AND ng.deleted = false ORDER BY ng.naviorder ASC"),
 		@NamedQuery(name = "getNavigationById", query = "SELECT ng from Naviglobal ng WHERE ng.id = :id") })
 @Table(name = "naviglobal")
@@ -68,11 +68,11 @@ public class Naviglobal implements IData
 	@Column(name = "action")
 	private String action;
 
-	@Column(name = "updatetime")
-	private Date updatetime;
+	@Column(name = "updated")
+	private Date updated;
 
-	@Column(name = "starttime")
-	private Date starttime;
+	@Column(name = "inserted")
+	private Date inserted;
 
 	@Column(name = "comment_field")
 	private String comment;
@@ -81,16 +81,16 @@ public class Naviglobal implements IData
 	private Integer naviorder;
 
 	@Column(name = "level_id")
-	private Long level_id;
+	private Long levelId;
 
 	@Column(name = "deleted")
 	private boolean deleted;
 
-	@Column(name = "fieldvalues_id")
-	private Long fieldvalues_id;
+	@Column(name = "label_id")
+	private Long labelId;
 
-	@Column(name = "tooltip_fieldvalues_id")
-	private Long tooltip_fieldvalues_id;
+	@Column(name = "tooltip_label_id")
+	private Long tooltipLabelId;
 
 	@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
 	@JoinColumn(name = "global_id")
@@ -146,20 +146,20 @@ public class Naviglobal implements IData
 		this.isopen = isopen;
 	}
 
-	public Date getStarttime() {
-		return starttime;
+	public Date getInserted() {
+		return inserted;
 	}
 
-	public void setStarttime(Date starttime) {
-		this.starttime = starttime;
+	public void setInserted(Date inserted) {
+		this.inserted = inserted;
 	}
 
-	public Date getUpdatetime() {
-		return updatetime;
+	public Date getUpdated() {
+		return updated;
 	}
 
-	public void setUpdatetime(Date updatetime) {
-		this.updatetime = updatetime;
+	public void setUpdated(Date updated) {
+		this.updated = updated;
 	}
 
 	public boolean isDeleted() {
@@ -186,12 +186,12 @@ public class Naviglobal implements IData
 		this.naviorder = naviorder;
 	}
 
-	public Long getLevel_id() {
-		return level_id;
+	public Long getLevelId() {
+		return levelId;
 	}
 
-	public void setLevel_id(Long level_id) {
-		this.level_id = level_id;
+	public void setLevelId(Long levelId) {
+		this.levelId = levelId;
 	}
 
 	public List<Navimain> getMainnavi() {
@@ -202,26 +202,26 @@ public class Naviglobal implements IData
 		this.mainnavi = mainnavi;
 	}
 
-	public Long getFieldvalues_id() {
-		return fieldvalues_id;
+	public Long getLabelId() {
+		return labelId;
 	}
 
-	public void setFieldvalues_id(Long fieldvalues_id) {
-		this.fieldvalues_id = fieldvalues_id;
+	public void setLabelId(Long labelId) {
+		this.labelId = labelId;
 	}
 
-	public Long getTooltip_fieldvalues_id() {
-		return tooltip_fieldvalues_id;
+	public Long getTooltipLabelId() {
+		return tooltipLabelId;
 	}
 
-	public void setTooltip_fieldvalues_id(Long tooltip_fieldvalues_id) {
-		this.tooltip_fieldvalues_id = tooltip_fieldvalues_id;
+	public void setTooltipLabelId(Long tooltipLabelId) {
+		this.tooltipLabelId = tooltipLabelId;
 	}
 
 	@Override
 	public String toString() {
 		return "Naviglobal [id=" + id + ", name=" + name + ", action=" + action + ", naviorder=" + naviorder + ", deleted="
-				+ deleted + ", fieldvalues_id=" + fieldvalues_id + ", tooltip_fieldvalues_id=" + tooltip_fieldvalues_id + "]";
+				+ deleted + ", labelId=" + labelId + ", tooltipLabelId=" + tooltipLabelId + "]";
 	}
 
 }

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java Wed Jun  3 10:59:16 2015
@@ -40,7 +40,7 @@ public class Navimain implements IDataPr
 	private Long id;
 
 	@Column(name = "global_id")
-	private Long global_id;
+	private Long globalId;
 
 	@Column(name = "name")
 	private String name;
@@ -60,11 +60,11 @@ public class Navimain implements IDataPr
 	@Column(name = "params")
 	private String params;
 
-	@Column(name = "updatetime")
-	private Date updatetime;
+	@Column(name = "updated")
+	private Date updated;
 
-	@Column(name = "starttime")
-	private Date starttime;
+	@Column(name = "inserted")
+	private Date inserted;
 
 	@Column(name = "comment_field")
 	private String comment;
@@ -73,16 +73,16 @@ public class Navimain implements IDataPr
 	private Integer naviorder;
 
 	@Column(name = "level_id")
-	private Long level_id;
+	private Long levelId;
 
-	@Column(name = "fieldvalues_id")
-	private Long fieldvalues_id;
+	@Column(name = "label_id")
+	private Long labelId;
 
 	@Column(name = "deleted")
 	private boolean deleted;
 
-	@Column(name = "tooltip_fieldvalues_id")
-	private Long tooltip_fieldvalues_id;
+	@Column(name = "tooltip_label_id")
+	private Long tooltipLabelId;
 
 	public Long getId() {
 		return id;
@@ -100,20 +100,20 @@ public class Navimain implements IDataPr
 		this.action = action;
 	}
 
-	public Long getLevel_id() {
-		return level_id;
+	public Long getLevelId() {
+		return levelId;
 	}
 
-	public void setLevel_id(Long level_id) {
-		this.level_id = level_id;
+	public void setLevelId(Long levelId) {
+		this.levelId = levelId;
 	}
 
-	public Long getGlobal_id() {
-		return global_id;
+	public Long getGlobalId() {
+		return globalId;
 	}
 
-	public void setGlobal_id(Long global_id) {
-		this.global_id = global_id;
+	public void setGlobalId(Long globalId) {
+		this.globalId = globalId;
 	}
 
 	public String getComment() {
@@ -148,20 +148,20 @@ public class Navimain implements IDataPr
 		this.isopen = isopen;
 	}
 
-	public Date getStarttime() {
-		return starttime;
+	public Date getInserted() {
+		return inserted;
 	}
 
-	public void setStarttime(Date starttime) {
-		this.starttime = starttime;
+	public void setInserted(Date inserted) {
+		this.inserted = inserted;
 	}
 
-	public Date getUpdatetime() {
-		return updatetime;
+	public Date getUpdated() {
+		return updated;
 	}
 
-	public void setUpdatetime(Date updatetime) {
-		this.updatetime = updatetime;
+	public void setUpdated(Date updated) {
+		this.updated = updated;
 	}
 
 	public boolean isDeleted() {
@@ -188,20 +188,20 @@ public class Navimain implements IDataPr
 		this.naviorder = naviorder;
 	}
 
-	public Long getFieldvalues_id() {
-		return fieldvalues_id;
+	public Long getLabelId() {
+		return labelId;
 	}
 
-	public void setFieldvalues_id(Long fieldvalues_id) {
-		this.fieldvalues_id = fieldvalues_id;
+	public void setLabelId(Long labelId) {
+		this.labelId = labelId;
 	}
 
-	public Long getTooltip_fieldvalues_id() {
-		return tooltip_fieldvalues_id;
+	public Long getTooltipLabelId() {
+		return tooltipLabelId;
 	}
 
-	public void setTooltip_fieldvalues_id(Long tooltip_fieldvalues_id) {
-		this.tooltip_fieldvalues_id = tooltip_fieldvalues_id;
+	public void setTooltipLabelId(Long tooltipLabelId) {
+		this.tooltipLabelId = tooltipLabelId;
 	}
 
 	public String getParams() {
@@ -214,8 +214,8 @@ public class Navimain implements IDataPr
 
 	@Override
 	public String toString() {
-		return "Navimain [id=" + id + ", global_id=" + global_id + ", name=" + name + ", action=" + action + ", params=" + params
-				+ ", naviorder=" + naviorder + ", fieldvalues_id=" + fieldvalues_id + ", deleted=" + deleted + ", tooltip_fieldvalues_id="
-				+ tooltip_fieldvalues_id + "]";
+		return "Navimain [id=" + id + ", globalId=" + globalId + ", name=" + name + ", action=" + action + ", params=" + params
+				+ ", naviorder=" + naviorder + ", labelId=" + labelId + ", deleted=" + deleted + ", tooltipLabelId="
+				+ tooltipLabelId + "]";
 	}
 }

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java Wed Jun  3 10:59:16 2015
@@ -55,9 +55,9 @@ import org.simpleframework.xml.Root;
     	query="SELECT a FROM Appointment a "
 			+ "WHERE a.deleted = false "
 			+ "	AND ( "
-			+ "		(a.start BETWEEN :starttime AND :endtime) "
-			+ "		OR (a.end BETWEEN :starttime AND :endtime) "
-			+ "		OR (a.start < :starttime AND a.end > :endtime) "
+			+ "		(a.start BETWEEN :start AND :end) "
+			+ "		OR (a.end BETWEEN :start AND :end) "
+			+ "		OR (a.start < :start AND a.end > :end) "
 			+ "	)"
 			+ "	AND a.owner.id = :userId"
     	)
@@ -67,9 +67,9 @@ import org.simpleframework.xml.Root;
 			+ "	AND a.id NOT IN (SELECT a.id FROM Appointment a WHERE a.owner.id = :userId)"
 			+ "	AND mm.connectedEvent = false " //TODO review: isConnectedEvent is set for the MeetingMember if event is created from "Private Messages", it is weird
 			+ "	AND ( "
-			+ "		(a.start BETWEEN :starttime AND :endtime) "
-			+ "		OR (a.end BETWEEN :starttime AND :endtime) "
-			+ "		OR (a.start < :starttime AND a.end > :endtime) "
+			+ "		(a.start BETWEEN :start AND :end) "
+			+ "		OR (a.end BETWEEN :start AND :end) "
+			+ "		OR (a.start < :start AND a.end > :end) "
 			+ "	)"
     	)
     , @NamedQuery(name="appointmentsInRangeRemind",
@@ -78,9 +78,9 @@ import org.simpleframework.xml.Root;
 			+ "WHERE a.deleted = false AND a.reminderEmailSend = false"
 			+ " AND (a.remind.id = 2 OR a.remind.id = 3) "
 			+ "	AND ( "
-			+ "		(a.start BETWEEN :starttime AND :endtime) "
-			+ "		OR (a.end BETWEEN :starttime AND :endtime) "
-			+ "		OR (a.start < :starttime AND a.end > :endtime) "
+			+ "		(a.start BETWEEN :start AND :end) "
+			+ "		OR (a.end BETWEEN :start AND :end) "
+			+ "		OR (a.start < :start AND a.end > :end) "
 			+ "	)"
     	)
     , @NamedQuery(name="getAppointmentByRoomId", query="SELECT a FROM Appointment a WHERE a.room.id = :roomId")
@@ -90,18 +90,18 @@ import org.simpleframework.xml.Root;
 		query="SELECT a FROM MeetingMember mm, IN(mm.appointment) a "
 			+ "WHERE mm.deleted = false AND mm.user.id <> a.owner.id AND mm.user.id = :userId "
 			+ "	AND ( "
-			+ "		(a.start BETWEEN :starttime AND :endtime) "
-			+ "		OR (a.end BETWEEN :starttime AND :endtime) "
-			+ "		OR (a.start < :starttime AND a.end > :endtime) "
+			+ "		(a.start BETWEEN :start AND :end) "
+			+ "		OR (a.end BETWEEN :start AND :end) "
+			+ "		OR (a.start < :start AND a.end > :end) "
 			+ "	)"
 	    )
     , @NamedQuery(name="appointedRoomsInRangeByUser",
 		query="SELECT a.room FROM MeetingMember mm, IN(mm.appointment) a "
 			+ "WHERE mm.deleted = false AND mm.user.id <> a.owner.id AND mm.user.id = :userId "
 			+ "	AND ( "
-			+ "		(a.start BETWEEN :starttime AND :endtime) "
-			+ "		OR (a.end BETWEEN :starttime AND :endtime) "
-			+ "		OR (a.start < :starttime AND a.end > :endtime) "
+			+ "		(a.start BETWEEN :start AND :end) "
+			+ "		OR (a.end BETWEEN :start AND :end) "
+			+ "		OR (a.start < :start AND a.end > :end) "
 			+ "	)"
 	    )
     , @NamedQuery(name="getNextAppointment", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.start > :start AND a.owner.id = :userId")
@@ -124,11 +124,11 @@ public class Appointment implements IDat
 	@Element(name="appointmentLocation", data=true, required=false)
 	private String location;
 	
-	@Column(name = "appointment_starttime")
+	@Column(name = "start")
 	@Element(name="appointmentStarttime", data=true)
 	private Date start;
 	
-	@Column(name = "appointment_endtime")
+	@Column(name = "end")
 	@Element(name="appointmentEndtime", data=true)
 	private Date end;
 	
@@ -149,11 +149,11 @@ public class Appointment implements IDat
 	@Element(name="users_id", data=true, required=false)
 	private User owner;
 
-	@Column(name = "starttime")
+	@Column(name = "inserted")
 	@Element(name="inserted", data=true, required=false)
 	private Date inserted;
 	
-	@Column(name = "updatetime")
+	@Column(name = "updated")
 	@Element(name="updated", data=true, required=false)
 	private Date updated;
 	

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java Wed Jun  3 10:59:16 2015
@@ -52,11 +52,11 @@ public class AppointmentCategory impleme
 	@ForeignKey(enabled = true)
 	private User user;
 	
-	@Column(name="starttime")
-	private Date starttime;
+	@Column(name="inserted")
+	private Date inserted;
 	
-	@Column(name="updatetime")
-	private Date updatetime;
+	@Column(name="updated")
+	private Date updated;
 	
 	@Column(name="deleted")
 	private boolean deleted;
@@ -86,18 +86,18 @@ public class AppointmentCategory impleme
 		this.user = user;
 	}
 	
-	public Date getStarttime() {
-		return starttime;
+	public Date getInserted() {
+		return inserted;
 	}
-	public void setStarttime(Date starttime) {
-		this.starttime = starttime;
+	public void setInserted(Date inserted) {
+		this.inserted = inserted;
 	}
 	
-	public Date getUpdatetime() {
-		return updatetime;
+	public Date getUpdated() {
+		return updated;
 	}
-	public void setUpdatetime(Date updatetime) {
-		this.updatetime = updatetime;
+	public void setUpdated(Date updated) {
+		this.updated = updated;
 	}
 	
 	public boolean isDeleted() {

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java Wed Jun  3 10:59:16 2015
@@ -59,18 +59,18 @@ public class AppointmentReminderType imp
 	@ForeignKey(enabled = true)
 	private User user;
 	
-	@Column(name="starttime")
-	private Date starttime;
+	@Column(name="inserted")
+	private Date inserted;
 	
-	@Column(name="updatetime")
-	private Date updatetime;
+	@Column(name="updated")
+	private Date updated;
 	
 	@Column(name="deleted")
 	private boolean deleted;
 	
-	@Column(name="fieldvalues_id")
+	@Column(name="label_id")
 	@Element(data=true, required=false)
-	private Long fieldvalues_id;
+	private Long labelId;
 	
 	public Long getId() {
 		return id;
@@ -93,18 +93,18 @@ public class AppointmentReminderType imp
 		this.user = user;
 	}
 	
-	public Date getStarttime() {
-		return starttime;
+	public Date getInserted() {
+		return inserted;
 	}
-	public void setStarttime(Date starttime) {
-		this.starttime = starttime;
+	public void setInserted(Date inserted) {
+		this.inserted = inserted;
 	}
 	
-	public Date getUpdatetime() {
-		return updatetime;
+	public Date getUpdated() {
+		return updated;
 	}
-	public void setUpdatetime(Date updatetime) {
-		this.updatetime = updatetime;
+	public void setUpdated(Date updated) {
+		this.updated = updated;
 	}
 	
 	public boolean isDeleted() {
@@ -114,10 +114,10 @@ public class AppointmentReminderType imp
 		this.deleted = deleted;
 	}
 
-	public Long getFieldvalues_id() {
-		return fieldvalues_id;
+	public Long getLabelId() {
+		return labelId;
 	}
-	public void setFieldvalues_id(Long fieldvalues_id) {
-		this.fieldvalues_id = fieldvalues_id;
+	public void setLabelId(Long labelId) {
+		this.labelId = labelId;
 	}
 }

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java Wed Jun  3 10:59:16 2015
@@ -74,10 +74,10 @@ public class MeetingMember implements ID
 	@Element(data = true, required = false)
 	private String appointmentStatus; // status of the appointment denial, acceptance, wait.
 
-	@Column(name = "starttime")
+	@Column(name = "inserted")
 	private Date inserted;
 
-	@Column(name = "updatetime")
+	@Column(name = "updated")
 	private Date updated;
 
 	@Column(name = "deleted")
@@ -132,7 +132,7 @@ public class MeetingMember implements ID
 		this.invitation = invitation;
 	}
 
-	public Date getStarttime() {
+	public Date getInserted() {
 		return inserted;
 	}
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java Wed Jun  3 10:59:16 2015
@@ -57,17 +57,11 @@ public class ConferenceLog implements ID
 	@Column(name="user_id")
 	private Long userId;
 	
-	@Column(name="external_user_id")
-	private String externalUserId;
-	
-	@Column(name="external_user_type")
-	private String externalUserType;
-	
 	@Column(name="streamid")
 	private String streamid;
 	
 	@Column(name="room_id")
-	private Long room_id;
+	private Long roomId;
 	
 	@Column(name="userip")
 	private String userip;
@@ -75,15 +69,6 @@ public class ConferenceLog implements ID
 	@Column(name="scopename")
 	private String scopeName;
 	
-	@Column(name="email")
-	private String email;
-	
-	@Column(name="firstname")
-	private String firstname;
-	
-	@Column(name="lastname")
-	private String lastname;
-	
 	public Long getId() {
 		return id;
 	}
@@ -126,11 +111,11 @@ public class ConferenceLog implements ID
 		this.streamid = streamid;
 	}
 	
-	public Long getRoom_id() {
-		return room_id;
+	public Long getRoomId() {
+		return roomId;
 	}
-	public void setRoom_id(Long room_id) {
-		this.room_id = room_id;
+	public void setRoomId(Long roomId) {
+		this.roomId = roomId;
 	}
 	
 	public String getUserip() {
@@ -146,40 +131,4 @@ public class ConferenceLog implements ID
 	public void setScopeName(String scopeName) {
 		this.scopeName = scopeName;
 	}
-	
-	public String getExternalUserId() {
-		return externalUserId;
-	}
-	public void setExternalUserId(String externalUserId) {
-		this.externalUserId = externalUserId;
-	}
-	
-	public String getExternalUserType() {
-		return externalUserType;
-	}
-	public void setExternalUserType(String externalUserType) {
-		this.externalUserType = externalUserType;
-	}
-	
-	public String getEmail() {
-		return email;
-	}
-	public void setEmail(String email) {
-		this.email = email;
-	}
-	
-	public String getFirstname() {
-		return firstname;
-	}
-	public void setFirstname(String firstname) {
-		this.firstname = firstname;
-	}
-	
-	public String getLastname() {
-		return lastname;
-	}
-	public void setLastname(String lastname) {
-		this.lastname = lastname;
-	}
-	
 }

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java Wed Jun  3 10:59:16 2015
@@ -71,10 +71,10 @@ import org.simpleframework.xml.Root;
 			+ "WHERE c.insertedBy = u.id AND u.externalUserId = :externalUserId  AND u.externalUserType = :externalUserType "
 			+ "AND c.deleted = false") 
 	, @NamedQuery(name = "getRecordingsPublic", query = "SELECT f FROM FlvRecording f WHERE f.deleted = false AND f.ownerId IS NULL "
-			+ "AND f.organization_id IS NULL AND (f.parentItemId IS NULL OR f.parentItemId = 0) "
+			+ "AND f.organizationId IS NULL AND (f.parentItemId IS NULL OR f.parentItemId = 0) "
 			+ "ORDER BY f.type DESC, f.inserted")
 	, @NamedQuery(name = "getRecordingsByOrganization", query = "SELECT f FROM FlvRecording f WHERE f.deleted = false AND f.ownerId IS NULL "
-			+ "AND f.organization_id = :organization_id AND (f.parentItemId IS NULL OR f.parentItemId = 0) "
+			+ "AND f.organizationId = :organizationId AND (f.parentItemId IS NULL OR f.parentItemId = 0) "
 			+ "ORDER BY f.type DESC, f.inserted")
 	, @NamedQuery(name = "getRecordingsByOwner", query = "SELECT f FROM FlvRecording f WHERE f.deleted = false AND f.ownerId = :ownerId "
 			+ "AND (f.parentItemId IS NULL OR f.parentItemId = 0) "
@@ -90,7 +90,7 @@ import org.simpleframework.xml.Root;
 	, @NamedQuery(name = "getRecordingsByParent", query = "SELECT f FROM FlvRecording f WHERE f.deleted = false AND f.parentItemId = :parentId "
 			+ "ORDER BY f.type ASC, f.inserted") 
 	, @NamedQuery(name = "getRecordingsByExternalType", query = "SELECT rec FROM FlvRecording rec, Room r, User u "
-			+ "WHERE rec.deleted = false AND rec.room_id = r.rooms_id AND rec.insertedBy = u.user_id "
+			+ "WHERE rec.deleted = false AND rec.roomId = r.id AND rec.insertedBy = u.id "
 			+ "AND (r.externalRoomType = :externalType OR u.externalUserType = :externalType)")
 })
 @Table(name = "flvrecording")
@@ -148,7 +148,7 @@ public class FlvRecording extends FileIt
 
 	@Column(name = "organization_id")
 	@Element(data = true, required = false)
-	private Long organization_id;
+	private Long organizationId;
 
 	@Column(name = "is_interview")
 	@Element(data = true, required = false)
@@ -226,12 +226,12 @@ public class FlvRecording extends FileIt
 		this.recorderStreamId = recorderStreamId;
 	}
 
-	public Long getOrganization_id() {
-		return organization_id;
+	public Long getOrganizationId() {
+		return organizationId;
 	}
 
-	public void setOrganization_id(Long organization_id) {
-		this.organization_id = organization_id;
+	public void setOrganizationId(Long organizationId) {
+		this.organizationId = organizationId;
 	}
 
 	public List<FlvRecordingMetaData> getFlvRecordingMetaData() {

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java Wed Jun  3 10:59:16 2015
@@ -59,9 +59,9 @@ import org.apache.openmeetings.util.Cale
 	@NamedQuery(name = "getClientsByServer", query = "SELECT c FROM Client c WHERE c.server = :server"),
 	@NamedQuery(name = "getClients", query = "SELECT c FROM Client c"),
 	@NamedQuery(name = "getClientsWithServer", query = "SELECT c FROM Client c LEFT JOIN FETCH c.server"),
-	@NamedQuery(name = "getClientsByUserId", query = "SELECT c FROM Client c WHERE c.server = :server AND c.user_id = :user_id"),
-	@NamedQuery(name = "getClientsByRoomId", query = "SELECT c FROM Client c WHERE c.room_id = :room_id"),
-	@NamedQuery(name = "getRoomsIdsByServer", query = "SELECT c.room_id FROM Client c WHERE c.server = :server GROUP BY c.room_id")
+	@NamedQuery(name = "getClientsByUserId", query = "SELECT c FROM Client c WHERE c.server = :server AND c.userId = :userId"),
+	@NamedQuery(name = "getClientsByRoomId", query = "SELECT c FROM Client c WHERE c.roomId = :roomId"),
+	@NamedQuery(name = "getRoomsIdsByServer", query = "SELECT c.roomId FROM Client c WHERE c.server = :server GROUP BY c.roomId")
 })
 @Table(name = "client")
 @XmlRootElement
@@ -213,10 +213,10 @@ public class Client implements IDataProv
 	private int userport;
 	
 	/**
-	 * @see Client#getRoom_id()
+	 * @see Client#getRoomId()
 	 */
 	@Column(name = "room_id")
-	private Long room_id;
+	private Long roomId;
 	
 	/**
 	 * @see Client#getRoomEnter()
@@ -231,10 +231,10 @@ public class Client implements IDataProv
 	private long broadCastID = -2;
 	
 	/**
-	 * @see Client#getUser_id()
+	 * @see Client#getUserId()
 	 */
 	@Column(name = "user_id")
-	private Long user_id = null;
+	private Long userId = null;
 	
 	/**
 	 * @see Client#getFirstname()
@@ -396,14 +396,14 @@ public class Client implements IDataProv
     
 	public Client() {}
     
-	public Client(String streamid, String publicSID, Long room_id,
-			Long user_id, String firstname, String lastname, boolean isAVClient,
+	public Client(String streamid, String publicSID, Long roomId,
+			Long userId, String firstname, String lastname, boolean isAVClient,
 			String username, String connectedSince, String scope) {
 		super();
 		this.streamid = streamid;
 		this.publicSID = publicSID;
-		this.room_id = room_id;
-		this.user_id = user_id;
+		this.roomId = roomId;
+		this.userId = userId;
 		this.firstname = firstname;
 		this.lastname = lastname;
 		this.avClient = isAVClient;
@@ -412,8 +412,8 @@ public class Client implements IDataProv
 		this.scope = scope;
 	}
 
-	public void setUserObject(Long user_id, String username, String firstname, String lastname) {
-		this.user_id = user_id;
+	public void setUserObject(Long userId, String username, String firstname, String lastname) {
+		this.userId = userId;
 		this.username = username;
 		this.firstname = firstname;
 		this.lastname = lastname;
@@ -577,20 +577,20 @@ public class Client implements IDataProv
 		this.picture_uri = picture_uri;
 	}
 
-	public Long getUser_id() {
-		return user_id;
+	public Long getUserId() {
+		return userId;
 	}
 
-	public void setUser_id(Long user_id) {
-		this.user_id = user_id;
+	public void setUserId(Long userId) {
+		this.userId = userId;
 	}
 
-	public Long getRoom_id() {
-		return room_id;
+	public Long getRoomId() {
+		return roomId;
 	}
 
-	public void setRoom_id(Long room_id) {
-		this.room_id = room_id;
+	public void setRoomId(Long roomId) {
+		this.roomId = roomId;
 	}
 
 	public Date getRoomEnter() {
@@ -868,8 +868,8 @@ public class Client implements IDataProv
 	@Override
 	public String toString() {
 		return "Client [streamid=" + streamid + ", publicSID=" + publicSID + ", isScreenClient=" + screenClient
-				+ ", isAVClient=" + avClient + ", isMobile = " + mobile + ", room_id=" + room_id + ", broadCastID=" + broadCastID + ", user_id="
-				+ user_id + ", avsettings=" + avsettings + ", isRecording=" + isRecording + ", flvRecordingId="
+				+ ", isAVClient=" + avClient + ", isMobile = " + mobile + ", roomId=" + roomId + ", broadCastID=" + broadCastID + ", userId="
+				+ userId + ", avsettings=" + avsettings + ", isRecording=" + isRecording + ", flvRecordingId="
 				+ flvRecordingId + ", flvRecordingMetaDataId=" + flvRecordingMetaDataId + ", screenPublishStarted="
 				+ screenPublishStarted + ", interviewPodId=" + interviewPodId + ", server=" + server + "]";
 	}

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java Wed Jun  3 10:59:16 2015
@@ -43,27 +43,24 @@ public class PollType implements IDataPr
 	@Column(name = "id")
 	private Long id;
 	
-	@Column(name = "fieldvalues_id")
-	private Long label;
+	@Column(name = "label_id")
+	private Long labelId;
 	
 	@Column(name = "numeric_answer")
 	private boolean numeric;
 	
 	/**
-	 * @return the pollTypesId
+	 * @return the id
 	 */
 	public Long getId() {
 		return id;
 	}
 	/**
-	 * @param id the pollTypesId to set
+	 * @param id the id to set
 	 */
 	public void setId(Long id) {
 		this.id = id;
 	}
-	/**
-	 * @param pollTypeLabelid the pollTypeLabelid to set
-	 */
 	
 	public boolean isNumeric() {
 		return numeric;
@@ -73,15 +70,15 @@ public class PollType implements IDataPr
 		this.numeric = numeric;
 	}
 	/**
-	 * @return the pollTypeLabelid
+	 * @return the label id
 	 */
-	public Long getLabel() {
-		return label;
+	public Long getLabelId() {
+		return labelId;
 	}
 	/**
-	 * @param pollTypeLabelid the pollTypeLabelid to set
+	 * @param labelid the labelid to set
 	 */
-	public void setLabel(Long label) {
-		this.label = label;
+	public void setLabelId(Long labelId) {
+		this.labelId = labelId;
 	}
 }

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Wed Jun  3 10:59:16 2015
@@ -105,11 +105,11 @@ public class Room implements IDataProvid
 	@Element(name = "roomtypeId", data = true, required = false)
 	private RoomType roomtype;
 
-	@Column(name = "starttime")
-	private Date starttime;
+	@Column(name = "inserted")
+	private Date inserted;
 
-	@Column(name = "updatetime")
-	private Date updatetime;
+	@Column(name = "updated")
+	private Date updated;
 
 	@Column(name = "deleted")
 	@Element(data = true)
@@ -292,20 +292,20 @@ public class Room implements IDataProvid
 		this.roomtype = roomtype;
 	}
 
-	public Date getStarttime() {
-		return starttime;
+	public Date getInserted() {
+		return inserted;
 	}
 
-	public void setStarttime(Date starttime) {
-		this.starttime = starttime;
+	public void setInserted(Date inserted) {
+		this.inserted = inserted;
 	}
 
-	public Date getUpdatetime() {
-		return updatetime;
+	public Date getUpdated() {
+		return updated;
 	}
 
-	public void setUpdatetime(Date updatetime) {
-		this.updatetime = updatetime;
+	public void setUpdated(Date updated) {
+		this.updated = updated;
 	}
 
 	public boolean isDeleted() {

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java Wed Jun  3 10:59:16 2015
@@ -44,7 +44,7 @@ import org.simpleframework.xml.Root;
 	@NamedQuery(name = "getRoomModeratorsByIds", query = "select c from RoomModerator as c where c.id IN :ids"),
 	@NamedQuery(name = "getRoomModeratorByRoomId", query = "select c from RoomModerator as c where c.roomId = :roomId AND c.deleted = false"),
 	@NamedQuery(name = "getRoomModeratorByUserAndRoomId", query = "select c from RoomModerator as c "
-			+ "where c.roomId = :roomId AND c.deleted false AND c.user.id = :user_id")
+			+ "where c.roomId = :roomId AND c.deleted false AND c.user.id = :userId")
 })
 @Table(name = "rooms_moderator")
 @Root(name = "room_moderator")
@@ -69,11 +69,11 @@ public class RoomModerator implements Se
 	@Element(name="user_id", data = true, required=false)
 	private User user;
 	
-	@Column(name = "starttime")
-	private Date starttime;
+	@Column(name = "inserted")
+	private Date inserted;
 	
-	@Column(name = "updatetime")
-	private Date updatetime;
+	@Column(name = "updated")
+	private Date updated;
 	
 	@Column(name = "deleted")
 	private boolean deleted;
@@ -100,18 +100,18 @@ public class RoomModerator implements Se
 		this.user = user;
 	}
 	
-	public Date getStarttime() {
-		return starttime;
+	public Date getInserted() {
+		return inserted;
 	}
-	public void setStarttime(Date starttime) {
-		this.starttime = starttime;
+	public void setInserted(Date inserted) {
+		this.inserted = inserted;
 	}
 	
-	public Date getUpdatetime() {
-		return updatetime;
+	public Date getUpdated() {
+		return updated;
 	}
-	public void setUpdatetime(Date updatetime) {
-		this.updatetime = updatetime;
+	public void setUpdated(Date updated) {
+		this.updated = updated;
 	}
 	
 	public boolean isDeleted() {

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java Wed Jun  3 10:59:16 2015
@@ -42,23 +42,23 @@ import org.simpleframework.xml.Root;
 @NamedQueries({
 	@NamedQuery(name = "getAllRoomsOrganisations", query = "select ro from RoomOrganisation ro ORDER BY ro.id"),
 	@NamedQuery(name = "getRoomsOrganisationByOrganisationIdAndRoomType", query = "select c from RoomOrganisation as c "
-			+ "where c.room.roomtype.id = :roomtypesId AND c.organisation.id = :organisation_id "
+			+ "where c.room.roomtype.id = :roomtypesId AND c.organisation.id = :organisationId "
 			+ "AND c.deleted = false"),
 	@NamedQuery(name = "getRoomsOrganisationByOrganisationId", query = "SELECT c FROM RoomOrganisation c "
 			+ "LEFT JOIN FETCH c.room "
-			+ "WHERE c.organisation.id = :organisation_id "
+			+ "WHERE c.organisation.id = :organisationId "
 			+ "AND c.deleted = false AND c.room.deleted = false AND c.room.appointment = false "
 			+ "AND c.organisation.deleted = false "
 			+ "ORDER BY c.room.name ASC"),
 	@NamedQuery(name = "selectMaxFromRoomsByOrganisation", query = "select c from Rooms_Organisation as c "
-			+ "where c.organisation.id = :organisation_id "
+			+ "where c.organisation.id = :organisationId "
 			+ "AND c.deleted = false"),
 	@NamedQuery(name = "getRoomsOrganisationByOrganisationIdAndRoomId", query = "select c from RoomOrganisation as c "
-			+ "where c.room.id = :rooms_id "
-			+ "AND c.organisation.id = :organisation_id "
+			+ "where c.room.id = :roomId "
+			+ "AND c.organisation.id = :organisationId "
 			+ "AND c.deleted = false"),
 	@NamedQuery(name = "getRoomsOrganisationByRoomsId", query = "select c from RoomOrganisation as c "
-			+ "where c.room.id = :rooms_id "
+			+ "where c.room.id = :roomId "
 			+ "AND c.deleted = false")
 })
 @Table(name = "rooms_organisation")
@@ -72,7 +72,7 @@ public class RoomOrganisation implements
 	private Long id;
 	
 	@ManyToOne(fetch = FetchType.EAGER)
-	@JoinColumn(name="rooms_id", nullable=true)
+	@JoinColumn(name="room_id", nullable=true)
 	@ForeignKey(enabled = true)
 	@Element(name="rooms_id", data=true, required=false)
 	private Room room;
@@ -83,11 +83,11 @@ public class RoomOrganisation implements
 	@Element(name="organisation_id", data=true, required=false)
 	private Organisation organisation;
 	
-	@Column(name = "starttime")
-	private Date starttime;
+	@Column(name = "inserted")
+	private Date inserted;
 	
-	@Column(name = "updatetime")
-	private Date updatetime;
+	@Column(name = "updated")
+	private Date updated;
 	
 	@Column(name = "deleted")
 	@Element(data=true)
@@ -122,18 +122,18 @@ public class RoomOrganisation implements
 		this.id = id;
 	}
     
-	public Date getStarttime() {
-		return starttime;
+	public Date getInserted() {
+		return inserted;
 	}
-	public void setStarttime(Date starttime) {
-		this.starttime = starttime;
+	public void setInserted(Date inserted) {
+		this.inserted = inserted;
 	}
     
-	public Date getUpdatetime() {
-		return updatetime;
+	public Date getUpdated() {
+		return updated;
 	}
-	public void setUpdatetime(Date updatetime) {
-		this.updatetime = updatetime;
+	public void setUpdated(Date updated) {
+		this.updated = updated;
 	}	
 	
 	public boolean isDeleted() {