You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/01/24 19:31:07 UTC

svn commit: r1235400 [4/30] - in /incubator/openmeetings/trunk/singlewebapp: WebContent/WEB-INF/ WebContent/WEB-INF/red5-services/ src/META-INF/ src/app/org/openmeetings/app/batik/beans/ src/app/org/openmeetings/app/conference/whiteboard/ src/app/org/o...

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java Tue Jan 24 18:30:48 2012
@@ -1,244 +1,262 @@
-package org.openmeetings.app.data.basic.dao;
-
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-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.openmeetings.app.data.user.dao.UsersDaoImpl;
-import org.openmeetings.app.persistence.beans.basic.LdapConfig;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-@Transactional
-public class LdapConfigDaoImpl {
-
-	private static final Logger log = Red5LoggerFactory.getLogger(LdapConfigDaoImpl.class, ScopeApplicationAdapter.webAppRootKey);
-	@PersistenceContext
-	private EntityManager em;
-	@Autowired
-	private UsersDaoImpl usersDao;
-	
-	public Long addLdapConfig(String name, Boolean addDomainToUserName, String configFileName, 
-			String domain, Long insertedby, Boolean isActive) {
-		try {
-			
-			LdapConfig ldapConfig = new LdapConfig();
-			ldapConfig.setAddDomainToUserName(addDomainToUserName);
-			ldapConfig.setConfigFileName(configFileName);
-			ldapConfig.setDeleted("false");
-			ldapConfig.setDomain(domain);
-			ldapConfig.setIsActive(isActive);
-			ldapConfig.setName(name);
-			ldapConfig.setInserted(new Date());
-			if (insertedby != null) {
-				log.debug("addLdapConfig :1: "+usersDao.getUser(insertedby));
-				ldapConfig.setInsertedby(usersDao.getUser(insertedby));
-			}
-			
-			log.debug("addLdapConfig :2: "+insertedby);
-			
-			ldapConfig = em.merge(ldapConfig);
-			Long ldapConfigId = ldapConfig.getLdapConfigId();
-			
-			if (ldapConfigId > 0) {
-				return ldapConfigId;
-			} else {
-				throw new Exception("Could not store SOAPLogin");
-			}
-			
-		} catch (Exception ex2) {
-			log.error("[addLdapConfig]: ",ex2);
-		}
-		return null;
-	}
-	
-
-	public Long addLdapConfigByObject(LdapConfig ldapConfig) {
-		try {
-			
-			ldapConfig.setDeleted("false");
-			ldapConfig.setInserted(new Date());
-			
-			ldapConfig = em.merge(ldapConfig);
-			Long ldapConfigId = ldapConfig.getLdapConfigId();
-			
-			if (ldapConfigId > 0) {
-				return ldapConfigId;
-			} else {
-				throw new Exception("Could not store SOAPLogin");
-			}
-			
-		} catch (Exception ex2) {
-			log.error("[addLdapConfig]: ",ex2);
-		}
-		return null;
-	}
-	
-	public Long updateLdapConfig(Long ldapConfigId, String name, Boolean addDomainToUserName, 
-			String configFileName, String domain, Long updatedby, Boolean isActive) {
-		try {
-			
-			LdapConfig ldapConfig = this.getLdapConfigById(ldapConfigId);
-			
-			if (ldapConfig == null) {
-				return -1L;
-			}
-			
-			ldapConfig.setAddDomainToUserName(addDomainToUserName);
-			ldapConfig.setConfigFileName(configFileName);
-			ldapConfig.setDeleted("false");
-			ldapConfig.setDomain(domain);
-			ldapConfig.setIsActive(isActive);
-			ldapConfig.setName(name);
-			ldapConfig.setUpdated(new Date());
-			if (updatedby != null) {
-				log.debug("updateLdapConfig :1: "+usersDao.getUser(updatedby));
-				ldapConfig.setUpdatedby(usersDao.getUser(updatedby));
-			}
-			
-			log.debug("updateLdapConfig :2: "+updatedby);
-			
-			ldapConfig = em.merge(ldapConfig);
-			ldapConfigId = ldapConfig.getLdapConfigId();
-			
-			return ldapConfigId;
-			
-		} catch (Exception ex2) {
-			log.error("[updateLdapConfig]: ",ex2);
-		}
-		return -1L;
-	}
-	
-	public LdapConfig getLdapConfigById(Long ldapConfigId) {
-		try {
-			
-			String hql = "select c from LdapConfig c " +
-				       	"WHERE c.ldapConfigId = :ldapConfigId " +
-				       	"AND c.deleted LIKE :deleted";
-			
-			TypedQuery<LdapConfig> query = em.createQuery(hql, LdapConfig.class);
-			query.setParameter("ldapConfigId", ldapConfigId);
-			query.setParameter("deleted", "false");
-	
-			LdapConfig ldapConfig = null;
-			try {
-				ldapConfig = query.getSingleResult();
-		    } catch (NoResultException ex) {
-		    }
-			
-			return ldapConfig;
-			
-		} catch (Exception ex2) {
-			log.error("[getLdapConfigById]: ",ex2);
-		}
-		return null;
-	}
-	
-	public List<LdapConfig> getLdapConfigs(int start, int max, String orderby, boolean asc) {
-		try {
-			CriteriaBuilder cb = em.getCriteriaBuilder();
-			CriteriaQuery<LdapConfig> cq = cb.createQuery(LdapConfig.class);
-			Root<LdapConfig> c = cq.from(LdapConfig.class);
-			Predicate condition = cb.equal(c.get("deleted"), "false");
-			cq.where(condition);
-			cq.distinct(asc);
-			if (asc){
-				cq.orderBy(cb.asc(c.get(orderby)));
-			} else {
-				cq.orderBy(cb.desc(c.get(orderby)));
-			}
-			TypedQuery<LdapConfig> q = em.createQuery(cq);
-			q.setFirstResult(start);
-			q.setMaxResults(max);
-			List<LdapConfig> ll = q.getResultList();
-			return ll;
-		} catch (Exception ex2) {
-			log.error("[getLdapConfigs]" ,ex2);
-		}
-		return null;
-	}
-	
-	public Long selectMaxFromLdapConfig(){
-		try {
-			log.debug("selectMaxFromConfigurations ");
-			//get all users
-			TypedQuery<Long> query = em.createQuery("select count(c.ldapConfigId) from LdapConfig c where c.deleted LIKE 'false'", Long.class); 
-			List<Long> ll = query.getResultList();
-			log.debug("selectMaxFromLdapConfig" + ll.get(0));
-			return ll.get(0);
-		} catch (Exception ex2) {
-			log.error("[selectMaxFromLdapConfig] ",ex2);
-		}
-		return null;
-	}	
-	
-	public Long deleteLdapConfigById(Long ldapConfigId) {
-		try {
-			
-			LdapConfig ldapConfig = this.getLdapConfigById(ldapConfigId);
-			
-			if (ldapConfig == null) {
-				return null;
-			}
-			
-			ldapConfig = em.find(LdapConfig.class, ldapConfig.getLdapConfigId());
-			em.remove(ldapConfig);
-			
-			return ldapConfigId;
-			
-		} catch (Exception ex2) {
-			log.error("[deleteLdapConfigById]: ",ex2);
-		}
-		return null;
-	}
-
-	public List<LdapConfig> getActiveLdapConfigs() {
-		try {
-			log.debug("selectMaxFromConfigurations ");
-			
-			String hql = "select c from LdapConfig c " +
-					"where c.deleted LIKE 'false' " +
-					"AND c.isActive = :isActive ";
-			
-			//get all users
-			TypedQuery<LdapConfig> query = em.createQuery(hql, LdapConfig.class);
-			query.setParameter("isActive", true);
-			List<LdapConfig> ll = query.getResultList();
-			
-			return ll;				
-		} catch (Exception ex2) {
-			log.error("[getActiveLdapConfigs] ",ex2);
-		}
-		return null;
-	}
-
-	public List<LdapConfig> getLdapConfigs() {
-		try {
-			log.debug("selectMaxFromConfigurations ");
-			
-			String hql = "select c from LdapConfig c " +
-					"where c.deleted LIKE 'false' ";
-			
-			//get all users
-			TypedQuery<LdapConfig> query = em.createQuery(hql, LdapConfig.class);
-			List<LdapConfig> ll = query.getResultList();
-			
-			return ll;				
-		} catch (Exception ex2) {
-			log.error("[getActiveLdapConfigs] ",ex2);
-		}
-		return null;
-	}	
-	
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.openmeetings.app.data.basic.dao;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+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.openmeetings.app.data.user.dao.UsersDaoImpl;
+import org.openmeetings.app.persistence.beans.basic.LdapConfig;
+import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+public class LdapConfigDaoImpl {
+
+	private static final Logger log = Red5LoggerFactory.getLogger(LdapConfigDaoImpl.class, ScopeApplicationAdapter.webAppRootKey);
+	@PersistenceContext
+	private EntityManager em;
+	@Autowired
+	private UsersDaoImpl usersDao;
+	
+	public Long addLdapConfig(String name, Boolean addDomainToUserName, String configFileName, 
+			String domain, Long insertedby, Boolean isActive) {
+		try {
+			
+			LdapConfig ldapConfig = new LdapConfig();
+			ldapConfig.setAddDomainToUserName(addDomainToUserName);
+			ldapConfig.setConfigFileName(configFileName);
+			ldapConfig.setDeleted("false");
+			ldapConfig.setDomain(domain);
+			ldapConfig.setIsActive(isActive);
+			ldapConfig.setName(name);
+			ldapConfig.setInserted(new Date());
+			if (insertedby != null) {
+				log.debug("addLdapConfig :1: "+usersDao.getUser(insertedby));
+				ldapConfig.setInsertedby(usersDao.getUser(insertedby));
+			}
+			
+			log.debug("addLdapConfig :2: "+insertedby);
+			
+			ldapConfig = em.merge(ldapConfig);
+			Long ldapConfigId = ldapConfig.getLdapConfigId();
+			
+			if (ldapConfigId > 0) {
+				return ldapConfigId;
+			} else {
+				throw new Exception("Could not store SOAPLogin");
+			}
+			
+		} catch (Exception ex2) {
+			log.error("[addLdapConfig]: ",ex2);
+		}
+		return null;
+	}
+	
+
+	public Long addLdapConfigByObject(LdapConfig ldapConfig) {
+		try {
+			
+			ldapConfig.setDeleted("false");
+			ldapConfig.setInserted(new Date());
+			
+			ldapConfig = em.merge(ldapConfig);
+			Long ldapConfigId = ldapConfig.getLdapConfigId();
+			
+			if (ldapConfigId > 0) {
+				return ldapConfigId;
+			} else {
+				throw new Exception("Could not store SOAPLogin");
+			}
+			
+		} catch (Exception ex2) {
+			log.error("[addLdapConfig]: ",ex2);
+		}
+		return null;
+	}
+	
+	public Long updateLdapConfig(Long ldapConfigId, String name, Boolean addDomainToUserName, 
+			String configFileName, String domain, Long updatedby, Boolean isActive) {
+		try {
+			
+			LdapConfig ldapConfig = this.getLdapConfigById(ldapConfigId);
+			
+			if (ldapConfig == null) {
+				return -1L;
+			}
+			
+			ldapConfig.setAddDomainToUserName(addDomainToUserName);
+			ldapConfig.setConfigFileName(configFileName);
+			ldapConfig.setDeleted("false");
+			ldapConfig.setDomain(domain);
+			ldapConfig.setIsActive(isActive);
+			ldapConfig.setName(name);
+			ldapConfig.setUpdated(new Date());
+			if (updatedby != null) {
+				log.debug("updateLdapConfig :1: "+usersDao.getUser(updatedby));
+				ldapConfig.setUpdatedby(usersDao.getUser(updatedby));
+			}
+			
+			log.debug("updateLdapConfig :2: "+updatedby);
+			
+			ldapConfig = em.merge(ldapConfig);
+			ldapConfigId = ldapConfig.getLdapConfigId();
+			
+			return ldapConfigId;
+			
+		} catch (Exception ex2) {
+			log.error("[updateLdapConfig]: ",ex2);
+		}
+		return -1L;
+	}
+	
+	public LdapConfig getLdapConfigById(Long ldapConfigId) {
+		try {
+			
+			String hql = "select c from LdapConfig c " +
+				       	"WHERE c.ldapConfigId = :ldapConfigId " +
+				       	"AND c.deleted LIKE :deleted";
+			
+			TypedQuery<LdapConfig> query = em.createQuery(hql, LdapConfig.class);
+			query.setParameter("ldapConfigId", ldapConfigId);
+			query.setParameter("deleted", "false");
+	
+			LdapConfig ldapConfig = null;
+			try {
+				ldapConfig = query.getSingleResult();
+		    } catch (NoResultException ex) {
+		    }
+			
+			return ldapConfig;
+			
+		} catch (Exception ex2) {
+			log.error("[getLdapConfigById]: ",ex2);
+		}
+		return null;
+	}
+	
+	public List<LdapConfig> getLdapConfigs(int start, int max, String orderby, boolean asc) {
+		try {
+			CriteriaBuilder cb = em.getCriteriaBuilder();
+			CriteriaQuery<LdapConfig> cq = cb.createQuery(LdapConfig.class);
+			Root<LdapConfig> c = cq.from(LdapConfig.class);
+			Predicate condition = cb.equal(c.get("deleted"), "false");
+			cq.where(condition);
+			cq.distinct(asc);
+			if (asc){
+				cq.orderBy(cb.asc(c.get(orderby)));
+			} else {
+				cq.orderBy(cb.desc(c.get(orderby)));
+			}
+			TypedQuery<LdapConfig> q = em.createQuery(cq);
+			q.setFirstResult(start);
+			q.setMaxResults(max);
+			List<LdapConfig> ll = q.getResultList();
+			return ll;
+		} catch (Exception ex2) {
+			log.error("[getLdapConfigs]" ,ex2);
+		}
+		return null;
+	}
+	
+	public Long selectMaxFromLdapConfig(){
+		try {
+			log.debug("selectMaxFromConfigurations ");
+			//get all users
+			TypedQuery<Long> query = em.createQuery("select count(c.ldapConfigId) from LdapConfig c where c.deleted LIKE 'false'", Long.class); 
+			List<Long> ll = query.getResultList();
+			log.debug("selectMaxFromLdapConfig" + ll.get(0));
+			return ll.get(0);
+		} catch (Exception ex2) {
+			log.error("[selectMaxFromLdapConfig] ",ex2);
+		}
+		return null;
+	}	
+	
+	public Long deleteLdapConfigById(Long ldapConfigId) {
+		try {
+			
+			LdapConfig ldapConfig = this.getLdapConfigById(ldapConfigId);
+			
+			if (ldapConfig == null) {
+				return null;
+			}
+			
+			ldapConfig = em.find(LdapConfig.class, ldapConfig.getLdapConfigId());
+			em.remove(ldapConfig);
+			
+			return ldapConfigId;
+			
+		} catch (Exception ex2) {
+			log.error("[deleteLdapConfigById]: ",ex2);
+		}
+		return null;
+	}
+
+	public List<LdapConfig> getActiveLdapConfigs() {
+		try {
+			log.debug("selectMaxFromConfigurations ");
+			
+			String hql = "select c from LdapConfig c " +
+					"where c.deleted LIKE 'false' " +
+					"AND c.isActive = :isActive ";
+			
+			//get all users
+			TypedQuery<LdapConfig> query = em.createQuery(hql, LdapConfig.class);
+			query.setParameter("isActive", true);
+			List<LdapConfig> ll = query.getResultList();
+			
+			return ll;				
+		} catch (Exception ex2) {
+			log.error("[getActiveLdapConfigs] ",ex2);
+		}
+		return null;
+	}
+
+	public List<LdapConfig> getLdapConfigs() {
+		try {
+			log.debug("selectMaxFromConfigurations ");
+			
+			String hql = "select c from LdapConfig c " +
+					"where c.deleted LIKE 'false' ";
+			
+			//get all users
+			TypedQuery<LdapConfig> query = em.createQuery(hql, LdapConfig.class);
+			List<LdapConfig> ll = query.getResultList();
+			
+			return ll;				
+		} catch (Exception ex2) {
+			log.error("[getActiveLdapConfigs] ",ex2);
+		}
+		return null;
+	}	
+	
+}

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/OmTimeZoneDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/OmTimeZoneDaoImpl.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/OmTimeZoneDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/OmTimeZoneDaoImpl.java Tue Jan 24 18:30:48 2012
@@ -1,105 +1,123 @@
-package org.openmeetings.app.data.basic.dao;
-
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-
-import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import org.springframework.transaction.annotation.Transactional;
-
-@Transactional
-public class OmTimeZoneDaoImpl {
-
-	private static final Logger log = Red5LoggerFactory.getLogger(
-			OmTimeZoneDaoImpl.class, ScopeApplicationAdapter.webAppRootKey);
-
-	@PersistenceContext
-	private EntityManager em;
-
-	public Long addOmTimeZone(String name, String label, String iCal,
-			Integer orderId) {
-		try {
-
-			OmTimeZone omTimeZone = new OmTimeZone();
-
-			omTimeZone.setJname(name);
-			omTimeZone.setLabel(label);
-			omTimeZone.setIcal(iCal);
-			omTimeZone.setOrderId(orderId);
-			omTimeZone.setInserted(new Date());
-
-			omTimeZone = em.merge(omTimeZone);
-			Long omTimeZoneId = omTimeZone.getOmtimezoneId();
-
-			return omTimeZoneId;
-
-		} catch (Exception ex) {
-			log.error("[addOmTimeZone]", ex);
-		}
-		return null;
-	}
-
-	public List<OmTimeZone> getOmTimeZones() {
-		try {
-			String hql = "select sl from OmTimeZone as sl "
-					+ "ORDER BY sl.orderId";
-
-			TypedQuery<OmTimeZone> query = em.createQuery(hql, OmTimeZone.class);
-			List<OmTimeZone> sList = query.getResultList();
-
-			for (OmTimeZone omTimeZone : sList) {
-				omTimeZone.setFrontEndLabel(omTimeZone.getJname() + " ("
-						+ omTimeZone.getLabel() + ")");
-			}
-
-			return sList;
-
-		} catch (Exception ex2) {
-			log.error("[getOmTimeZones]: ", ex2);
-		}
-		return null;
-	}
-
-	public OmTimeZone getOmTimeZone(String jname) {
-		try {
-			String hql = "select sl from OmTimeZone as sl "
-					+ "WHERE sl.jname LIKE :jname";
-			TypedQuery<OmTimeZone> query = em.createQuery(hql, OmTimeZone.class);
-			query.setParameter("jname", jname);
-			List<OmTimeZone> sList = query.getResultList();
-
-			if (sList.size() > 0) {
-				return sList.get(0);
-			}
-
-		} catch (Exception ex2) {
-			log.error("[getOmTimeZone]: ", ex2);
-		}
-		return null;
-	}
-
-	public OmTimeZone getOmTimeZoneById(Long omtimezoneId) {
-		try {
-			String hql = "select sl from OmTimeZone as sl "
-					+ "WHERE sl.omtimezoneId = :omtimezoneId";
-			TypedQuery<OmTimeZone> query = em.createQuery(hql, OmTimeZone.class);
-			query.setParameter("omtimezoneId", omtimezoneId);
-			List<OmTimeZone> sList = query.getResultList();
-
-			if (sList.size() > 0) {
-				return sList.get(0);
-			}
-
-		} catch (Exception ex2) {
-			log.error("[getOmTimeZoneById]: ", ex2);
-		}
-		return null;
-	}
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.openmeetings.app.data.basic.dao;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+
+import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
+import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+public class OmTimeZoneDaoImpl {
+
+	private static final Logger log = Red5LoggerFactory.getLogger(
+			OmTimeZoneDaoImpl.class, ScopeApplicationAdapter.webAppRootKey);
+
+	@PersistenceContext
+	private EntityManager em;
+
+	public Long addOmTimeZone(String name, String label, String iCal,
+			Integer orderId) {
+		try {
+
+			OmTimeZone omTimeZone = new OmTimeZone();
+
+			omTimeZone.setJname(name);
+			omTimeZone.setLabel(label);
+			omTimeZone.setIcal(iCal);
+			omTimeZone.setOrderId(orderId);
+			omTimeZone.setInserted(new Date());
+
+			omTimeZone = em.merge(omTimeZone);
+			Long omTimeZoneId = omTimeZone.getOmtimezoneId();
+
+			return omTimeZoneId;
+
+		} catch (Exception ex) {
+			log.error("[addOmTimeZone]", ex);
+		}
+		return null;
+	}
+
+	public List<OmTimeZone> getOmTimeZones() {
+		try {
+			String hql = "select sl from OmTimeZone as sl "
+					+ "ORDER BY sl.orderId";
+
+			TypedQuery<OmTimeZone> query = em.createQuery(hql, OmTimeZone.class);
+			List<OmTimeZone> sList = query.getResultList();
+
+			for (OmTimeZone omTimeZone : sList) {
+				omTimeZone.setFrontEndLabel(omTimeZone.getJname() + " ("
+						+ omTimeZone.getLabel() + ")");
+			}
+
+			return sList;
+
+		} catch (Exception ex2) {
+			log.error("[getOmTimeZones]: ", ex2);
+		}
+		return null;
+	}
+
+	public OmTimeZone getOmTimeZone(String jname) {
+		try {
+			String hql = "select sl from OmTimeZone as sl "
+					+ "WHERE sl.jname LIKE :jname";
+			TypedQuery<OmTimeZone> query = em.createQuery(hql, OmTimeZone.class);
+			query.setParameter("jname", jname);
+			List<OmTimeZone> sList = query.getResultList();
+
+			if (sList.size() > 0) {
+				return sList.get(0);
+			}
+
+		} catch (Exception ex2) {
+			log.error("[getOmTimeZone]: ", ex2);
+		}
+		return null;
+	}
+
+	public OmTimeZone getOmTimeZoneById(Long omtimezoneId) {
+		try {
+			String hql = "select sl from OmTimeZone as sl "
+					+ "WHERE sl.omtimezoneId = :omtimezoneId";
+			TypedQuery<OmTimeZone> query = em.createQuery(hql, OmTimeZone.class);
+			query.setParameter("omtimezoneId", omtimezoneId);
+			List<OmTimeZone> sList = query.getResultList();
+
+			if (sList.size() > 0) {
+				return sList.get(0);
+			}
+
+		} catch (Exception ex2) {
+			log.error("[getOmTimeZoneById]: ", ex2);
+		}
+		return null;
+	}
+
+}

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/SOAPLoginDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/SOAPLoginDaoImpl.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/SOAPLoginDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/SOAPLoginDaoImpl.java Tue Jan 24 18:30:48 2012
@@ -1,108 +1,126 @@
-package org.openmeetings.app.data.basic.dao;
-
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-
-import org.openmeetings.app.persistence.beans.basic.SOAPLogin;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.openmeetings.utils.crypt.ManageCryptStyle;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-@Transactional
-public class SOAPLoginDaoImpl {
-
-	private static final Logger log = Red5LoggerFactory.getLogger(
-			SOAPLoginDaoImpl.class, ScopeApplicationAdapter.webAppRootKey);
-
-	@PersistenceContext
-	private EntityManager em;
-	@Autowired
-	private ManageCryptStyle manageCryptStyle;
-
-	public String addSOAPLogin(String sessionHash, Long room_id,
-			boolean becomemoderator, boolean showAudioVideoTest,
-			boolean allowSameURLMultipleTimes, Long recording_id,
-			boolean showNickNameDialog, String landingZone,
-			boolean allowRecording) {
-		try {
-
-			String thistime = "TIME_" + (new Date().getTime());
-
-			String hash = manageCryptStyle.getInstanceOfCrypt()
-					.createPassPhrase(thistime);
-
-			SOAPLogin soapLogin = new SOAPLogin();
-			soapLogin.setCreated(new Date());
-			soapLogin.setUsed(false);
-			soapLogin.setRoom_id(room_id);
-			soapLogin.setAllowSameURLMultipleTimes(allowSameURLMultipleTimes);
-			soapLogin.setHash(hash);
-			soapLogin.setRoomRecordingId(recording_id);
-			soapLogin.setSessionHash(sessionHash);
-			soapLogin.setBecomemoderator(becomemoderator);
-			soapLogin.setShowAudioVideoTest(showAudioVideoTest);
-			soapLogin.setShowNickNameDialog(showNickNameDialog);
-			soapLogin.setLandingZone(landingZone);
-			soapLogin.setAllowRecording(allowRecording);
-
-			soapLogin = em.merge(soapLogin);
-			Long soapLoginId = soapLogin.getSoapLoginId();
-
-			if (soapLoginId > 0) {
-				return hash;
-			} else {
-				throw new Exception("Could not store SOAPLogin");
-			}
-
-		} catch (Exception ex2) {
-			log.error("[addSOAPLogin]: ", ex2);
-		}
-		return null;
-	}
-
-	public SOAPLogin getSOAPLoginByHash(String hash) {
-		try {
-			String hql = "select sl from SOAPLogin as sl "
-					+ "WHERE sl.hash LIKE :hash";
-			TypedQuery<SOAPLogin> query = em.createQuery(hql, SOAPLogin.class);
-			query.setParameter("hash", hash);
-			List<SOAPLogin> sList = query.getResultList();
-
-			if (sList.size() > 1) {
-				throw new Exception(
-						"there are more then one SOAPLogin with identical hash! "
-								+ hash);
-			}
-
-			if (sList.size() == 1) {
-				return sList.get(0);
-			}
-
-		} catch (Exception ex2) {
-			log.error("[getSOAPLoginByHash]: ", ex2);
-		}
-		return null;
-	}
-
-	public void updateSOAPLogin(SOAPLogin soapLogin) {
-		try {
-			if (soapLogin.getSoapLoginId() == 0) {
-				em.persist(soapLogin);
-			} else {
-				if (!em.contains(soapLogin)) {
-					em.merge(soapLogin);
-				}
-			}
-		} catch (Exception ex2) {
-			log.error("[updateSOAPLogin]: ", ex2);
-		}
-	}
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.openmeetings.app.data.basic.dao;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+
+import org.openmeetings.app.persistence.beans.basic.SOAPLogin;
+import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.utils.crypt.ManageCryptStyle;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+public class SOAPLoginDaoImpl {
+
+	private static final Logger log = Red5LoggerFactory.getLogger(
+			SOAPLoginDaoImpl.class, ScopeApplicationAdapter.webAppRootKey);
+
+	@PersistenceContext
+	private EntityManager em;
+	@Autowired
+	private ManageCryptStyle manageCryptStyle;
+
+	public String addSOAPLogin(String sessionHash, Long room_id,
+			boolean becomemoderator, boolean showAudioVideoTest,
+			boolean allowSameURLMultipleTimes, Long recording_id,
+			boolean showNickNameDialog, String landingZone,
+			boolean allowRecording) {
+		try {
+
+			String thistime = "TIME_" + (new Date().getTime());
+
+			String hash = manageCryptStyle.getInstanceOfCrypt()
+					.createPassPhrase(thistime);
+
+			SOAPLogin soapLogin = new SOAPLogin();
+			soapLogin.setCreated(new Date());
+			soapLogin.setUsed(false);
+			soapLogin.setRoom_id(room_id);
+			soapLogin.setAllowSameURLMultipleTimes(allowSameURLMultipleTimes);
+			soapLogin.setHash(hash);
+			soapLogin.setRoomRecordingId(recording_id);
+			soapLogin.setSessionHash(sessionHash);
+			soapLogin.setBecomemoderator(becomemoderator);
+			soapLogin.setShowAudioVideoTest(showAudioVideoTest);
+			soapLogin.setShowNickNameDialog(showNickNameDialog);
+			soapLogin.setLandingZone(landingZone);
+			soapLogin.setAllowRecording(allowRecording);
+
+			soapLogin = em.merge(soapLogin);
+			Long soapLoginId = soapLogin.getSoapLoginId();
+
+			if (soapLoginId > 0) {
+				return hash;
+			} else {
+				throw new Exception("Could not store SOAPLogin");
+			}
+
+		} catch (Exception ex2) {
+			log.error("[addSOAPLogin]: ", ex2);
+		}
+		return null;
+	}
+
+	public SOAPLogin getSOAPLoginByHash(String hash) {
+		try {
+			String hql = "select sl from SOAPLogin as sl "
+					+ "WHERE sl.hash LIKE :hash";
+			TypedQuery<SOAPLogin> query = em.createQuery(hql, SOAPLogin.class);
+			query.setParameter("hash", hash);
+			List<SOAPLogin> sList = query.getResultList();
+
+			if (sList.size() > 1) {
+				throw new Exception(
+						"there are more then one SOAPLogin with identical hash! "
+								+ hash);
+			}
+
+			if (sList.size() == 1) {
+				return sList.get(0);
+			}
+
+		} catch (Exception ex2) {
+			log.error("[getSOAPLoginByHash]: ", ex2);
+		}
+		return null;
+	}
+
+	public void updateSOAPLogin(SOAPLogin soapLogin) {
+		try {
+			if (soapLogin.getSoapLoginId() == 0) {
+				em.persist(soapLogin);
+			} else {
+				if (!em.contains(soapLogin)) {
+					em.merge(soapLogin);
+				}
+			}
+		} catch (Exception ex2) {
+			log.error("[updateSOAPLogin]: ", ex2);
+		}
+	}
+
+}

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/FilesObject.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/FilesObject.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/FilesObject.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/FilesObject.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.basic.files;
 
 /**

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/FoldersObject.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/FoldersObject.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/FoldersObject.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/FoldersObject.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.basic.files;
 /**
  * Represents a Folder in the File System

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/LiberaryObject.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/LiberaryObject.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/LiberaryObject.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/LiberaryObject.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.basic.files;
 /**
  * Response of one Library-Files-Request

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/PresentationObject.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/PresentationObject.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/PresentationObject.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/PresentationObject.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.basic.files;
 
 import java.util.LinkedList;

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/TestObject.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/TestObject.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/TestObject.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/files/TestObject.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.basic.files;
 
 import java.util.LinkedList;

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/rooms/RoomsList.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/rooms/RoomsList.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/rooms/RoomsList.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/rooms/RoomsList.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.basic.rooms;
 
 import org.openmeetings.app.persistence.beans.rooms.Rooms;

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/beans/basic/ErrorResult.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/beans/basic/ErrorResult.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/beans/basic/ErrorResult.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/beans/basic/ErrorResult.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.beans.basic;
 
 public class ErrorResult {

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/beans/basic/SearchResult.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/beans/basic/SearchResult.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/beans/basic/SearchResult.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/beans/basic/SearchResult.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.beans.basic;
 
 import java.util.List;

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentCategoryDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentCategoryDaoImpl.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentCategoryDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentCategoryDaoImpl.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.calendar.daos;
 
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.calendar.daos;
 
 import java.sql.Timestamp;

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentReminderTypDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentReminderTypDaoImpl.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentReminderTypDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentReminderTypDaoImpl.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.calendar.daos;
 
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.calendar.daos;
 
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.calendar.management;
 
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.calendar.management;
 
 import java.util.TimeZone;

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Feedbackmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Feedbackmanagement.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Feedbackmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Feedbackmanagement.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.conference;
 
 import org.openmeetings.app.data.basic.Configurationmanagement;

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.conference;
 
 import java.util.Calendar;

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java Tue Jan 24 18:30:48 2012
@@ -1,181 +1,199 @@
-package org.openmeetings.app.data.conference;
-
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-
-import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.persistence.beans.poll.PollType;
-import org.openmeetings.app.persistence.beans.poll.RoomPoll;
-import org.openmeetings.app.persistence.beans.poll.RoomPollAnswers;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-@Transactional
-public class PollManagement {
-	private static final Logger log = Red5LoggerFactory
-			.getLogger(PollManagement.class);
-
-	@PersistenceContext
-	private EntityManager em;
-	@Autowired
-	private Fieldmanagment fieldmanagment;
-	@Autowired
-	private Usermanagement usermanagement;
-	@Autowired
-	private Roommanagement roommanagement;
-
-	public Long addPollType(Long labelId, Boolean isNumeric) {
-		log.debug("Adding poll type: " + labelId + ", " + isNumeric);
-		PollType pt = new PollType();
-		pt.setLabel(fieldmanagment.getFieldvaluesById(labelId));
-		pt.setIsNumericAnswer(isNumeric);
-
-		em.persist(pt);
-		
-		return pt.getPollTypesId();
-	}
-	
-	public List<PollType> getPollTypes() {
-		TypedQuery<PollType> q = em.createQuery("SELECT pt FROM PollType pt",PollType.class);
-		return q.getResultList();
-	}
-	
-	public PollType getPollType(Long typeId) {
-		TypedQuery<PollType> q = em.createQuery("SELECT pt FROM PollType pt WHERE pt.pollTypesId = :pollTypesId", PollType.class);
-		q.setParameter("pollTypesId", typeId);
-		return q.getSingleResult();
-	}
-	
-	public RoomPoll createPoll(RoomClient rc, String pollName, String pollQuestion, Long pollTypeId) {
-		RoomPoll roomP = new RoomPoll();
-		
-		roomP.setCreatedBy(usermanagement.getUserById(rc.getUser_id()));
-		roomP.setCreated(new Date());
-		roomP.setPollName(pollName);
-		roomP.setPollQuestion(pollQuestion);
-		roomP.setPollType(getPollType(pollTypeId));
-		roomP.setRoom(roommanagement.getRoomById(rc.getRoom_id()));
-		
-		em.persist(roomP);
-		return roomP;
-	}
-	
-	public void savePollBackup(RoomPoll rp) {
-		em.persist(rp);
-	}
-
-
-	public RoomPoll updatePoll(RoomPoll rp) {
-		return em.merge(rp);
-	}
-
-	public boolean closePoll(Long room_id){
-		try {
-			log.debug(" :: closePoll :: ");
-			Query q = em.createQuery("UPDATE RoomPoll rp SET rp.archived = :archived WHERE rp.room.rooms_id = :rooms_id");
-			q.setParameter("rooms_id", room_id);
-			q.setParameter("archived", true);
-			return q.executeUpdate() > 0;
-		} catch (Exception err) {
-			log.error("[closePoll]", err);
-		}
-		return false;
-	}
-
-	public boolean deletePoll(Long poll_id){
-		try {
-			log.debug(" :: deletePoll :: ");
-			Query q = em.createQuery("DELETE FROM RoomPoll rp WHERE rp.roomPollId = :roomPollId");
-			q.setParameter("roomPollId", poll_id);
-			return q.executeUpdate() > 0;
-		} catch (Exception err) {
-			log.error("[deletePoll]", err);
-		}
-		return false;
-	}
-
-	public RoomPoll getPoll(Long room_id) {
-		try {
-			log.debug(" :: getPoll :: " + room_id);
-			TypedQuery<RoomPoll> q = em.createQuery("SELECT rp FROM RoomPoll rp WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived", RoomPoll.class);
-			q.setParameter("room_id", room_id);
-			q.setParameter("archived", false);
-			return q.getSingleResult();
-		} catch (NoResultException nre) {
-			//expected
-		} catch (Exception err) {
-			log.error("[getPoll]", err);
-		}
-		return null;
-	}
-	
-	public List<RoomPoll> getPollListBackup() {
-		try {
-			TypedQuery<RoomPoll> q = em.createQuery("SELECT rp FROM RoomPoll rp",RoomPoll.class);
-			return q.getResultList();
-		} catch (NoResultException nre) {
-			//expected
-		} catch (Exception err) {
-			log.error("[getPoll]", err);
-		}
-		return null;
-	}
-	
-	public List<RoomPoll> getArchivedPollList(Long room_id) {
-		try {
-			log.debug(" :: getPoll :: " + room_id);
-			TypedQuery<RoomPoll> q = em.createQuery("SELECT rp FROM RoomPoll rp WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived",RoomPoll.class);
-			q.setParameter("room_id", room_id);
-			q.setParameter("archived", true);
-			return q.getResultList();
-		} catch (NoResultException nre) {
-			//expected
-		} catch (Exception err) {
-			log.error("[getPoll]", err);
-		}
-		return null;
-	}
-	
-	public boolean hasPoll(Long room_id) {
-		try {
-			log.debug(" :: hasPoll :: " + room_id);
-			TypedQuery<Long> q = em.createQuery("SELECT COUNT(rp) FROM RoomPoll rp WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived", Long.class);
-			q.setParameter("room_id", room_id);
-			q.setParameter("archived", false);
-			return q.getSingleResult() > 0;
-		} catch (NoResultException nre) {
-			//expected
-		} catch (Exception err) {
-			log.error("[getPoll]", err);
-		}
-		return false;
-	}
-	
-	public boolean hasVoted(Long room_id, Long userid) {
-		try {
-			log.debug(" :: hasVoted :: " + room_id + ", " + userid);
-			TypedQuery<RoomPollAnswers> q = em.createQuery("SELECT rpa FROM RoomPollAnswers rpa "
-				+ "WHERE rpa.roomPoll.room.rooms_id = :room_id AND rpa.votedUser.user_id = :userid AND rpa.roomPoll.archived = :archived", RoomPollAnswers.class);
-			q.setParameter("room_id", room_id);
-			q.setParameter("userid", userid);
-			q.setParameter("archived", false);
-			q.getSingleResult();
-			return true;
-		} catch (NoResultException nre) {
-			//expected
-		} catch (Exception err) {
-			log.error("[getPoll]", err);
-		}
-		return false;
-	}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.openmeetings.app.data.conference;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import javax.persistence.TypedQuery;
+
+import org.openmeetings.app.data.basic.Fieldmanagment;
+import org.openmeetings.app.data.user.Usermanagement;
+import org.openmeetings.app.persistence.beans.poll.PollType;
+import org.openmeetings.app.persistence.beans.poll.RoomPoll;
+import org.openmeetings.app.persistence.beans.poll.RoomPollAnswers;
+import org.openmeetings.app.persistence.beans.recording.RoomClient;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+public class PollManagement {
+	private static final Logger log = Red5LoggerFactory
+			.getLogger(PollManagement.class);
+
+	@PersistenceContext
+	private EntityManager em;
+	@Autowired
+	private Fieldmanagment fieldmanagment;
+	@Autowired
+	private Usermanagement usermanagement;
+	@Autowired
+	private Roommanagement roommanagement;
+
+	public Long addPollType(Long labelId, Boolean isNumeric) {
+		log.debug("Adding poll type: " + labelId + ", " + isNumeric);
+		PollType pt = new PollType();
+		pt.setLabel(fieldmanagment.getFieldvaluesById(labelId));
+		pt.setIsNumericAnswer(isNumeric);
+
+		em.persist(pt);
+		
+		return pt.getPollTypesId();
+	}
+	
+	public List<PollType> getPollTypes() {
+		TypedQuery<PollType> q = em.createQuery("SELECT pt FROM PollType pt",PollType.class);
+		return q.getResultList();
+	}
+	
+	public PollType getPollType(Long typeId) {
+		TypedQuery<PollType> q = em.createQuery("SELECT pt FROM PollType pt WHERE pt.pollTypesId = :pollTypesId", PollType.class);
+		q.setParameter("pollTypesId", typeId);
+		return q.getSingleResult();
+	}
+	
+	public RoomPoll createPoll(RoomClient rc, String pollName, String pollQuestion, Long pollTypeId) {
+		RoomPoll roomP = new RoomPoll();
+		
+		roomP.setCreatedBy(usermanagement.getUserById(rc.getUser_id()));
+		roomP.setCreated(new Date());
+		roomP.setPollName(pollName);
+		roomP.setPollQuestion(pollQuestion);
+		roomP.setPollType(getPollType(pollTypeId));
+		roomP.setRoom(roommanagement.getRoomById(rc.getRoom_id()));
+		
+		em.persist(roomP);
+		return roomP;
+	}
+	
+	public void savePollBackup(RoomPoll rp) {
+		em.persist(rp);
+	}
+
+
+	public RoomPoll updatePoll(RoomPoll rp) {
+		return em.merge(rp);
+	}
+
+	public boolean closePoll(Long room_id){
+		try {
+			log.debug(" :: closePoll :: ");
+			Query q = em.createQuery("UPDATE RoomPoll rp SET rp.archived = :archived WHERE rp.room.rooms_id = :rooms_id");
+			q.setParameter("rooms_id", room_id);
+			q.setParameter("archived", true);
+			return q.executeUpdate() > 0;
+		} catch (Exception err) {
+			log.error("[closePoll]", err);
+		}
+		return false;
+	}
+
+	public boolean deletePoll(Long poll_id){
+		try {
+			log.debug(" :: deletePoll :: ");
+			Query q = em.createQuery("DELETE FROM RoomPoll rp WHERE rp.roomPollId = :roomPollId");
+			q.setParameter("roomPollId", poll_id);
+			return q.executeUpdate() > 0;
+		} catch (Exception err) {
+			log.error("[deletePoll]", err);
+		}
+		return false;
+	}
+
+	public RoomPoll getPoll(Long room_id) {
+		try {
+			log.debug(" :: getPoll :: " + room_id);
+			TypedQuery<RoomPoll> q = em.createQuery("SELECT rp FROM RoomPoll rp WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived", RoomPoll.class);
+			q.setParameter("room_id", room_id);
+			q.setParameter("archived", false);
+			return q.getSingleResult();
+		} catch (NoResultException nre) {
+			//expected
+		} catch (Exception err) {
+			log.error("[getPoll]", err);
+		}
+		return null;
+	}
+	
+	public List<RoomPoll> getPollListBackup() {
+		try {
+			TypedQuery<RoomPoll> q = em.createQuery("SELECT rp FROM RoomPoll rp",RoomPoll.class);
+			return q.getResultList();
+		} catch (NoResultException nre) {
+			//expected
+		} catch (Exception err) {
+			log.error("[getPoll]", err);
+		}
+		return null;
+	}
+	
+	public List<RoomPoll> getArchivedPollList(Long room_id) {
+		try {
+			log.debug(" :: getPoll :: " + room_id);
+			TypedQuery<RoomPoll> q = em.createQuery("SELECT rp FROM RoomPoll rp WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived",RoomPoll.class);
+			q.setParameter("room_id", room_id);
+			q.setParameter("archived", true);
+			return q.getResultList();
+		} catch (NoResultException nre) {
+			//expected
+		} catch (Exception err) {
+			log.error("[getPoll]", err);
+		}
+		return null;
+	}
+	
+	public boolean hasPoll(Long room_id) {
+		try {
+			log.debug(" :: hasPoll :: " + room_id);
+			TypedQuery<Long> q = em.createQuery("SELECT COUNT(rp) FROM RoomPoll rp WHERE rp.room.rooms_id = :room_id AND rp.archived = :archived", Long.class);
+			q.setParameter("room_id", room_id);
+			q.setParameter("archived", false);
+			return q.getSingleResult() > 0;
+		} catch (NoResultException nre) {
+			//expected
+		} catch (Exception err) {
+			log.error("[getPoll]", err);
+		}
+		return false;
+	}
+	
+	public boolean hasVoted(Long room_id, Long userid) {
+		try {
+			log.debug(" :: hasVoted :: " + room_id + ", " + userid);
+			TypedQuery<RoomPollAnswers> q = em.createQuery("SELECT rpa FROM RoomPollAnswers rpa "
+				+ "WHERE rpa.roomPoll.room.rooms_id = :room_id AND rpa.votedUser.user_id = :userid AND rpa.roomPoll.archived = :archived", RoomPollAnswers.class);
+			q.setParameter("room_id", room_id);
+			q.setParameter("userid", userid);
+			q.setParameter("archived", false);
+			q.getSingleResult();
+			return true;
+		} catch (NoResultException nre) {
+			//expected
+		} catch (Exception err) {
+			log.error("[getPoll]", err);
+		}
+		return false;
+	}
+}

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java Tue Jan 24 18:30:48 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.openmeetings.app.data.conference;
 
 import java.util.Date;

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/dao/RoomModeratorsDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/dao/RoomModeratorsDaoImpl.java?rev=1235400&r1=1235399&r2=1235400&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/dao/RoomModeratorsDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/dao/RoomModeratorsDaoImpl.java Tue Jan 24 18:30:48 2012
@@ -1,306 +1,324 @@
-package org.openmeetings.app.data.conference.dao;
-
-import java.util.Date;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-
-import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.persistence.beans.rooms.RoomModerators;
-import org.openmeetings.app.persistence.beans.user.Users;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-@Transactional
-public class RoomModeratorsDaoImpl {
-
-	private static final Logger log = Red5LoggerFactory
-			.getLogger(RoomModeratorsDaoImpl.class);
-	@Autowired
-	private Usermanagement userManagement;
-	@PersistenceContext
-	private EntityManager em;
-
-	/**
-	 * 
-	 * @param us
-	 * @param isSuperModerator
-	 * @return
-	 */
-	public Long addRoomModeratorByUserId(Users us, Boolean isSuperModerator,
-			Long roomId) {
-		try {
-			RoomModerators rModerator = new RoomModerators();
-			rModerator.setUser(us);
-			rModerator.setIsSuperModerator(isSuperModerator);
-			rModerator.setStarttime(new Date());
-			rModerator.setDeleted("false");
-			rModerator.setRoomId(roomId);
-			rModerator = em.merge(rModerator);
-			long rModeratorId = rModerator.getRoomModeratorsId();
-			return rModeratorId;
-		} catch (Exception ex2) {
-			log.error("[addRoomModeratorByUserId] ", ex2);
-		}
-		return null;
-	}
-
-	public Long addRoomModeratorByObj(RoomModerators rModerator) {
-		try {
-			rModerator.setStarttime(new Date());
-			rModerator = em.merge(rModerator);
-			long rModeratorId = rModerator.getRoomModeratorsId();
-			return rModeratorId;
-		} catch (Exception ex2) {
-			log.error("[addRoomModeratorByUserId] ", ex2);
-		}
-		return null;
-	}
-
-	/**
-	 * get all available RoomTypes
-	 * 
-	 * @return List of RoomTypes
-	 */
-	public RoomModerators getRoomModeratorById(Long roomModeratorsId) {
-		try {
-			String hql = "select c from RoomModerators as c where c.roomModeratorsId = :roomModeratorsId";
-
-			TypedQuery<RoomModerators> query = em.createQuery(hql, RoomModerators.class);
-
-			query.setParameter("roomModeratorsId", roomModeratorsId);
-
-			RoomModerators roomModerators = null;
-			try {
-				roomModerators = query.getSingleResult();
-			} catch (NoResultException ex) {
-			}
-
-			return roomModerators;
-
-		} catch (Exception ex2) {
-			log.error("[getRoomModeratorById] ", ex2);
-		}
-		return null;
-	}
-
-	public List<RoomModerators> getRoomModeratorByRoomId(Long roomId) {
-		try {
-
-			String hql = "select c from RoomModerators as c "
-					+ "where c.roomId = :roomId AND c.deleted <> :deleted";
-
-			TypedQuery<RoomModerators> query = em.createQuery(hql, RoomModerators.class);
-
-			query.setParameter("deleted", "true");
-			query.setParameter("roomId", roomId);
-
-			List<RoomModerators> roomModerators = query.getResultList();
-
-			return roomModerators;
-
-		} catch (Exception ex2) {
-			log.error("[getRoomModeratorByRoomId] ", ex2);
-			ex2.printStackTrace();
-		}
-		return null;
-	}
-
-	public List<RoomModerators> getRoomModeratorByUserAndRoomId(Long roomId,
-			Long user_id) {
-		try {
-
-			String hql = "select c from RoomModerators as c "
-					+ "where c.roomId = :roomId "
-					+ "AND c.deleted <> :deleted "
-					+ "AND c.user.user_id = :user_id";
-
-			TypedQuery<RoomModerators> query = em.createQuery(hql, RoomModerators.class);
-
-			query.setParameter("deleted", "true");
-			query.setParameter("roomId", roomId);
-			query.setParameter("user_id", user_id);
-
-			List<RoomModerators> roomModerators = query.getResultList();
-
-			return roomModerators;
-
-		} catch (Exception ex2) {
-			log.error("[getRoomModeratorByUserAndRoomId] ", ex2);
-			ex2.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 
-	 * @param roomModeratorsId
-	 */
-	public void removeRoomModeratorByUserId(Long roomModeratorsId) {
-		try {
-			RoomModerators rModerator = this
-					.getRoomModeratorById(roomModeratorsId);
-
-			if (rModerator == null) {
-				return;
-			}
-
-			rModerator.setUpdatetime(new Date());
-			rModerator.setDeleted("true");
-
-			if (rModerator.getRoomModeratorsId() == 0) {
-				em.persist(rModerator);
-			} else {
-				if (!em.contains(rModerator)) {
-					em.merge(rModerator);
-				}
-			}
-
-		} catch (Exception ex2) {
-			log.error("[removeRoomModeratorByUserId] ", ex2);
-		}
-	}
-
-	public void updateRoomModeratorByUserId(Long roomModeratorsId,
-			Boolean isSuperModerator) {
-		try {
-			RoomModerators rModerator = this
-					.getRoomModeratorById(roomModeratorsId);
-
-			if (rModerator == null) {
-				return;
-			}
-
-			rModerator.setIsSuperModerator(isSuperModerator);
-			rModerator.setUpdatetime(new Date());
-
-			if (rModerator.getRoomModeratorsId() == 0) {
-				em.persist(rModerator);
-			} else {
-				if (!em.contains(rModerator)) {
-					em.merge(rModerator);
-				}
-			}
-
-		} catch (Exception ex2) {
-			log.error("[updateRoomModeratorByUserId] ", ex2);
-		}
-	}
-
-	public void addRoomModeratorByUserList(
-			List<Map<String, Object>> roomModerators, Long roomId) {
-		try {
-
-			for (Iterator<Map<String, Object>> iter = roomModerators.iterator(); iter
-					.hasNext();) {
-
-				Map<String, Object> roomModeratorObj = iter.next();
-
-				Long userId = Long.parseLong(roomModeratorObj.get("userId")
-						.toString());
-				Boolean isSuperModerator = Boolean
-						.parseBoolean(roomModeratorObj.get("isSuperModerator")
-								.toString());
-
-				this.addRoomModeratorByUserId(
-						userManagement.getUserById(userId), isSuperModerator,
-						roomId);
-
-			}
-
-		} catch (Exception ex2) {
-			log.error("[addRoomModeratorByUserList] ", ex2);
-			ex2.printStackTrace();
-		}
-	}
-
-	public void updateRoomModeratorByUserList(
-			List<Map<String, Object>> roomModerators, Long roomId) {
-		try {
-
-			// getLsit of RoomModerators before you add new ones
-			List<RoomModerators> remoteRoomModeratorList = this
-					.getRoomModeratorByRoomId(roomId);
-
-			for (Iterator<Map<String, Object>> iter = roomModerators.iterator(); iter
-					.hasNext();) {
-
-				Map<String, Object> roomModeratorObj = iter.next();
-
-				Long roomModeratorsId = Long.parseLong(roomModeratorObj.get(
-						"roomModeratorsId").toString());
-				Long userId = Long.parseLong(roomModeratorObj.get("userId")
-						.toString());
-				Boolean isSuperModerator = Boolean
-						.parseBoolean(roomModeratorObj.get("isSuperModerator")
-								.toString());
-
-				if (roomModeratorsId == null || roomModeratorsId == 0) {
-					Long newRoomModeratorId = this.addRoomModeratorByUserId(
-							userManagement.getUserById(userId),
-							isSuperModerator, roomId);
-
-					roomModeratorObj
-							.put("roomModeratorsId", newRoomModeratorId);
-
-				} else {
-					this.updateRoomModeratorByUserId(roomModeratorsId,
-							isSuperModerator);
-				}
-
-			}
-
-			// Check for items to delete
-			List<RoomModerators> roomModeratorsToDelete = new LinkedList<RoomModerators>();
-
-			if (remoteRoomModeratorList != null) {
-
-				for (RoomModerators roomModerator : remoteRoomModeratorList) {
-
-					boolean found = false;
-
-					for (Iterator<Map<String, Object>> iter = roomModerators
-							.iterator(); iter.hasNext();) {
-						Map<String, Object> roomModeratorObj = iter.next();
-
-						Long roomModeratorsId = Long.parseLong(roomModeratorObj
-								.get("roomModeratorsId").toString());
-
-						if (roomModerator.getRoomModeratorsId() == roomModeratorsId
-								.longValue()) {
-							found = true;
-							break;
-						}
-
-					}
-
-					if (!found) {
-						roomModeratorsToDelete.add(roomModerator);
-					}
-
-				}
-
-			}
-
-			for (RoomModerators rModerator : roomModeratorsToDelete) {
-				System.out.println("Remove Map "
-						+ rModerator.getRoomModeratorsId());
-				this.removeRoomModeratorByUserId(rModerator
-						.getRoomModeratorsId());
-			}
-
-		} catch (Exception ex2) {
-			log.error("[updateRoomModeratorByUserList] ", ex2);
-			ex2.printStackTrace();
-		}
-	}
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.openmeetings.app.data.conference.dao;
+
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+
+import org.openmeetings.app.data.user.Usermanagement;
+import org.openmeetings.app.persistence.beans.rooms.RoomModerators;
+import org.openmeetings.app.persistence.beans.user.Users;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+public class RoomModeratorsDaoImpl {
+
+	private static final Logger log = Red5LoggerFactory
+			.getLogger(RoomModeratorsDaoImpl.class);
+	@Autowired
+	private Usermanagement userManagement;
+	@PersistenceContext
+	private EntityManager em;
+
+	/**
+	 * 
+	 * @param us
+	 * @param isSuperModerator
+	 * @return
+	 */
+	public Long addRoomModeratorByUserId(Users us, Boolean isSuperModerator,
+			Long roomId) {
+		try {
+			RoomModerators rModerator = new RoomModerators();
+			rModerator.setUser(us);
+			rModerator.setIsSuperModerator(isSuperModerator);
+			rModerator.setStarttime(new Date());
+			rModerator.setDeleted("false");
+			rModerator.setRoomId(roomId);
+			rModerator = em.merge(rModerator);
+			long rModeratorId = rModerator.getRoomModeratorsId();
+			return rModeratorId;
+		} catch (Exception ex2) {
+			log.error("[addRoomModeratorByUserId] ", ex2);
+		}
+		return null;
+	}
+
+	public Long addRoomModeratorByObj(RoomModerators rModerator) {
+		try {
+			rModerator.setStarttime(new Date());
+			rModerator = em.merge(rModerator);
+			long rModeratorId = rModerator.getRoomModeratorsId();
+			return rModeratorId;
+		} catch (Exception ex2) {
+			log.error("[addRoomModeratorByUserId] ", ex2);
+		}
+		return null;
+	}
+
+	/**
+	 * get all available RoomTypes
+	 * 
+	 * @return List of RoomTypes
+	 */
+	public RoomModerators getRoomModeratorById(Long roomModeratorsId) {
+		try {
+			String hql = "select c from RoomModerators as c where c.roomModeratorsId = :roomModeratorsId";
+
+			TypedQuery<RoomModerators> query = em.createQuery(hql, RoomModerators.class);
+
+			query.setParameter("roomModeratorsId", roomModeratorsId);
+
+			RoomModerators roomModerators = null;
+			try {
+				roomModerators = query.getSingleResult();
+			} catch (NoResultException ex) {
+			}
+
+			return roomModerators;
+
+		} catch (Exception ex2) {
+			log.error("[getRoomModeratorById] ", ex2);
+		}
+		return null;
+	}
+
+	public List<RoomModerators> getRoomModeratorByRoomId(Long roomId) {
+		try {
+
+			String hql = "select c from RoomModerators as c "
+					+ "where c.roomId = :roomId AND c.deleted <> :deleted";
+
+			TypedQuery<RoomModerators> query = em.createQuery(hql, RoomModerators.class);
+
+			query.setParameter("deleted", "true");
+			query.setParameter("roomId", roomId);
+
+			List<RoomModerators> roomModerators = query.getResultList();
+
+			return roomModerators;
+
+		} catch (Exception ex2) {
+			log.error("[getRoomModeratorByRoomId] ", ex2);
+			ex2.printStackTrace();
+		}
+		return null;
+	}
+
+	public List<RoomModerators> getRoomModeratorByUserAndRoomId(Long roomId,
+			Long user_id) {
+		try {
+
+			String hql = "select c from RoomModerators as c "
+					+ "where c.roomId = :roomId "
+					+ "AND c.deleted <> :deleted "
+					+ "AND c.user.user_id = :user_id";
+
+			TypedQuery<RoomModerators> query = em.createQuery(hql, RoomModerators.class);
+
+			query.setParameter("deleted", "true");
+			query.setParameter("roomId", roomId);
+			query.setParameter("user_id", user_id);
+
+			List<RoomModerators> roomModerators = query.getResultList();
+
+			return roomModerators;
+
+		} catch (Exception ex2) {
+			log.error("[getRoomModeratorByUserAndRoomId] ", ex2);
+			ex2.printStackTrace();
+		}
+		return null;
+	}
+
+	/**
+	 * 
+	 * @param roomModeratorsId
+	 */
+	public void removeRoomModeratorByUserId(Long roomModeratorsId) {
+		try {
+			RoomModerators rModerator = this
+					.getRoomModeratorById(roomModeratorsId);
+
+			if (rModerator == null) {
+				return;
+			}
+
+			rModerator.setUpdatetime(new Date());
+			rModerator.setDeleted("true");
+
+			if (rModerator.getRoomModeratorsId() == 0) {
+				em.persist(rModerator);
+			} else {
+				if (!em.contains(rModerator)) {
+					em.merge(rModerator);
+				}
+			}
+
+		} catch (Exception ex2) {
+			log.error("[removeRoomModeratorByUserId] ", ex2);
+		}
+	}
+
+	public void updateRoomModeratorByUserId(Long roomModeratorsId,
+			Boolean isSuperModerator) {
+		try {
+			RoomModerators rModerator = this
+					.getRoomModeratorById(roomModeratorsId);
+
+			if (rModerator == null) {
+				return;
+			}
+
+			rModerator.setIsSuperModerator(isSuperModerator);
+			rModerator.setUpdatetime(new Date());
+
+			if (rModerator.getRoomModeratorsId() == 0) {
+				em.persist(rModerator);
+			} else {
+				if (!em.contains(rModerator)) {
+					em.merge(rModerator);
+				}
+			}
+
+		} catch (Exception ex2) {
+			log.error("[updateRoomModeratorByUserId] ", ex2);
+		}
+	}
+
+	public void addRoomModeratorByUserList(
+			List<Map<String, Object>> roomModerators, Long roomId) {
+		try {
+
+			for (Iterator<Map<String, Object>> iter = roomModerators.iterator(); iter
+					.hasNext();) {
+
+				Map<String, Object> roomModeratorObj = iter.next();
+
+				Long userId = Long.parseLong(roomModeratorObj.get("userId")
+						.toString());
+				Boolean isSuperModerator = Boolean
+						.parseBoolean(roomModeratorObj.get("isSuperModerator")
+								.toString());
+
+				this.addRoomModeratorByUserId(
+						userManagement.getUserById(userId), isSuperModerator,
+						roomId);
+
+			}
+
+		} catch (Exception ex2) {
+			log.error("[addRoomModeratorByUserList] ", ex2);
+			ex2.printStackTrace();
+		}
+	}
+
+	public void updateRoomModeratorByUserList(
+			List<Map<String, Object>> roomModerators, Long roomId) {
+		try {
+
+			// getLsit of RoomModerators before you add new ones
+			List<RoomModerators> remoteRoomModeratorList = this
+					.getRoomModeratorByRoomId(roomId);
+
+			for (Iterator<Map<String, Object>> iter = roomModerators.iterator(); iter
+					.hasNext();) {
+
+				Map<String, Object> roomModeratorObj = iter.next();
+
+				Long roomModeratorsId = Long.parseLong(roomModeratorObj.get(
+						"roomModeratorsId").toString());
+				Long userId = Long.parseLong(roomModeratorObj.get("userId")
+						.toString());
+				Boolean isSuperModerator = Boolean
+						.parseBoolean(roomModeratorObj.get("isSuperModerator")
+								.toString());
+
+				if (roomModeratorsId == null || roomModeratorsId == 0) {
+					Long newRoomModeratorId = this.addRoomModeratorByUserId(
+							userManagement.getUserById(userId),
+							isSuperModerator, roomId);
+
+					roomModeratorObj
+							.put("roomModeratorsId", newRoomModeratorId);
+
+				} else {
+					this.updateRoomModeratorByUserId(roomModeratorsId,
+							isSuperModerator);
+				}
+
+			}
+
+			// Check for items to delete
+			List<RoomModerators> roomModeratorsToDelete = new LinkedList<RoomModerators>();
+
+			if (remoteRoomModeratorList != null) {
+
+				for (RoomModerators roomModerator : remoteRoomModeratorList) {
+
+					boolean found = false;
+
+					for (Iterator<Map<String, Object>> iter = roomModerators
+							.iterator(); iter.hasNext();) {
+						Map<String, Object> roomModeratorObj = iter.next();
+
+						Long roomModeratorsId = Long.parseLong(roomModeratorObj
+								.get("roomModeratorsId").toString());
+
+						if (roomModerator.getRoomModeratorsId() == roomModeratorsId
+								.longValue()) {
+							found = true;
+							break;
+						}
+
+					}
+
+					if (!found) {
+						roomModeratorsToDelete.add(roomModerator);
+					}
+
+				}
+
+			}
+
+			for (RoomModerators rModerator : roomModeratorsToDelete) {
+				System.out.println("Remove Map "
+						+ rModerator.getRoomModeratorsId());
+				this.removeRoomModeratorByUserId(rModerator
+						.getRoomModeratorsId());
+			}
+
+		} catch (Exception ex2) {
+			log.error("[updateRoomModeratorByUserList] ", ex2);
+			ex2.printStackTrace();
+		}
+	}
+
+}