openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebawag...@apache.org
Subject svn commit: r1435774 [1/2] - in /incubator/openmeetings/trunk/singlewebapp: WebContent/WEB-INF/ src/META-INF/ src/org/apache/openmeetings/axis/services/ src/org/apache/openmeetings/backup/ src/org/apache/openmeetings/data/calendar/management/ src/org/a...
Date Sun, 20 Jan 2013 00:56:28 GMT
Author: sebawagner
Date: Sun Jan 20 00:56:27 2013
New Revision: 1435774

URL: http://svn.apache.org/viewvc?rev=1435774&view=rev
Log:
OPENMEETINGS-460 Prepare database alternative for client session object

Added:
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/ClientDao.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java
Removed:
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java
Modified:
    incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
    incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
    incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
    incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
    incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
    incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomConverter.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/Client.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/IClientSession.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarForm.java

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Sun Jan 20 00:56:27 2013
@@ -188,10 +188,10 @@
 	<bean id="appointmentCategoryDaoImpl"
 		class="org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao" />
 	<bean id="roommanagement" class="org.apache.openmeetings.data.conference.Roommanagement" />
-	<bean id="roomDAO" class="org.apache.openmeetings.data.conference.RoomDAO" />
+	<bean id="roomDao" class="org.apache.openmeetings.data.conference.dao.RoomDao" />
 	<bean id="organisationmanagement" class="org.apache.openmeetings.data.user.Organisationmanagement" />
-	<bean id="organisationDAO" class="org.apache.openmeetings.data.user.dao.OrganisationDao" />
-	<bean id="organisationUserDAO" class="org.apache.openmeetings.data.user.dao.OrganisationUserDao" />
+	<bean id="organisationDao" class="org.apache.openmeetings.data.user.dao.OrganisationDao" />
+	<bean id="organisationUserDao" class="org.apache.openmeetings.data.user.dao.OrganisationUserDao" />
 	<bean id="salutationmanagement" class="org.apache.openmeetings.data.user.dao.SalutationDao" />
 	<bean id="errorManagement" class="org.apache.openmeetings.data.basic.ErrorManagement" />
 	<bean id="navimanagement" class="org.apache.openmeetings.data.basic.Navimanagement" />

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml Sun Jan 20 00:56:27 2013
@@ -53,6 +53,7 @@
 		<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
 		<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
 		<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Client</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml Sun Jan 20 00:56:27 2013
@@ -53,6 +53,7 @@
 		<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
 		<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
 		<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Client</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml Sun Jan 20 00:56:27 2013
@@ -53,6 +53,7 @@
 		<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
 		<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
 		<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Client</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml Sun Jan 20 00:56:27 2013
@@ -53,6 +53,7 @@
 		<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
 		<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
 		<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Client</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml Sun Jan 20 00:56:27 2013
@@ -53,6 +53,7 @@
 		<class>org.apache.openmeetings.persistence.beans.poll.PollType</class>
 		<class>org.apache.openmeetings.persistence.beans.poll.RoomPoll</class>
 		<class>org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers</class>
+		<class>org.apache.openmeetings.persistence.beans.rooms.Client</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.RoomModerators</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.Rooms</class>
 		<class>org.apache.openmeetings.persistence.beans.rooms.RoomTypes</class>

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java Sun Jan 20 00:56:27 2013
@@ -37,8 +37,8 @@ import org.apache.openmeetings.data.cale
 import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
 import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
 import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
-import org.apache.openmeetings.data.conference.RoomDAO;
 import org.apache.openmeetings.data.conference.Roommanagement;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.data.user.dao.UserContactsDao;
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
@@ -76,7 +76,7 @@ public class CalendarWebService {
 	@Autowired
 	private Roommanagement roommanagement;
 	@Autowired
-	private RoomDAO roomDao;
+	private RoomDao roomDao;
 	@Autowired
 	private AuthLevelmanagement authLevelManagement;
 	@Autowired

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java Sun Jan 20 00:56:27 2013
@@ -35,8 +35,8 @@ import org.apache.openmeetings.data.bean
 import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
 import org.apache.openmeetings.data.calendar.management.MeetingMemberLogic;
 import org.apache.openmeetings.data.conference.Invitationmanagement;
-import org.apache.openmeetings.data.conference.RoomDAO;
 import org.apache.openmeetings.data.conference.Roommanagement;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
@@ -90,7 +90,7 @@ public class RoomWebService {
 	@Autowired
 	private MeetingMemberLogic meetingMemberLogic;
 	@Autowired
-	private RoomDAO roomDao;
+	private RoomDao roomDao;
 
 	/**
 	 * Returns an Object of Type RoomsList which contains a list of

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomConverter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomConverter.java?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomConverter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/RoomConverter.java Sun Jan 20 00:56:27 2013
@@ -20,20 +20,20 @@ package org.apache.openmeetings.backup;
 
 import java.util.Map;
 
-import org.apache.openmeetings.data.conference.RoomDAO;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.persistence.beans.rooms.Rooms;
 import org.simpleframework.xml.stream.InputNode;
 import org.simpleframework.xml.stream.OutputNode;
 
 public class RoomConverter extends OmConverter<Rooms> {
-	private RoomDAO roomDao;
+	private RoomDao roomDao;
 	private Map<Long, Long> idMap;
 	
 	public RoomConverter() {
 		//default constructor is for export
 	}
 	
-	public RoomConverter(RoomDAO roomDao, Map<Long, Long> idMap) {
+	public RoomConverter(RoomDao roomDao, Map<Long, Long> idMap) {
 		this.roomDao = roomDao;
 		this.idMap = idMap;
 	}

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java Sun Jan 20 00:56:27 2013
@@ -29,8 +29,8 @@ import org.apache.openmeetings.data.basi
 import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
 import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
 import org.apache.openmeetings.data.conference.Invitationmanagement;
-import org.apache.openmeetings.data.conference.RoomDAO;
 import org.apache.openmeetings.data.conference.Roommanagement;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
@@ -63,7 +63,7 @@ public class AppointmentLogic {
 	@Autowired
 	private Roommanagement roommanagement;
 	@Autowired
-	private RoomDAO roomDao;
+	private RoomDao roomDao;
 	@Autowired
 	private Invitationmanagement invitationManagement;
 	@Autowired

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java Sun Jan 20 00:56:27 2013
@@ -37,6 +37,7 @@ import org.apache.openmeetings.data.basi
 import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
 import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
 import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.data.user.dao.UsersDao;
 import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
@@ -83,7 +84,7 @@ public class Invitationmanagement {
 	@Autowired
 	private ManageCryptStyle manageCryptStyle;
 	@Autowired
-	private RoomDAO roomDao;
+	private RoomDao roomDao;
 	@Autowired
 	private UsersDao usersDao;
 	@Autowired

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/PollManagement.java Sun Jan 20 00:56:27 2013
@@ -28,6 +28,7 @@ import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.data.basic.Fieldmanagment;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.persistence.beans.poll.PollType;
 import org.apache.openmeetings.persistence.beans.poll.RoomPoll;
@@ -50,7 +51,7 @@ public class PollManagement {
 	@Autowired
 	private Usermanagement usermanagement;
 	@Autowired
-	private RoomDAO roomDao;
+	private RoomDao roomDao;
 
 	public Long addPollType(Long labelId, Boolean isNumeric) {
 		log.debug("Adding poll type: " + labelId + ", " + isNumeric);

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java Sun Jan 20 00:56:27 2013
@@ -35,6 +35,7 @@ import javax.persistence.criteria.Root;
 import org.apache.openmeetings.data.basic.AuthLevelmanagement;
 import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
 import org.apache.openmeetings.data.beans.basic.SearchResult;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.data.conference.dao.RoomModeratorsDao;
 import org.apache.openmeetings.data.user.Organisationmanagement;
 import org.apache.openmeetings.data.user.dao.UsersDao;
@@ -77,7 +78,7 @@ public class Roommanagement {
     @Autowired
 	private ConfigurationDao configurationDaoImpl;
     @Autowired
-	private RoomDAO roomDao;
+	private RoomDao roomDao;
 
 	/**
 	 * add a new Record to the table roomtypes

Added: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/ClientDao.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/ClientDao.java?rev=1435774&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/ClientDao.java (added)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/ClientDao.java Sun Jan 20 00:56:27 2013
@@ -0,0 +1,53 @@
+/*
+ * 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.apache.openmeetings.data.conference.dao;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.apache.openmeetings.persistence.beans.rooms.Client;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Persistence of client objects to database is only available if so configured!
+ * 
+ * @author sebawagner
+ *
+ */
+@Transactional
+public class ClientDao {
+	
+	@PersistenceContext
+	private EntityManager em;
+
+	public Client add(Client entity) {
+		em.persist(entity);
+		return entity;
+	}
+	
+	public Client update(Client entity) {
+		em.merge(entity);
+		return entity;
+	}
+	
+	public void delete(Client entity) {
+		em.remove(entity);
+	}
+	
+}

Added: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java?rev=1435774&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java (added)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java Sun Jan 20 00:56:27 2013
@@ -0,0 +1,104 @@
+/*
+ * 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.apache.openmeetings.data.conference.dao;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+
+import org.apache.openmeetings.data.IDataProviderDao;
+import org.apache.openmeetings.persistence.beans.rooms.Rooms;
+import org.apache.openmeetings.utils.DaoHelper;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+public class RoomDao implements IDataProviderDao<Rooms> {
+	
+	public final static String[] searchFields = {"name"};
+	
+	@PersistenceContext
+	private EntityManager em;
+
+	public Rooms get(long id) {
+		TypedQuery<Rooms> q = em.createNamedQuery("getRoomById", Rooms.class);
+		q.setParameter("id", id);
+		List<Rooms> l = q.getResultList();
+		return l.isEmpty() ? null : l.get(0);
+	}
+
+	public List<Rooms> get(int start, int count) {
+		TypedQuery<Rooms> q = em.createNamedQuery("getNondeletedRooms", Rooms.class);
+		q.setFirstResult(start);
+		q.setMaxResults(count);
+		return q.getResultList();
+	}
+
+	public List<Rooms> get(String search, int start, int count, String sort) {
+		TypedQuery<Rooms> q = em.createQuery(DaoHelper.getSearchQuery("Rooms", "r", search, true, false, sort, searchFields), Rooms.class);
+		q.setFirstResult(start);
+		q.setMaxResults(count);
+		return q.getResultList();
+	}
+
+	public long count() {
+		TypedQuery<Long> q = em.createNamedQuery("countRooms", Long.class);
+		return q.getSingleResult();
+	}
+
+	public long count(String search) {
+		TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery("Rooms", "r", search, true, true, null, searchFields), Long.class);
+		return q.getSingleResult();
+	}
+
+	public List<Rooms> getPublicRooms() {
+		return em.createNamedQuery("getPublicRoomsOrdered", Rooms.class)
+				.getResultList();
+	}
+	
+	public List<Rooms> getOrganisationRooms(long orgId) {
+		TypedQuery<Rooms> q = em.createQuery(
+				"SELECT DISTINCT c.room FROM Rooms_Organisation c LEFT JOIN FETCH c.room "
+				+ "WHERE c.organisation.organisation_id = :orgId "
+				+ "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", Rooms.class);
+		q.setParameter("orgId", orgId);
+		return q.getResultList();
+	}
+	
+	public Rooms update(Rooms entity, long userId) {
+		if (entity.getRooms_id() == null) {
+			entity.setStarttime(new Date());
+			em.persist(entity);
+		} else {
+			entity.setUpdatetime(new Date());
+			entity = em.merge(entity);
+		}
+		return entity;
+	}
+
+	public void delete(Rooms entity, long userId) {
+		entity.setDeleted(true);
+		update(entity, userId);
+	}
+
+}

Added: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java?rev=1435774&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java (added)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Client.java Sun Jan 20 00:56:27 2013
@@ -0,0 +1,853 @@
+/*
+ * 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.apache.openmeetings.persistence.beans.rooms;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.apache.openmeetings.session.IClientSession;
+import org.apache.openmeetings.utils.math.CalendarPatterns;
+
+/**
+ * @see IClientSession
+ * @author sebawagner
+ *
+ */
+@Entity
+@Table(name = "client")
+public class Client implements Serializable, IClientSession {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5980636447877077730L;
+	
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name="id")
+	private long id;
+	
+	/**
+	 * @see IClientSession#getUsername()
+	 */
+	@Column(name = "username")
+	private String username = "";
+	
+	/**
+	 * @see IClientSession#getStreamid()
+	 */
+	@Column(name = "streamid")
+	private String streamid = "";
+	
+	/**
+	 * @see IClientSession#getScope()
+	 */
+	@Column(name = "scope")
+	private String scope = "";
+	
+	/**
+	 * @see IClientSession#getVWidth()
+	 */
+	@Column(name = "vwidth")
+	private int vWidth = 0;
+	
+	/**
+	 * @see IClientSession#getVHeight()
+	 */
+	@Column(name = "vheight")
+	private int vHeight = 0;
+	
+	/**
+	 * @see IClientSession#getVX()
+	 */
+	@Column(name = "vx")
+	private int vX = 0;
+	
+	/**
+	 * @see IClientSession#getVY()
+	 */
+	@Column(name = "vy")
+	private int vY = 0;
+	
+	/**
+	 * @see IClientSession#getStreamPublishName()
+	 */
+	@Column(name = "stream_publish_name")
+	private String streamPublishName = "";
+	
+	/**
+	 * @see IClientSession#getPublicSID()
+	 */
+	@Column(name = "public_sid")
+	private String publicSID = "";
+	
+	/**
+	 * @see IClientSession#getIsMod()
+	 */
+	@Column(name = "is_mod")
+	private Boolean isMod = false;
+	
+	/**
+	 * @see IClientSession#getIsSuperModerator()
+	 */
+	@Column(name = "is_supermoderator")
+	private Boolean isSuperModerator = false;
+	
+	/**
+	 * @see IClientSession#getCanDraw()
+	 */
+	@Column(name = "can_draw")
+	private Boolean canDraw = false;
+	
+	/**
+	 * @see IClientSession#getCanShare()
+	 */
+	@Column(name = "can_share")
+	private Boolean canShare = false;
+	
+	/**
+	 * @see IClientSession#getCanRemote()
+	 */
+	@Column(name = "can_remote")
+	private Boolean canRemote = false;
+	
+	/**
+	 * @see IClientSession#getCanGiveAudio()
+	 */
+	@Column(name = "can_giveaudio")
+    private Boolean canGiveAudio = false;
+	
+    /**
+	 * @see IClientSession#getConnectedSince()
+	 */
+	@Column(name = "connected_since")
+	private Date connectedSince;
+	
+	/**
+	 * @see IClientSession#getFormatedDate()
+	 */
+	@Column(name = "formated_date")
+	private String formatedDate;
+	
+	/**
+	 * @see IClientSession#getIsScreenClient()
+	 */
+	@Column(name = "is_screenclient")
+	private Boolean isScreenClient = false;
+	
+	/**
+	 * @see IClientSession#getIsAVClient()
+	 */
+	@Column(name = "is_avclient")
+	private boolean isAVClient = false;
+	
+	/**
+	 * @see IClientSession#getUsercolor()
+	 */
+	@Column(name = "usercolor")
+	private String usercolor;
+	
+	/**
+	 * @see IClientSession#getUserpos()
+	 */
+	@Column(name = "userpos")
+	private Integer userpos;
+	
+	/**
+	 * @see IClientSession#getUserip()
+	 */
+	@Column(name = "userip")
+	private String userip;
+	
+	/**
+	 * @see IClientSession#getUserport()
+	 */
+	@Column(name = "userport")
+	private int userport;
+	
+	/**
+	 * @see IClientSession#getRoom_id()
+	 */
+	@Column(name = "room_id")
+	private Long room_id;
+	
+	/**
+	 * @see IClientSession#getRoomEnter()
+	 */
+	@Column(name = "room_enter")
+	private Date roomEnter = null;
+	
+	/**
+	 * @see IClientSession#getBroadCastID()
+	 */
+	@Column(name = "broadcast_id")
+	private long broadCastID = -2;
+	
+	/**
+	 * @see IClientSession#getUser_id()
+	 */
+	@Column(name = "user_id")
+	private Long user_id = null;
+	
+	/**
+	 * @see IClientSession#getFirstname()
+	 */
+	@Column(name = "firstname")
+	private String firstname = "";
+	
+	/**
+	 * @see IClientSession#getLastname()
+	 */
+	@Column(name = "lastname")
+	private String lastname = "";
+	
+	/**
+	 * @see IClientSession#getMail()
+	 */
+	@Column(name = "mail")
+	private String mail;
+	
+	/**
+	 * @see IClientSession#getLastLogin()
+	 */
+	@Column(name = "last_login")
+	private String lastLogin;
+	
+	/**
+	 * @see IClientSession#getOfficial_code()
+	 */
+	@Column(name = "official_code")
+	private String official_code;
+	
+	/**
+	 * @see IClientSession#getPicture_uri()
+	 */
+	@Column(name = "picture_uri")
+	private String picture_uri;
+	
+	/**
+	 * @see IClientSession#getLanguage()
+	 */
+	@Column(name = "language")
+	private String language = "";
+	
+	/**
+	 * @see IClientSession#getAvsettings()
+	 */
+	@Column(name = "avsettings")
+	private String avsettings = "";
+	
+	/**
+	 * @see IClientSession#getSwfurl()
+	 */
+	// FIXME: Move to {@link ClientSession}
+	@Column(name = "swfurl")
+	private String swfurl;
+	
+	/**
+	 * @see IClientSession#getIsRecording()
+	 */
+	@Column(name = "is_recording")
+	private Boolean isRecording = false;
+	
+	/**
+	 * @see IClientSession#getRoomRecordingName()
+	 */
+	@Column(name = "room_recording_name")
+	private String roomRecordingName;
+	
+	/**
+	 * @see IClientSession#getFlvRecordingId()
+	 */
+	@Column(name = "flvrecording_id")
+	private Long flvRecordingId;
+	
+	/**
+	 * @see IClientSession#getFlvRecordingMetaDataId()
+	 */
+	@Column(name = "flvrecordingmetadata_id")
+	private Long flvRecordingMetaDataId;
+	
+	/**
+	 * @see IClientSession#getOrganization_id()
+	 */
+	@Column(name = "organization_id")
+	private Long organization_id;
+	
+	/**
+	 * @see IClientSession#isStartRecording()
+	 */
+	@Column(name = "start_recording")
+	private boolean startRecording = false;
+	
+	/**
+	 * @see IClientSession#isStartStreaming()
+	 */
+	@Column(name = "start_streaming")
+	private boolean startStreaming = false;
+	
+	/**
+	 * @see IClientSession#isScreenPublishStarted()
+	 */
+	@Column(name = "screen_publish_started")
+	private boolean screenPublishStarted = false;
+	
+	/**
+	 * @see IClientSession#isStreamPublishStarted()
+	 */
+	@Column(name = "stream_publish_started")
+	private boolean streamPublishStarted = false;
+	
+	/**
+	 * @see IClientSession#getIsBroadcasting()
+	 */
+	@Column(name = "is_broadcasting")
+	private Boolean isBroadcasting = false;
+	
+	/**
+	 * @see IClientSession#getExternalUserId()
+	 */
+	@Column(name = "external_user_id")
+	private String externalUserId;
+	
+	/**
+	 * @see IClientSession#getExternalUserType()
+	 */
+	@Column(name = "external_user_type")
+    private String externalUserType;
+	
+    /**
+	 * @see IClientSession#getInterviewPodId()
+	 */
+	@Column(name = "interview_pod_id")
+    private Integer interviewPodId = null;
+	
+    /**
+	 * @see IClientSession#getAllowRecording()
+	 */
+	@Column(name = "allow_recording")
+    private Boolean allowRecording = true;
+	
+    /**
+	 * @see IClientSession#getZombieCheckFlag()
+	 */
+	@Column(name = "zombie_check_flag")
+	private Boolean zombieCheckFlag = false;
+	
+	/**
+	 * @see IClientSession#getMicMuted()
+	 */
+	@Column(name = "mic_muted")
+    private Boolean micMuted = false;
+	
+    /**
+	 * @see IClientSession#isSipTransport()
+	 */
+	@Column(name = "sip_transport")
+    private boolean sipTransport = false;
+    
+    public Client() {
+    	
+    }
+    
+	public Client(String streamid, String publicSID, Long room_id,
+			Long user_id, 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.firstname = firstname;
+		this.lastname = lastname;
+		this.isAVClient = isAVClient;
+		this.username = username;
+		this.connectedSince = CalendarPatterns.parseDateWithHour(connectedSince);
+		this.scope = scope;
+	}
+
+	public void setUserObject(Long user_id, String username, String firstname, String lastname) {
+		this.user_id = user_id;
+		this.username = username;
+		this.firstname = firstname;
+		this.lastname = lastname;
+	}
+
+	public void setUserObject(String username, String firstname, String lastname) {
+		this.username = username;
+		this.firstname = firstname;
+		this.lastname = lastname;
+	}
+	
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public Date getConnectedSince() {
+		return connectedSince;
+	}
+
+	public void setConnectedSince(Date connectedSince) {
+		this.connectedSince = connectedSince;
+	}
+
+	public Boolean getIsMod() {
+		return isMod;
+	}
+
+	public void setIsMod(Boolean isMod) {
+		this.isMod = isMod;
+	}
+	
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getStreamid() {
+		return streamid;
+	}
+
+	public void setStreamid(String streamid) {
+		this.streamid = streamid;
+	}
+
+	public String getScope() {
+		return scope;
+	}
+
+	public void setScope(String scope) {
+		this.scope = scope;
+	}
+
+	public String getFormatedDate() {
+		return formatedDate;
+	}
+
+	public void setFormatedDate(String formatedDate) {
+		this.formatedDate = formatedDate;
+	}
+
+	public String getUsercolor() {
+		return usercolor;
+	}
+
+	public void setUsercolor(String usercolor) {
+		this.usercolor = usercolor;
+	}
+
+	public Integer getUserpos() {
+		return userpos;
+	}
+
+	public void setUserpos(Integer userpos) {
+		this.userpos = userpos;
+	}
+
+	public String getUserip() {
+		return userip;
+	}
+
+	public void setUserip(String userip) {
+		this.userip = userip;
+	}
+
+	public String getSwfurl() {
+		return swfurl;
+	}
+
+	public void setSwfurl(String swfurl) {
+		this.swfurl = swfurl;
+	}
+
+	public int getUserport() {
+		return userport;
+	}
+
+	public void setUserport(int userport) {
+		this.userport = userport;
+	}
+
+	public String getFirstname() {
+		return firstname;
+	}
+
+	public void setFirstname(String firstname) {
+		this.firstname = firstname;
+	}
+
+	public String getLanguage() {
+		return language;
+	}
+
+	public void setLanguage(String language) {
+		this.language = language;
+	}
+
+	public String getLastLogin() {
+		return lastLogin;
+	}
+
+	public void setLastLogin(String lastLogin) {
+		this.lastLogin = lastLogin;
+	}
+
+	public String getLastname() {
+		return lastname;
+	}
+
+	public void setLastname(String lastname) {
+		this.lastname = lastname;
+	}
+
+	public String getMail() {
+		return mail;
+	}
+
+	public void setMail(String mail) {
+		this.mail = mail;
+	}
+
+	public String getOfficial_code() {
+		return official_code;
+	}
+
+	public void setOfficial_code(String official_code) {
+		this.official_code = official_code;
+	}
+
+	public String getPicture_uri() {
+		return picture_uri;
+	}
+
+	public void setPicture_uri(String picture_uri) {
+		this.picture_uri = picture_uri;
+	}
+
+	public Long getUser_id() {
+		return user_id;
+	}
+
+	public void setUser_id(Long user_id) {
+		this.user_id = user_id;
+	}
+
+	public Long getRoom_id() {
+		return room_id;
+	}
+
+	public void setRoom_id(Long room_id) {
+		this.room_id = room_id;
+	}
+
+	public Date getRoomEnter() {
+		return roomEnter;
+	}
+
+	public void setRoomEnter(Date roomEnter) {
+		this.roomEnter = roomEnter;
+	}
+
+	public Boolean getIsRecording() {
+		return isRecording;
+	}
+
+	public void setIsRecording(Boolean isRecording) {
+		this.isRecording = isRecording;
+	}
+
+	public String getRoomRecordingName() {
+		return roomRecordingName;
+	}
+
+	public void setRoomRecordingName(String roomRecordingName) {
+		this.roomRecordingName = roomRecordingName;
+	}
+
+	public String getAvsettings() {
+		return avsettings;
+	}
+
+	public void setAvsettings(String avsettings) {
+		this.avsettings = avsettings;
+	}
+
+	public long getBroadCastID() {
+		return broadCastID;
+	}
+
+	public void setBroadCastID(long broadCastID) {
+		this.broadCastID = broadCastID;
+	}
+
+	public String getPublicSID() {
+		return publicSID;
+	}
+	
+	public void setPublicSID(String publicSID) {
+		this.publicSID = publicSID;
+	}
+
+	public Boolean getZombieCheckFlag() {
+		return zombieCheckFlag;
+	}
+	
+	public void setZombieCheckFlag(Boolean zombieCheckFlag) {
+		this.zombieCheckFlag = zombieCheckFlag;
+	}
+
+	public Boolean getMicMuted() {
+		return micMuted;
+	}
+
+	public void setMicMuted(Boolean micMuted) {
+		this.micMuted = micMuted;
+	}
+
+	public Boolean getCanDraw() {
+		return canDraw;
+	}
+
+	public void setCanDraw(Boolean canDraw) {
+		this.canDraw = canDraw;
+	}
+
+	public Boolean getIsBroadcasting() {
+		return isBroadcasting;
+	}
+
+	public void setIsBroadcasting(Boolean isBroadcasting) {
+		this.isBroadcasting = isBroadcasting;
+	}
+
+	public Boolean getCanShare() {
+		return canShare;
+	}
+
+	public void setCanShare(Boolean canShare) {
+		this.canShare = canShare;
+	}
+
+	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 Boolean getIsSuperModerator() {
+		return isSuperModerator;
+	}
+
+	public void setIsSuperModerator(Boolean isSuperModerator) {
+		this.isSuperModerator = isSuperModerator;
+	}
+
+	public Boolean getIsScreenClient() {
+		return isScreenClient;
+	}
+
+	public void setIsScreenClient(Boolean isScreenClient) {
+		this.isScreenClient = isScreenClient;
+	}
+
+	public int getVWidth() {
+		return vWidth;
+	}
+
+	public void setVWidth(int width) {
+		vWidth = width;
+	}
+
+	public int getVHeight() {
+		return vHeight;
+	}
+
+	public void setVHeight(int height) {
+		vHeight = height;
+	}
+
+	public int getVX() {
+		return vX;
+	}
+
+	public void setVX(int vx) {
+		vX = vx;
+	}
+
+	public int getVY() {
+		return vY;
+	}
+
+	public void setVY(int vy) {
+		vY = vy;
+	}
+
+	public String getStreamPublishName() {
+		return streamPublishName;
+	}
+
+	public void setStreamPublishName(String streamPublishName) {
+		this.streamPublishName = streamPublishName;
+	}
+
+	public Long getFlvRecordingId() {
+		return flvRecordingId;
+	}
+
+	public void setFlvRecordingId(Long flvRecordingId) {
+		this.flvRecordingId = flvRecordingId;
+	}
+
+	public Long getFlvRecordingMetaDataId() {
+		return flvRecordingMetaDataId;
+	}
+
+	public void setFlvRecordingMetaDataId(Long flvRecordingMetaDataId) {
+		this.flvRecordingMetaDataId = flvRecordingMetaDataId;
+	}
+
+	public boolean isScreenPublishStarted() {
+		return screenPublishStarted;
+	}
+
+	public void setScreenPublishStarted(boolean screenPublishStarted) {
+		this.screenPublishStarted = screenPublishStarted;
+	}
+
+	public Long getOrganization_id() {
+		return organization_id;
+	}
+
+	public void setOrganization_id(Long organization_id) {
+		this.organization_id = organization_id;
+	}
+
+	public boolean isStartRecording() {
+		return startRecording;
+	}
+
+	public void setStartRecording(boolean startRecording) {
+		this.startRecording = startRecording;
+	}
+
+	public boolean isStartStreaming() {
+		return startStreaming;
+	}
+
+	public void setStartStreaming(boolean startStreaming) {
+		this.startStreaming = startStreaming;
+	}
+
+	public Integer getInterviewPodId() {
+		return interviewPodId;
+	}
+
+	public void setInterviewPodId(Integer interviewPodId) {
+		this.interviewPodId = interviewPodId;
+	}
+
+	public Boolean getCanRemote() {
+		return canRemote;
+	}
+
+	public void setCanRemote(Boolean canRemote) {
+		this.canRemote = canRemote;
+	}
+
+    public Boolean getCanGiveAudio() {
+		return canGiveAudio;
+	}
+
+	public void setCanGiveAudio(Boolean canGiveAudio) {
+		this.canGiveAudio = canGiveAudio;
+	}
+
+	public Boolean getAllowRecording() {
+		return allowRecording;
+	}
+
+	public void setAllowRecording(Boolean allowRecording) {
+		this.allowRecording = allowRecording;
+	}
+
+	public boolean getIsAVClient() {
+		return isAVClient;
+	}
+
+	public void setIsAVClient(boolean isAVClient) {
+		this.isAVClient = isAVClient;
+	}
+
+	public boolean isStreamPublishStarted() {
+		return streamPublishStarted;
+	}
+
+	public void setStreamPublishStarted(boolean streamPublishStarted) {
+		this.streamPublishStarted = streamPublishStarted;
+	}
+
+	public boolean isSipTransport() {
+		return sipTransport;
+	}
+
+	public void setSipTransport(boolean sipTransport) {
+		this.sipTransport = sipTransport;
+	}
+	
+	@Override
+	public String toString() {
+		return super.toString() //
+				+ " StreamId: " + this.getStreamid() //
+				+ " PublicSID: " + this.getPublicSID() //
+				+ " UserId: " + this.getUser_id() //
+				+ " isScreenClient: " + this.getIsScreenClient() //
+				+ " flvRecordingId: " + this.getFlvRecordingId() //
+				+ " screenPublishStarted: " + this.isScreenPublishStarted() //
+				+ " flvRecordingMetaDataId: " + this.getFlvRecordingMetaDataId() //
+				+ " isRecording: " + this.getIsRecording() //
+				+ " isAVClient: " + this.getIsAVClient() //
+				+ " broadCastID: " + this.getBroadCastID() //
+				+ " avsettings: " + this.getAvsettings() //
+				;
+	}
+}

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java Sun Jan 20 00:56:27 2013
@@ -29,8 +29,8 @@ import org.apache.openmeetings.data.cale
 import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
 import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
 import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
-import org.apache.openmeetings.data.conference.RoomDAO;
 import org.apache.openmeetings.data.conference.Roommanagement;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
 import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
@@ -59,7 +59,7 @@ public class CalendarService {
 	@Autowired
 	private Roommanagement roommanagement;
 	@Autowired
-	private RoomDAO roomDao;
+	private RoomDao roomDao;
 	@Autowired
 	private AuthLevelmanagement authLevelManagement;
 	@Autowired

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java Sun Jan 20 00:56:27 2013
@@ -38,8 +38,8 @@ import org.apache.openmeetings.data.basi
 import org.apache.openmeetings.data.basic.dao.ServerDao;
 import org.apache.openmeetings.data.beans.basic.SearchResult;
 import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
-import org.apache.openmeetings.data.conference.RoomDAO;
 import org.apache.openmeetings.data.conference.Roommanagement;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.data.conference.dao.RoomModeratorsDao;
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.persistence.beans.basic.Server;
@@ -80,7 +80,7 @@ public class ConferenceService {
 	@Autowired
 	private Roommanagement roommanagement;
 	@Autowired
-	private RoomDAO roomDao;
+	private RoomDao roomDao;
 	@Autowired
 	private RoomModeratorsDao roomModeratorsDao;
 	@Autowired

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java Sun Jan 20 00:56:27 2013
@@ -29,7 +29,7 @@ import java.util.Set;
 import org.apache.openmeetings.OpenmeetingsVariables;
 import org.apache.openmeetings.data.basic.AuthLevelmanagement;
 import org.apache.openmeetings.data.basic.Sessionmanagement;
-import org.apache.openmeetings.data.conference.RoomDAO;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
 import org.apache.openmeetings.data.flvrecord.FlvRecordingLogDao;
 import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
@@ -89,7 +89,7 @@ public class FLVRecorderService implemen
 	@Autowired
 	private UsersDao usersDaoImpl;
 	@Autowired
-	private RoomDAO roomDao;
+	private RoomDao roomDao;
 	@Autowired
 	private FlvRecorderConverterTask flvRecorderConverterTask;
 	@Autowired

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java Sun Jan 20 00:56:27 2013
@@ -39,8 +39,8 @@ import org.apache.openmeetings.data.bean
 import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
 import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
 import org.apache.openmeetings.data.conference.Invitationmanagement;
-import org.apache.openmeetings.data.conference.RoomDAO;
 import org.apache.openmeetings.data.conference.Roommanagement;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.data.user.Organisationmanagement;
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.data.user.dao.PrivateMessageFolderDao;
@@ -110,7 +110,7 @@ public class UserService {
 	@Autowired
 	private Roommanagement roommanagement;
 	@Autowired
-	private RoomDAO roomDao;
+	private RoomDao roomDao;
 	@Autowired
 	private MeetingMemberDao meetingMemberDao;
 	@Autowired

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Sun Jan 20 00:56:27 2013
@@ -38,8 +38,8 @@ import org.apache.openmeetings.data.basi
 import org.apache.openmeetings.data.basic.dao.ServerDao;
 import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
 import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
-import org.apache.openmeetings.data.conference.RoomDAO;
 import org.apache.openmeetings.data.conference.Roommanagement;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.data.logs.ConferenceLogDao;
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.data.user.dao.UsersDao;
@@ -103,7 +103,7 @@ public class ScopeApplicationAdapter ext
 	@Autowired
 	private UsersDao usersDao;
 	@Autowired
-	private RoomDAO roomDao;
+	private RoomDao roomDao;
 	@Autowired
 	private MeetingMemberDao meetingMemberDao;
 	@Autowired

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java Sun Jan 20 00:56:27 2013
@@ -65,8 +65,8 @@ import org.apache.openmeetings.data.cale
 import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
 import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
 import org.apache.openmeetings.data.conference.PollManagement;
-import org.apache.openmeetings.data.conference.RoomDAO;
 import org.apache.openmeetings.data.conference.Roommanagement;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
 import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
 import org.apache.openmeetings.data.user.Organisationmanagement;
@@ -143,7 +143,7 @@ public class BackupImportController exte
 	@Autowired
 	private Roommanagement roommanagement;
 	@Autowired
-	private RoomDAO roomDao;
+	private RoomDao roomDao;
 	@Autowired
 	private AppointmentCategoryDao appointmentCategoryDaoImpl;
 	@Autowired

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/Client.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/Client.java?rev=1435774&r1=1435773&r2=1435774&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/Client.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/Client.java Sun Jan 20 00:56:27 2013
@@ -18,167 +18,232 @@
  */
 package org.apache.openmeetings.session;
 
-/**
- * Session object to store client values
- * 
- * @author sebawagner
- */
 import java.io.Serializable;
 import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
 
 import org.apache.openmeetings.utils.math.CalendarPatterns;
 
+/**
+ * @see IClientSession
+ * @author sebawagner
+ *
+ */
 public class Client implements Serializable, IClientSession {
 	
 	private static final long serialVersionUID = 1831858089607111565L;
 	
 	/**
-	 * login name
+	 * @see IClientSession#getUsername()
 	 */
 	private String username = "";
-	
 	/**
-	 * a unique id
+	 * @see IClientSession#getStreamid()
 	 */
 	private String streamid = "";
+	/**
+	 * @see IClientSession#getScope()
+	 */
 	private String scope = "";
+	/**
+	 * @see IClientSession#getVWidth()
+	 */
 	private int vWidth = 0;
+	/**
+	 * @see IClientSession#getVHeight()
+	 */
 	private int vHeight = 0;
+	/**
+	 * @see IClientSession#getVX()
+	 */
 	private int vX = 0;
+	/**
+	 * @see IClientSession#getVY()
+	 */
 	private int vY = 0;
 	/**
-	 * StreamPublishName is used in the screen sharing client to publish the stream
+	 * @see IClientSession#getStreamPublishName()
 	 */
 	private String streamPublishName = "";
-	
 	/**
-	 * an unique PUBLIC id,
-	 * this ID is needed as people can reconnect and will get a new 
-	 * streamid, but we need to know if this is still the same user
-	 * this Public ID can be changing also if the user does change the 
-	 * security token (private SID)
-	 * the private  Session ID is not written to the RoomClient-Class
-	 * as every instance of the RoomClient is send to all connected users
-	 * 
-	 * publicSID can be empty if a audio/video user is connected but 
-	 * didn't choose any device settings or the connection really just
-	 * has been initialized
+	 * @see IClientSession#getPublicSID()
 	 */
 	private String publicSID = "";
-	
 	/**
-	 * true indicates that this user is Moderating
-	 * in Events rooms (only 1 Video) this means that this user is currently 
-	 * sharing its video/audio
-	 * 
+	 * @see IClientSession#getIsMod()
 	 */
 	private Boolean isMod = false;
+	/**
+	 * @see IClientSession#getIsSuperModerator()
+	 */
 	private Boolean isSuperModerator = false;
+	/**
+	 * @see IClientSession#getCanDraw()
+	 */
 	private Boolean canDraw = false;
+	/**
+	 * @see IClientSession#getCanShare()
+	 */
 	private Boolean canShare = false;
+	/**
+	 * @see IClientSession#getCanRemote()
+	 */
 	private Boolean canRemote = false;
+	/**
+	 * @see IClientSession#getCanGiveAudio()
+	 */
     private Boolean canGiveAudio = false;
+    /**
+	 * @see IClientSession#getConnectedSince()
+	 */
 	private Date connectedSince;
+	/**
+	 * @see IClientSession#getFormatedDate()
+	 */
 	private String formatedDate;
+	/**
+	 * @see IClientSession#getIsScreenClient()
+	 */
 	private Boolean isScreenClient = false;
 	/**
-	 * If true this client is only used to stream audio/video events, 
-	 * he should not receive any sync events / push messages <br/>
-	 * <br/>
-	 * true the user is an audio/video connection<br/>
-	 * false the user is a regular user with full session object<br/>
-	 * 
+	 * @see IClientSession#getIsAVClient()
 	 */
 	private boolean isAVClient = false;
-	
 	/**
-	 * the color of the user, only needed in 4x4 Conference, in these rooms each user has its own
-	 * color 
+	 * @see IClientSession#getUsercolor()
 	 */
 	private String usercolor;
-	/*
-	 * no longer needed since broadCastId is now the new unique id
+	/**
+	 * @see IClientSession#getUserpos()
 	 */
-	@Deprecated
 	private Integer userpos;
 	/**
-	 * client IP
+	 * @see IClientSession#getUserip()
 	 */
-	// FIXME: Move to {@link ClientSession}
 	private String userip;
 	/**
-	 * client Port
+	 * @see IClientSession#getUserport()
 	 */
 	private int userport;
 	/**
-	 * current room id while conferencing
+	 * @see IClientSession#getRoom_id()
 	 */
 	private Long room_id;
+	/**
+	 * @see IClientSession#getRoomEnter()
+	 */
 	private Date roomEnter = null;
-	
 	/**
-	 * this is the id this user is currently using to broadcast a stream
-	 * default value is -2 cause otherwise this can due to disconnect
+	 * @see IClientSession#getBroadCastID()
 	 */
 	private long broadCastID = -2;
-	
 	/**
-	 * some vars _not_ directly connected to the user-record from the database
-	 * cause a user is not _forced_ to login he can also be an invited user, so user_id
-	 * might be null or 0 even if somebody is already in a conference room
-	 * 
+	 * @see IClientSession#getUser_id()
 	 */
 	private Long user_id = null;
+	/**
+	 * @see IClientSession#getFirstname()
+	 */
 	private String firstname = "";
+	/**
+	 * @see IClientSession#getLastname()
+	 */
 	private String lastname = "";
+	/**
+	 * @see IClientSession#getMail()
+	 */
 	private String mail;
+	/**
+	 * @see IClientSession#getLastLogin()
+	 */
 	private String lastLogin;
+	/**
+	 * @see IClientSession#getOfficial_code()
+	 */
 	private String official_code;
+	/**
+	 * @see IClientSession#getPicture_uri()
+	 */
 	private String picture_uri;
+	/**
+	 * @see IClientSession#getLanguage()
+	 */
 	private String language = "";
-	
 	/**
-	 * avsettings can be:
-	 * av - video and audio
-	 * a - audio only
-	 * v - video only
-	 * n - no av only static Image
+	 * @see IClientSession#getAvsettings()
 	 */
 	private String avsettings = "";
+	/**
+	 * @see IClientSession#getSwfurl()
+	 */
 	// FIXME: Move to {@link ClientSession}
 	private String swfurl;
+	/**
+	 * @see IClientSession#getIsRecording()
+	 */
 	private Boolean isRecording = false;
+	/**
+	 * @see IClientSession#getRoomRecordingName()
+	 */
 	private String roomRecordingName;
+	/**
+	 * @see IClientSession#getFlvRecordingId()
+	 */
 	private Long flvRecordingId;
+	/**
+	 * @see IClientSession#getFlvRecordingMetaDataId()
+	 */
 	private Long flvRecordingMetaDataId;
+	/**
+	 * @see IClientSession#getOrganization_id()
+	 */
 	private Long organization_id;
+	/**
+	 * @see IClientSession#isStartRecording()
+	 */
 	private boolean startRecording = false;
+	/**
+	 * @see IClientSession#isStartStreaming()
+	 */
 	private boolean startStreaming = false;
+	/**
+	 * @see IClientSession#isScreenPublishStarted()
+	 */
 	private boolean screenPublishStarted = false;
+	/**
+	 * @see IClientSession#isStreamPublishStarted()
+	 */
 	private boolean streamPublishStarted = false;
-	
 	/**
-	 * Indicates if this User is broadcasting his stream at all
-	 * Only interesting in the Event Modus
+	 * @see IClientSession#getIsBroadcasting()
 	 */
 	private Boolean isBroadcasting = false;
-	
-	 //Vars to simulate external Users
-    private String externalUserId;
+	/**
+	 * @see IClientSession#getExternalUserId()
+	 */
+	private String externalUserId;
+	/**
+	 * @see IClientSession#getExternalUserType()
+	 */
     private String externalUserType;
-    private List<String> sharerSIDs = new LinkedList<String>();
-    
-    //Session values for handling the Interviwe Room Type
+    /**
+	 * @see IClientSession#getInterviewPodId()
+	 */
     private Integer interviewPodId = null;
+    /**
+	 * @see IClientSession#getAllowRecording()
+	 */
     private Boolean allowRecording = true;
-	
-	/*
-	 * Zombie Flag
+    /**
+	 * @see IClientSession#getZombieCheckFlag()
 	 */
 	private Boolean zombieCheckFlag = false;
+	/**
+	 * @see IClientSession#getMicMuted()
+	 */
     private Boolean micMuted = false;
+    /**
+	 * @see IClientSession#isSipTransport()
+	 */
     private boolean sipTransport = false;
     
     public Client() {
@@ -201,726 +266,445 @@ public class Client implements Serializa
 		this.scope = scope;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setUserObject(java.lang.Long, java.lang.String, java.lang.String, java.lang.String)
-	 */
 	public void setUserObject(Long user_id, String username, String firstname, String lastname) {
 		this.user_id = user_id;
 		this.username = username;
 		this.firstname = firstname;
 		this.lastname = lastname;
 	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setUserObject(java.lang.String, java.lang.String, java.lang.String)
-	 */
+
 	public void setUserObject(String username, String firstname, String lastname) {
 		this.username = username;
 		this.firstname = firstname;
 		this.lastname = lastname;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getConnectedSince()
-	 */
 	public Date getConnectedSince() {
 		return connectedSince;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setConnectedSince(java.util.Date)
-	 */
+
 	public void setConnectedSince(Date connectedSince) {
 		this.connectedSince = connectedSince;
 	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getIsMod()
-	 */
+
 	public Boolean getIsMod() {
 		return isMod;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setIsMod(java.lang.Boolean)
-	 */
+
 	public void setIsMod(Boolean isMod) {
 		this.isMod = isMod;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getUsername()
-	 */
 	public String getUsername() {
 		return username;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setUsername(java.lang.String)
-	 */
+
 	public void setUsername(String username) {
 		this.username = username;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getStreamid()
-	 */
 	public String getStreamid() {
 		return streamid;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setStreamid(java.lang.String)
-	 */
+
 	public void setStreamid(String streamid) {
 		this.streamid = streamid;
 	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getScope()
-	 */
+
 	public String getScope() {
 		return scope;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setScope(java.lang.String)
-	 */
+
 	public void setScope(String scope) {
 		this.scope = scope;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getFormatedDate()
-	 */
 	public String getFormatedDate() {
 		return formatedDate;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setFormatedDate(java.lang.String)
-	 */
+
 	public void setFormatedDate(String formatedDate) {
 		this.formatedDate = formatedDate;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getUsercolor()
-	 */
 	public String getUsercolor() {
 		return usercolor;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setUsercolor(java.lang.String)
-	 */
+
 	public void setUsercolor(String usercolor) {
 		this.usercolor = usercolor;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getUserpos()
-	 */
 	public Integer getUserpos() {
 		return userpos;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setUserpos(java.lang.Integer)
-	 */
+
 	public void setUserpos(Integer userpos) {
 		this.userpos = userpos;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getUserip()
-	 */
 	public String getUserip() {
 		return userip;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setUserip(java.lang.String)
-	 */
+
 	public void setUserip(String userip) {
 		this.userip = userip;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getSwfurl()
-	 */
 	public String getSwfurl() {
 		return swfurl;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setSwfurl(java.lang.String)
-	 */
+
 	public void setSwfurl(String swfurl) {
 		this.swfurl = swfurl;
 	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getUserport()
-	 */
+
 	public int getUserport() {
 		return userport;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setUserport(int)
-	 */
+
 	public void setUserport(int userport) {
 		this.userport = userport;
 	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getFirstname()
-	 */
+
 	public String getFirstname() {
 		return firstname;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setFirstname(java.lang.String)
-	 */
+
 	public void setFirstname(String firstname) {
 		this.firstname = firstname;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getLanguage()
-	 */
 	public String getLanguage() {
 		return language;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setLanguage(java.lang.String)
-	 */
+
 	public void setLanguage(String language) {
 		this.language = language;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getLastLogin()
-	 */
 	public String getLastLogin() {
 		return lastLogin;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setLastLogin(java.lang.String)
-	 */
+
 	public void setLastLogin(String lastLogin) {
 		this.lastLogin = lastLogin;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getLastname()
-	 */
 	public String getLastname() {
 		return lastname;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setLastname(java.lang.String)
-	 */
+
 	public void setLastname(String lastname) {
 		this.lastname = lastname;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getMail()
-	 */
 	public String getMail() {
 		return mail;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setMail(java.lang.String)
-	 */
+
 	public void setMail(String mail) {
 		this.mail = mail;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getOfficial_code()
-	 */
 	public String getOfficial_code() {
 		return official_code;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setOfficial_code(java.lang.String)
-	 */
+
 	public void setOfficial_code(String official_code) {
 		this.official_code = official_code;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getPicture_uri()
-	 */
 	public String getPicture_uri() {
 		return picture_uri;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setPicture_uri(java.lang.String)
-	 */
+
 	public void setPicture_uri(String picture_uri) {
 		this.picture_uri = picture_uri;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getUser_id()
-	 */
 	public Long getUser_id() {
 		return user_id;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setUser_id(java.lang.Long)
-	 */
+
 	public void setUser_id(Long user_id) {
 		this.user_id = user_id;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getRoom_id()
-	 */
 	public Long getRoom_id() {
 		return room_id;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setRoom_id(java.lang.Long)
-	 */
+
 	public void setRoom_id(Long room_id) {
 		this.room_id = room_id;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getRoomEnter()
-	 */
 	public Date getRoomEnter() {
 		return roomEnter;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setRoomEnter(java.util.Date)
-	 */
+
 	public void setRoomEnter(Date roomEnter) {
 		this.roomEnter = roomEnter;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getIsRecording()
-	 */
 	public Boolean getIsRecording() {
 		return isRecording;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setIsRecording(java.lang.Boolean)
-	 */
+
 	public void setIsRecording(Boolean isRecording) {
 		this.isRecording = isRecording;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getRoomRecordingName()
-	 */
 	public String getRoomRecordingName() {
 		return roomRecordingName;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setRoomRecordingName(java.lang.String)
-	 */
+
 	public void setRoomRecordingName(String roomRecordingName) {
 		this.roomRecordingName = roomRecordingName;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getAvsettings()
-	 */
 	public String getAvsettings() {
 		return avsettings;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setAvsettings(java.lang.String)
-	 */
+
 	public void setAvsettings(String avsettings) {
 		this.avsettings = avsettings;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getBroadCastID()
-	 */
 	public long getBroadCastID() {
 		return broadCastID;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setBroadCastID(long)
-	 */
+
 	public void setBroadCastID(long broadCastID) {
 		this.broadCastID = broadCastID;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getPublicSID()
-	 */
 	public String getPublicSID() {
 		return publicSID;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setPublicSID(java.lang.String)
-	 */
+	
 	public void setPublicSID(String publicSID) {
 		this.publicSID = publicSID;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getZombieCheckFlag()
-	 */
 	public Boolean getZombieCheckFlag() {
 		return zombieCheckFlag;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setZombieCheckFlag(java.lang.Boolean)
-	 */
+	
 	public void setZombieCheckFlag(Boolean zombieCheckFlag) {
 		this.zombieCheckFlag = zombieCheckFlag;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getMicMuted()
-	 */
 	public Boolean getMicMuted() {
 		return micMuted;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setMicMuted(java.lang.Boolean)
-	 */
+
 	public void setMicMuted(Boolean micMuted) {
 		this.micMuted = micMuted;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getCanDraw()
-	 */
 	public Boolean getCanDraw() {
 		return canDraw;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setCanDraw(java.lang.Boolean)
-	 */
+
 	public void setCanDraw(Boolean canDraw) {
 		this.canDraw = canDraw;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getIsBroadcasting()
-	 */
 	public Boolean getIsBroadcasting() {
 		return isBroadcasting;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setIsBroadcasting(java.lang.Boolean)
-	 */
+
 	public void setIsBroadcasting(Boolean isBroadcasting) {
 		this.isBroadcasting = isBroadcasting;
 	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getCanShare()
-	 */
+
 	public Boolean getCanShare() {
 		return canShare;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setCanShare(java.lang.Boolean)
-	 */
 	public void setCanShare(Boolean canShare) {
 		this.canShare = canShare;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getExternalUserId()
-	 */
 	public String getExternalUserId() {
 		return externalUserId;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setExternalUserId(java.lang.String)
-	 */
 	public void setExternalUserId(String externalUserId) {
 		this.externalUserId = externalUserId;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getExternalUserType()
-	 */
 	public String getExternalUserType() {
 		return externalUserType;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setExternalUserType(java.lang.String)
-	 */
 	public void setExternalUserType(String externalUserType) {
 		this.externalUserType = externalUserType;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getSharerSIDs()
-	 */
-	public List<String> getSharerSIDs() {
-		return sharerSIDs;
-	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setSharerSIDs(java.util.List)
-	 */
-	public void setSharerSIDs(List<String> sharerSIDs) {
-		this.sharerSIDs = sharerSIDs;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getIsSuperModerator()
-	 */
 	public Boolean getIsSuperModerator() {
 		return isSuperModerator;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setIsSuperModerator(java.lang.Boolean)
-	 */
+
 	public void setIsSuperModerator(Boolean isSuperModerator) {
 		this.isSuperModerator = isSuperModerator;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getIsScreenClient()
-	 */
 	public Boolean getIsScreenClient() {
 		return isScreenClient;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setIsScreenClient(java.lang.Boolean)
-	 */
+
 	public void setIsScreenClient(Boolean isScreenClient) {
 		this.isScreenClient = isScreenClient;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getVWidth()
-	 */
 	public int getVWidth() {
 		return vWidth;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setVWidth(int)
-	 */
+
 	public void setVWidth(int width) {
 		vWidth = width;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getVHeight()
-	 */
 	public int getVHeight() {
 		return vHeight;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setVHeight(int)
-	 */
+
 	public void setVHeight(int height) {
 		vHeight = height;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getVX()
-	 */
 	public int getVX() {
 		return vX;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setVX(int)
-	 */
+
 	public void setVX(int vx) {
 		vX = vx;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getVY()
-	 */
 	public int getVY() {
 		return vY;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setVY(int)
-	 */
+
 	public void setVY(int vy) {
 		vY = vy;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getStreamPublishName()
-	 */
 	public String getStreamPublishName() {
 		return streamPublishName;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setStreamPublishName(java.lang.String)
-	 */
+
 	public void setStreamPublishName(String streamPublishName) {
 		this.streamPublishName = streamPublishName;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getFlvRecordingId()
-	 */
 	public Long getFlvRecordingId() {
 		return flvRecordingId;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setFlvRecordingId(java.lang.Long)
-	 */
+
 	public void setFlvRecordingId(Long flvRecordingId) {
 		this.flvRecordingId = flvRecordingId;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getFlvRecordingMetaDataId()
-	 */
 	public Long getFlvRecordingMetaDataId() {
 		return flvRecordingMetaDataId;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setFlvRecordingMetaDataId(java.lang.Long)
-	 */
+
 	public void setFlvRecordingMetaDataId(Long flvRecordingMetaDataId) {
 		this.flvRecordingMetaDataId = flvRecordingMetaDataId;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#isScreenPublishStarted()
-	 */
 	public boolean isScreenPublishStarted() {
 		return screenPublishStarted;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setScreenPublishStarted(boolean)
-	 */
+
 	public void setScreenPublishStarted(boolean screenPublishStarted) {
 		this.screenPublishStarted = screenPublishStarted;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getOrganization_id()
-	 */
 	public Long getOrganization_id() {
 		return organization_id;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setOrganization_id(java.lang.Long)
-	 */
+
 	public void setOrganization_id(Long organization_id) {
 		this.organization_id = organization_id;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#isStartRecording()
-	 */
 	public boolean isStartRecording() {
 		return startRecording;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setStartRecording(boolean)
-	 */
+
 	public void setStartRecording(boolean startRecording) {
 		this.startRecording = startRecording;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#isStartStreaming()
-	 */
 	public boolean isStartStreaming() {
 		return startStreaming;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setStartStreaming(boolean)
-	 */
+
 	public void setStartStreaming(boolean startStreaming) {
 		this.startStreaming = startStreaming;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getInterviewPodId()
-	 */
 	public Integer getInterviewPodId() {
 		return interviewPodId;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setInterviewPodId(java.lang.Integer)
-	 */
+
 	public void setInterviewPodId(Integer interviewPodId) {
 		this.interviewPodId = interviewPodId;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getCanRemote()
-	 */
 	public Boolean getCanRemote() {
 		return canRemote;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setCanRemote(java.lang.Boolean)
-	 */
+
 	public void setCanRemote(Boolean canRemote) {
 		this.canRemote = canRemote;
 	}
 
-    /* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getCanGiveAudio()
-	 */
     public Boolean getCanGiveAudio() {
 		return canGiveAudio;
 	}
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setCanGiveAudio(java.lang.Boolean)
-	 */
+
 	public void setCanGiveAudio(Boolean canGiveAudio) {
 		this.canGiveAudio = canGiveAudio;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getAllowRecording()
-	 */
 	public Boolean getAllowRecording() {
 		return allowRecording;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setAllowRecording(java.lang.Boolean)
-	 */
 	public void setAllowRecording(Boolean allowRecording) {
 		this.allowRecording = allowRecording;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#getIsAVClient()
-	 */
 	public boolean getIsAVClient() {
 		return isAVClient;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setIsAVClient(boolean)
-	 */
 	public void setIsAVClient(boolean isAVClient) {
 		this.isAVClient = isAVClient;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#isStreamPublishStarted()
-	 */
 	public boolean isStreamPublishStarted() {
 		return streamPublishStarted;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setStreamPublishStarted(boolean)
-	 */
 	public void setStreamPublishStarted(boolean streamPublishStarted) {
 		this.streamPublishStarted = streamPublishStarted;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#toString()
-	 */
+	public boolean isSipTransport() {
+		return sipTransport;
+	}
+
+	public void setSipTransport(boolean sipTransport) {
+		this.sipTransport = sipTransport;
+	}
+	
 	@Override
 	public String toString() {
-
 		return super.toString() //
 				+ " StreamId: " + this.getStreamid() //
 				+ " PublicSID: " + this.getPublicSID() //
@@ -935,21 +719,5 @@ public class Client implements Serializa
 				+ " avsettings: " + this.getAvsettings() //
 				;
 	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#isSipTransport()
-	 */
-	public boolean isSipTransport() {
-		return sipTransport;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.openmeetings.conference.room.IRoomClient#setSipTransport(boolean)
-	 */
-	public void setSipTransport(boolean sipTransport) {
-		this.sipTransport = sipTransport;
-	}
-	
-	
 	
 }



Mime
View raw message