svn commit: r1712911 [12/16] - in /openmeetings/branches/3.1.x: openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/ openmeetings-core/src/main/java/org/ap...

[so...@apache.org]

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml Fri Nov  6 06:18:44 2015
@@ -24,7 +24,6 @@
 	<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
 		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
 		<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
-		<class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
 		<class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
 		<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
 		<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
@@ -34,26 +33,22 @@
 		<class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
 		<class>org.apache.openmeetings.db.entity.server.Server</class>
 		<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
-		<class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
-		<class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
 		<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
 		<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
 		<class>org.apache.openmeetings.db.entity.user.Organisation</class>
 		<class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta</class>
+		<class>org.apache.openmeetings.db.entity.record.Recording</class>
+		<class>org.apache.openmeetings.db.entity.record.RecordingLog</class>
+		<class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class>
+		<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
 		<class>org.apache.openmeetings.db.entity.room.Invitation</class>
 		<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
-		<class>org.apache.openmeetings.db.entity.log.ConferenceLogType</class>
 		<class>org.apache.openmeetings.db.entity.room.PollType</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
-		<class>org.apache.openmeetings.db.entity.room.RoomPollAnswers</class>
+		<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
 		<class>org.apache.openmeetings.db.entity.room.Client</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
 		<class>org.apache.openmeetings.db.entity.room.Room</class>
-		<class>org.apache.openmeetings.db.entity.room.RoomType</class>
 		<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
 		<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
@@ -61,10 +56,10 @@
 		<class>org.apache.openmeetings.db.entity.user.State</class>
 		<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
 		<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
-		<class>org.apache.openmeetings.db.entity.user.Salutation</class>
 		<class>org.apache.openmeetings.db.entity.user.UserContact</class>
 		<class>org.apache.openmeetings.db.entity.user.Userdata</class>
 		<class>org.apache.openmeetings.db.entity.user.User</class>
+		<class>org.apache.openmeetings.db.entity.file.FileItem</class>
 		<class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class>
 		<class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class>
 		<class>org.apache.openmeetings.db.entity.server.OAuthServer</class>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml Fri Nov  6 06:18:44 2015
@@ -25,7 +25,6 @@
 	<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
 		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
 		<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
-		<class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
 		<class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
 		<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
 		<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
@@ -35,26 +34,22 @@
 		<class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
 		<class>org.apache.openmeetings.db.entity.server.Server</class>
 		<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
-		<class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
-		<class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
 		<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
 		<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
 		<class>org.apache.openmeetings.db.entity.user.Organisation</class>
 		<class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta</class>
+		<class>org.apache.openmeetings.db.entity.record.Recording</class>
+		<class>org.apache.openmeetings.db.entity.record.RecordingLog</class>
+		<class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class>
+		<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
 		<class>org.apache.openmeetings.db.entity.room.Invitation</class>
 		<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
-		<class>org.apache.openmeetings.db.entity.log.ConferenceLogType</class>
 		<class>org.apache.openmeetings.db.entity.room.PollType</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
-		<class>org.apache.openmeetings.db.entity.room.RoomPollAnswers</class>
+		<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
 		<class>org.apache.openmeetings.db.entity.room.Client</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
 		<class>org.apache.openmeetings.db.entity.room.Room</class>
-		<class>org.apache.openmeetings.db.entity.room.RoomType</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
 		<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
 		<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
@@ -62,10 +57,10 @@
 		<class>org.apache.openmeetings.db.entity.user.State</class>
 		<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
 		<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
-		<class>org.apache.openmeetings.db.entity.user.Salutation</class>
 		<class>org.apache.openmeetings.db.entity.user.UserContact</class>
 		<class>org.apache.openmeetings.db.entity.user.Userdata</class>
 		<class>org.apache.openmeetings.db.entity.user.User</class>
+		<class>org.apache.openmeetings.db.entity.file.FileItem</class>
 		<class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class>
 		<class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class>
 		<class>org.apache.openmeetings.db.entity.server.OAuthServer</class>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml Fri Nov  6 06:18:44 2015
@@ -25,7 +25,6 @@
 	<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
 		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
 		<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
-		<class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
 		<class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
 		<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
 		<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
@@ -35,26 +34,22 @@
 		<class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
 		<class>org.apache.openmeetings.db.entity.server.Server</class>
 		<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
-		<class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
-		<class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
 		<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
 		<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
 		<class>org.apache.openmeetings.db.entity.user.Organisation</class>
 		<class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta</class>
+		<class>org.apache.openmeetings.db.entity.record.Recording</class>
+		<class>org.apache.openmeetings.db.entity.record.RecordingLog</class>
+		<class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class>
+		<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
 		<class>org.apache.openmeetings.db.entity.room.Invitation</class>
 		<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
-		<class>org.apache.openmeetings.db.entity.log.ConferenceLogType</class>
 		<class>org.apache.openmeetings.db.entity.room.PollType</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
-		<class>org.apache.openmeetings.db.entity.room.RoomPollAnswers</class>
+		<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
 		<class>org.apache.openmeetings.db.entity.room.Client</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
 		<class>org.apache.openmeetings.db.entity.room.Room</class>
-		<class>org.apache.openmeetings.db.entity.room.RoomType</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
 		<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
 		<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
@@ -62,10 +57,10 @@
 		<class>org.apache.openmeetings.db.entity.user.State</class>
 		<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
 		<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
-		<class>org.apache.openmeetings.db.entity.user.Salutation</class>
 		<class>org.apache.openmeetings.db.entity.user.UserContact</class>
 		<class>org.apache.openmeetings.db.entity.user.Userdata</class>
 		<class>org.apache.openmeetings.db.entity.user.User</class>
+		<class>org.apache.openmeetings.db.entity.file.FileItem</class>
 		<class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class>
 		<class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class>
 		<class>org.apache.openmeetings.db.entity.server.OAuthServer</class>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml Fri Nov  6 06:18:44 2015
@@ -25,7 +25,6 @@
 	<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
 		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
 		<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
-		<class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
 		<class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
 		<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
 		<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
@@ -35,26 +34,22 @@
 		<class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
 		<class>org.apache.openmeetings.db.entity.server.Server</class>
 		<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
-		<class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
-		<class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps</class>
 		<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
 		<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
 		<class>org.apache.openmeetings.db.entity.user.Organisation</class>
 		<class>org.apache.openmeetings.db.entity.user.Organisation_Users</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecording</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecordingLog</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaData</class>
-		<class>org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta</class>
+		<class>org.apache.openmeetings.db.entity.record.Recording</class>
+		<class>org.apache.openmeetings.db.entity.record.RecordingLog</class>
+		<class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class>
+		<class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class>
 		<class>org.apache.openmeetings.db.entity.room.Invitation</class>
 		<class>org.apache.openmeetings.db.entity.log.ConferenceLog</class>
-		<class>org.apache.openmeetings.db.entity.log.ConferenceLogType</class>
 		<class>org.apache.openmeetings.db.entity.room.PollType</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomPoll</class>
-		<class>org.apache.openmeetings.db.entity.room.RoomPollAnswers</class>
+		<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
 		<class>org.apache.openmeetings.db.entity.room.Client</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
 		<class>org.apache.openmeetings.db.entity.room.Room</class>
-		<class>org.apache.openmeetings.db.entity.room.RoomType</class>
 		<class>org.apache.openmeetings.db.entity.room.RoomOrganisation</class>
 		<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
 		<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
@@ -62,10 +57,10 @@
 		<class>org.apache.openmeetings.db.entity.user.State</class>
 		<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
 		<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
-		<class>org.apache.openmeetings.db.entity.user.Salutation</class>
 		<class>org.apache.openmeetings.db.entity.user.UserContact</class>
 		<class>org.apache.openmeetings.db.entity.user.Userdata</class>
 		<class>org.apache.openmeetings.db.entity.user.User</class>
+		<class>org.apache.openmeetings.db.entity.file.FileItem</class>
 		<class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class>
 		<class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class>
 		<class>org.apache.openmeetings.db.entity.server.OAuthServer</class>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Fri Nov  6 06:18:44 2015
@@ -23,11 +23,15 @@
 	xmlns:tx="http://www.springframework.org/schema/tx"
 	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+	xmlns:jaxws="http://cxf.apache.org/jaxws"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"
+		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
+		http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+		http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"
 		>
 	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
 		<property name="persistenceUnitName" value="openmeetings" />
@@ -47,11 +51,11 @@
 	<context:component-scan base-package="org.apache.openmeetings" />
 
 	<!-- New Class for the Streaming Handlers -->
-	<bean id="web.handler" class="org.apache.openmeetings.remote.red5.ScopeApplicationAdapter" />
+	<bean id="web.handler" class="org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter" />
 
 	<!-- Session configuration start -->
 
-	<bean id="openmeetings.SessionManager" class="org.apache.openmeetings.session.SessionManager">
+	<bean id="openmeetings.SessionManager" class="org.apache.openmeetings.core.session.SessionManager">
 		<property name="cache">
 			<!-- Memory based session cache by default -->
 			<ref bean="openmeetings.HashMapStore" />
@@ -60,18 +64,18 @@
 			-->
 		</property>
 	</bean>
-	<bean id="openmeetings.EmoticonsManager" class="org.apache.openmeetings.data.whiteboard.EmoticonsManager" />
+	<bean id="openmeetings.EmoticonsManager" class="org.apache.openmeetings.core.data.whiteboard.EmoticonsManager" />
 
 	<!-- Singletons for memory based cache -->
-	<bean id="openmeetings.HashMapStore" scope="singleton" class="org.apache.openmeetings.session.store.HashMapStore" />
-	<bean id="whiteBoardObjectListManagerById" scope="singleton" class="org.apache.openmeetings.data.whiteboard.WhiteBoardObjectListManagerById" />
+	<bean id="openmeetings.HashMapStore" scope="singleton" class="org.apache.openmeetings.core.session.store.HashMapStore" />
+	<bean id="whiteBoardObjectListManagerById" scope="singleton" class="org.apache.openmeetings.core.data.whiteboard.WhiteBoardObjectListManagerById" />
 	<!-- WhiteBoardObjectSyncManager can stay in the memory, even on cluster! -->
-	<bean id="whiteBoardObjectSyncManager" scope="singleton" class="org.apache.openmeetings.data.whiteboard.WhiteBoardObjectSyncManager" />
+	<bean id="whiteBoardObjectSyncManager" scope="singleton" class="org.apache.openmeetings.core.data.whiteboard.WhiteBoardObjectSyncManager" />
 
 	<!-- Database cache -->
-	<bean id="openmeetings.DatabaseStore" class="org.apache.openmeetings.session.store.DatabaseStore" />
+	<bean id="openmeetings.DatabaseStore" class="org.apache.openmeetings.core.session.store.DatabaseStore" />
 
-	<bean id="openmeetings.ServerUtil" scope="singleton" class="org.apache.openmeetings.session.ServerUtil">
+	<bean id="openmeetings.ServerUtil" scope="singleton" class="org.apache.openmeetings.core.session.ServerUtil">
 		<!-- Need to be uncommented and set to the real ID if in cluster mode
 		<property name="serverId" value="1" />
 		-->
@@ -80,34 +84,34 @@
 	<!-- Cluster related config start -->
 
 	<!-- Start of Services -->
-	<bean id="xmlcrm.service" class="org.apache.openmeetings.remote.MainService" />
-	<bean id="printservice.service" class="org.apache.openmeetings.remote.PrintService" />
-	<bean id="languageservice.service" class="org.apache.openmeetings.remote.LanguageService" />
-	<bean id="invitationservice.service" class="org.apache.openmeetings.remote.InvitationService" />
-	<bean id="whiteboardservice.service" class="org.apache.openmeetings.remote.WhiteBoardService" />
-	<bean id="userservice.service" class="org.apache.openmeetings.remote.UserService" />
-	<bean id="fileservice.service" class="org.apache.openmeetings.remote.ConferenceLibrary" />
-	<bean id="openmeetings.FileProcessor" class="org.apache.openmeetings.data.file.FileProcessor" />
-	<bean id="openmeetings.FlvExplorerConverter" class="org.apache.openmeetings.converter.FlvExplorerConverter" />
-	<bean id="errorservice.service" class="org.apache.openmeetings.remote.ErrorService" />
-	<bean id="conferenceservice.service" class="org.apache.openmeetings.remote.ConferenceService" />
-	<bean id="chatservice.service" class="org.apache.openmeetings.remote.ChatService" />
-	<bean id="flvrecorderservice.service" class="org.apache.openmeetings.remote.FLVRecorderService" />
-	<bean id="mobile.service" class="org.apache.openmeetings.remote.MobileService" />
-	<bean id="openmeetings.FlvRecorderConverterTask" class="org.apache.openmeetings.data.flvrecord.converter.FlvRecorderConverterTask" />
-	<bean id="openmeetings.FlvInterviewConverterTask" class="org.apache.openmeetings.data.flvrecord.converter.FlvInterviewConverterTask" />
-	<bean id="openmeetings.FlvInterviewConverter" class="org.apache.openmeetings.converter.FlvInterviewConverter" />
-	<bean id="openmeetings.FlvRecorderConverter" class="org.apache.openmeetings.converter.FlvRecorderConverter" />
-	<bean id="openmeetings.SlaveHTTPConnectionManager" class="org.apache.openmeetings.cluster.SlaveHTTPConnectionManager" />
+	<bean id="xmlcrm.service" class="org.apache.openmeetings.core.remote.MainService" />
+	<bean id="printservice.service" class="org.apache.openmeetings.core.remote.PrintService" />
+	<bean id="languageservice.service" class="org.apache.openmeetings.core.remote.LanguageService" />
+	<bean id="invitationservice.service" class="org.apache.openmeetings.core.remote.InvitationService" />
+	<bean id="whiteboardservice.service" class="org.apache.openmeetings.core.remote.WhiteBoardService" />
+	<bean id="userservice.service" class="org.apache.openmeetings.core.remote.UserService" />
+	<bean id="fileservice.service" class="org.apache.openmeetings.core.remote.ConferenceLibrary" />
+	<bean id="openmeetings.FileProcessor" class="org.apache.openmeetings.core.data.file.FileProcessor" />
+	<bean id="openmeetings.FlvExplorerConverter" class="org.apache.openmeetings.core.converter.FlvExplorerConverter" />
+	<bean id="errorservice.service" class="org.apache.openmeetings.core.remote.ErrorService" />
+	<bean id="conferenceservice.service" class="org.apache.openmeetings.core.remote.ConferenceService" />
+	<bean id="chatservice.service" class="org.apache.openmeetings.core.remote.ChatService" />
+	<bean id="recordingservice.service" class="org.apache.openmeetings.core.remote.RecordingService" />
+	<bean id="mobile.service" class="org.apache.openmeetings.core.remote.MobileService" />
+	<bean id="openmeetings.RecordingConverterTask" class="org.apache.openmeetings.core.data.record.converter.RecordingConverterTask" />
+	<bean id="openmeetings.InterviewConverterTask" class="org.apache.openmeetings.core.data.record.converter.InterviewConverterTask" />
+	<bean id="openmeetings.InterviewConverter" class="org.apache.openmeetings.core.converter.InterviewConverter" />
+	<bean id="openmeetings.RecordingConverter" class="org.apache.openmeetings.core.converter.RecordingConverter" />
+	<bean id="openmeetings.SlaveHTTPConnectionManager" class="org.apache.openmeetings.webservice.cluster.SlaveHTTPConnectionManager" />
 
-	<bean id="openmeetings.SessionClearJob" class="org.apache.openmeetings.quartz.scheduler.SessionClearJob" />
+	<bean id="openmeetings.SessionClearJob" class="org.apache.openmeetings.service.quartz.scheduler.SessionClearJob">
+		<property name="timeout" value="1800000"/><!-- 30 minutes -->
+	</bean>
 	<bean id="sessionClearJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
 		<property name="targetObject">
 			<ref bean="openmeetings.SessionClearJob" />
 		</property>
-		<property name="targetMethod">
-			<value>doIt</value>
-		</property>
+		<property name="targetMethod" value="doIt" />
 		<property name="concurrent" value="false" />
 	</bean>
 	<bean id="triggerSessionClear" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean">
@@ -115,24 +119,16 @@
 			<!-- see the example of method invoking job above -->
 			<ref bean="sessionClearJob" />
 		</property>
-		<property name="startDelay">
-			<!-- 5 seconds -->
-			<value>5000</value>
-		</property>
-		<property name="repeatInterval">
-			<!-- repeat every 300 seconds == 5 minutes -->
-			<value>300000</value>
-		</property>
+		<property name="startDelay" value="5000"/><!-- 5 seconds -->
+		<property name="repeatInterval" value="300000" /><!-- repeat every 300 seconds == 5 minutes -->
 	</bean>
 
-	<bean id="openmeetings.MeetingReminderJob" class="org.apache.openmeetings.quartz.scheduler.MeetingReminderJob" />
+	<bean id="openmeetings.MeetingReminderJob" class="org.apache.openmeetings.service.quartz.scheduler.MeetingReminderJob" />
 	<bean id="meetingReminderClear" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
 		<property name="targetObject">
 			<ref bean="openmeetings.MeetingReminderJob" />
 		</property>
-		<property name="targetMethod">
-			<value>doIt</value>
-		</property>
+		<property name="targetMethod" value="doIt"/>
 		<property name="concurrent" value="false" />
 	</bean>
 	<bean id="triggerMeetingReminder" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean">
@@ -140,78 +136,54 @@
 			<!-- see the example of method invoking job above -->
 			<ref bean="meetingReminderClear" />
 		</property>
-		<property name="startDelay">
-			<!-- 5 seconds -->
-			<value>5000</value>
-		</property>
-		<property name="repeatInterval">
-			<!-- repeat every 100 seconds -->
-			<value>100000</value>
-		</property>
+		<property name="startDelay" value="5000"/><!-- 5 seconds -->
+		<property name="repeatInterval" value="100000"/><!-- repeat every 100 seconds -->
 	</bean>
-	<bean id="testSetupCleanupJob" class="org.apache.openmeetings.quartz.scheduler.TestSetupCleanupJob" />
+	<bean id="testSetupCleanupJob" class="org.apache.openmeetings.service.quartz.scheduler.TestSetupCleanupJob" />
 	<bean id="testSetupCleanup" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
 		<property name="targetObject">
 			<ref bean="testSetupCleanupJob" />
 		</property>
-		<property name="targetMethod">
-			<value>doIt</value>
-		</property>
+		<property name="targetMethod" value="doIt"/>
 		<property name="concurrent" value="false" />
 	</bean>
 	<bean id="triggerTestSetupCleanup" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean">
 		<property name="jobDetail">
 			<ref bean="testSetupCleanup" />
 		</property>
-		<property name="startDelay">
-			<value>1800000</value> <!-- 30 minutes -->
-		</property>
-		<property name="repeatInterval">
-			<value>1800000</value> <!-- 30 minutes -->
-		</property>
+		<property name="startDelay" value="1800000"/><!-- 30 minutes --> 
+		<property name="repeatInterval" value="1800000"/> <!-- 30 minutes -->
 	</bean>
 
 	<!-- Mail related jobs -->
-	<bean id="mailHandler" class="org.apache.openmeetings.mail.MailHandler" />
+	<bean id="mailHandler" class="org.apache.openmeetings.core.mail.MailHandler" />
 	<bean id="resetSendingMailStatus" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
 		<property name="targetObject">
 			<ref bean="mailHandler" />
 		</property>
-		<property name="targetMethod">
-			<value>resetSendingStatus</value>
-		</property>
+		<property name="targetMethod" value="resetSendingStatus"/>
 		<property name="concurrent" value="false" />
 	</bean>
 	<bean id="triggerResetSendingMailStatus" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean">
 		<property name="jobDetail">
 			<ref bean="resetSendingMailStatus" />
 		</property>
-		<property name="startDelay">
-			<value>60000</value> <!-- 1 minute -->
-		</property>
-		<property name="repeatInterval">
-			<value>900000</value> <!-- 15 minutes -->
-		</property>
+		<property name="startDelay" value="60000"/> <!-- 1 minute -->
+		<property name="repeatInterval" value="900000"/> <!-- 15 minutes -->
 	</bean>
 	<bean id="sendMails" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
 		<property name="targetObject">
 			<ref bean="mailHandler" />
 		</property>
-		<property name="targetMethod">
-			<value>sendMails</value>
-		</property>
+		<property name="targetMethod" value="sendMails"/>
 		<property name="concurrent" value="false" />
 	</bean>
 	<bean id="triggerSendMails" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean">
 		<property name="jobDetail">
 			<ref bean="sendMails" />
 		</property>
-		<property name="startDelay">
-			<value>60000</value> <!-- 1 minute -->
-		</property>
-		<property name="repeatInterval">
-			<value>60000</value> <!-- 1 minute -->
-		</property>
+		<property name="startDelay" value="60000"/> <!-- 1 minute -->
+		<property name="repeatInterval" value="60000"/> <!-- 1 minute -->
 	</bean>
 	
 	<bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
@@ -228,9 +200,7 @@
 	<!-- End of Services -->
 
 	<!-- Interface Transactional -->
-	<bean id="appointmentReminderTypDaoImpl" class="org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao" />
-	<bean id="appointmentCategoryDaoImpl" class="org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao" />
-	<bean id="roommanagement" class="org.apache.openmeetings.data.conference.RoomManager" />
+	<bean id="roommanagement" class="org.apache.openmeetings.core.data.conference.RoomManager" />
 	<bean id="roomDao" class="org.apache.openmeetings.db.dao.room.RoomDao"/>
 	<bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao">
 	<!--  Should be uncommented and updated with real values for Asterisk
@@ -243,7 +213,6 @@
 	<bean id="invitationDao" class="org.apache.openmeetings.db.dao.room.InvitationDao" />
 	<bean id="organisationDao" class="org.apache.openmeetings.db.dao.user.OrganisationDao" />
 	<bean id="organisationUserDao" class="org.apache.openmeetings.db.dao.user.OrganisationUserDao" />
-	<bean id="salutationmanagement" class="org.apache.openmeetings.db.dao.user.SalutationDao" />
 	<bean id="errorManagement" class="org.apache.openmeetings.db.dao.basic.ErrorDao" />
 	<bean id="navimanagement" class="org.apache.openmeetings.db.dao.basic.NavigationDao" />
 	<bean id="pollManagement" class="org.apache.openmeetings.db.dao.room.PollDao" />
@@ -251,27 +220,25 @@
 	<bean id="labelDao" class="org.apache.openmeetings.db.dao.label.LabelDao" />
 	<bean id="configurationDaoImpl" class="org.apache.openmeetings.db.dao.basic.ConfigurationDao" />
 	<bean id="appointmentDao" class="org.apache.openmeetings.db.dao.calendar.AppointmentDao" />
-	<bean id="appointmentLogic" class="org.apache.openmeetings.data.calendar.management.AppointmentLogic" />
+	<bean id="appointmentLogic" class="org.apache.openmeetings.service.calendar.AppointmentLogic" />
 	<bean id="sessionManagement" class="org.apache.openmeetings.db.dao.server.SessiondataDao" />
-	<bean id="userManagement" class="org.apache.openmeetings.data.user.UserManager" />
-	<bean id="roomModeratorsDao" class="org.apache.openmeetings.db.dao.room.RoomModeratorsDao" />
+	<bean id="userManagement" class="org.apache.openmeetings.service.user.UserManager" />
+	<bean id="roomModeratorDao" class="org.apache.openmeetings.db.dao.room.RoomModeratorDao" />
 	<bean id="roomOrganisationDao" class="org.apache.openmeetings.db.dao.room.RoomOrganisationDao"/>
-	<bean id="roomTypeDao" class="org.apache.openmeetings.db.dao.room.RoomTypeDao" />
 	<bean id="conferenceLogDao" class="org.apache.openmeetings.db.dao.log.ConferenceLogDao" />
-	<bean id="conferenceLogTypeDao" class="org.apache.openmeetings.db.dao.log.ConferenceLogTypeDao" />
-	<bean id="emailManagement" class="org.apache.openmeetings.data.user.EmailManager" />
+	<bean id="emailManagement" class="org.apache.openmeetings.service.mail.EmailManager" />
 	<bean id="fileExplorerItemDao" class="org.apache.openmeetings.db.dao.file.FileExplorerItemDao" />
-	<bean id="flvRecordingDao" class="org.apache.openmeetings.db.dao.record.FlvRecordingDao" />
-	<bean id="flvRecordingLogDao" class="org.apache.openmeetings.db.dao.record.FlvRecordingLogDao" />
-	<bean id="flvRecordingMetaDataDao" class="org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao" />
-	<bean id="flvRecordingMetaDeltaDao" class="org.apache.openmeetings.db.dao.record.FlvRecordingMetaDeltaDao" />
+	<bean id="recordingDao" class="org.apache.openmeetings.db.dao.record.RecordingDao" />
+	<bean id="recordingLogDao" class="org.apache.openmeetings.db.dao.record.RecordingLogDao" />
+	<bean id="recordingMetaDataDao" class="org.apache.openmeetings.db.dao.record.RecordingMetaDataDao" />
+	<bean id="recordingMetaDeltaDao" class="org.apache.openmeetings.db.dao.record.RecordingMetaDeltaDao" />
 	<bean id="ldapConfigDao" class="org.apache.openmeetings.db.dao.server.LdapConfigDao" />
-	<bean id="invitationManagement" class="org.apache.openmeetings.data.conference.InvitationManager" />
+	<bean id="invitationManagement" class="org.apache.openmeetings.service.room.InvitationManager" />
 	<bean id="meetingMemberDao" class="org.apache.openmeetings.db.dao.calendar.MeetingMemberDao" />
 	<bean id="privateMessageFolderDao" class="org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao" />
-	<bean id="privateMessagesDao" class="org.apache.openmeetings.db.dao.user.PrivateMessagesDao" />
+	<bean id="privateMessageDao" class="org.apache.openmeetings.db.dao.user.PrivateMessageDao" />
 	<bean id="soapLoginDao" class="org.apache.openmeetings.db.dao.server.SOAPLoginDao" />
-	<bean id="userContactsDao" class="org.apache.openmeetings.db.dao.user.UserContactsDao" />
+	<bean id="userContactDao" class="org.apache.openmeetings.db.dao.user.UserContactDao" />
 	<bean id="userDao" class="org.apache.openmeetings.db.dao.user.UserDao" />
 	<bean id="serverDao" class="org.apache.openmeetings.db.dao.server.ServerDao" />
 	<bean id="chatDao" class="org.apache.openmeetings.db.dao.basic.ChatDao" />
@@ -280,17 +247,17 @@
 	<bean id="oauth2Dao" class="org.apache.openmeetings.db.dao.server.OAuth2Dao" />
 
 	<!-- No Interface -->
-	<bean id="generateImage" class="org.apache.openmeetings.converter.GenerateImage" />
-	<bean id="generateThumbs" class="org.apache.openmeetings.converter.GenerateThumbs" />
-	<bean id="generatePDF" class="org.apache.openmeetings.documents.GeneratePDF" />
-	<bean id="smsHandler" class="org.apache.openmeetings.mail.SMSHandler" />
+	<bean id="generateImage" class="org.apache.openmeetings.core.converter.GenerateImage" />
+	<bean id="generateThumbs" class="org.apache.openmeetings.core.converter.GenerateThumbs" />
+	<bean id="generatePDF" class="org.apache.openmeetings.core.documents.GeneratePDF" />
+	<bean id="smsHandler" class="org.apache.openmeetings.core.mail.SMSHandler" />
 	<bean id="importInitvalues" class="org.apache.openmeetings.installation.ImportInitvalues" />
-	<bean id="libraryWmlLoader" class="org.apache.openmeetings.documents.LibraryWmlLoader" />
-	<bean id="generateSWF" class="org.apache.openmeetings.converter.GenerateSWF" />
-	<bean id="fileUtils" class="org.apache.openmeetings.data.file.FileUtils" />
-	<bean id="ldapLoginManagement" class="org.apache.openmeetings.ldap.LdapLoginManagement" />
+	<bean id="libraryWmlLoader" class="org.apache.openmeetings.core.documents.LibraryWmlLoader" />
+	<bean id="generateSWF" class="org.apache.openmeetings.core.converter.GenerateSWF" />
+	<bean id="fileUtils" class="org.apache.openmeetings.core.data.file.FileUtils" />
+	<bean id="ldapLoginManagement" class="org.apache.openmeetings.core.ldap.LdapLoginManagement" />
 	<bean id="timezoneUtil" class="org.apache.openmeetings.db.util.TimezoneUtil" />
-	<bean id="whiteboardManagement" class="org.apache.openmeetings.data.whiteboard.WhiteboardManager" />
+	<bean id="whiteboardManagement" class="org.apache.openmeetings.core.data.whiteboard.WhiteboardManager" />
 	<bean id="backupExport" class="org.apache.openmeetings.backup.BackupExport" />
 	<bean id="backupImport" class="org.apache.openmeetings.backup.BackupImport" />
 
@@ -302,10 +269,34 @@
 	</bean>
 
 	<!-- Axis2 Service Proxy's -->
-	<bean id="userWebService" class="org.apache.openmeetings.axis.services.UserWebService" />
-	<bean id="roomWebService" class="org.apache.openmeetings.axis.services.RoomWebService" />
-	<bean id="fileWebService" class="org.apache.openmeetings.axis.services.FileWebService" />
-	<bean id="calendarWebService" class="org.apache.openmeetings.axis.services.CalendarWebService" />
-	<bean id="jabberWebService" class="org.apache.openmeetings.axis.services.JabberWebService" />
-	<bean id="serverWebService" class="org.apache.openmeetings.axis.services.ServerWebService" />
+	<bean id="calendarWebService" class="org.apache.openmeetings.webservice.CalendarWebService" />
+	<bean id="errorWebService" class="org.apache.openmeetings.webservice.ErrorWebService" />
+	<bean id="fileWebService" class="org.apache.openmeetings.webservice.FileWebService" />
+	<bean id="groupWebService" class="org.apache.openmeetings.webservice.GroupWebService" />
+	<bean id="recordWebService" class="org.apache.openmeetings.webservice.RecordingWebService" />
+	<bean id="roomWebService" class="org.apache.openmeetings.webservice.RoomWebService" />
+	<bean id="serverWebService" class="org.apache.openmeetings.webservice.ServerWebService" />
+	<bean id="userWebService" class="org.apache.openmeetings.webservice.UserWebService" />
+	
+	<!-- (writeXsiType=false) -->
+	<jaxrs:server id="server" address="/">
+		<jaxrs:serviceBeans>
+			<ref bean="calendarWebService"/>
+			<ref bean="errorWebService"/>
+			<ref bean="fileWebService"/>
+			<ref bean="groupWebService"/>
+			<ref bean="recordWebService"/>
+			<ref bean="roomWebService"/>
+			<ref bean="serverWebService"/>
+			<ref bean="userWebService"/>
+		</jaxrs:serviceBeans>
+	</jaxrs:server>
+	<jaxws:endpoint id="calendarServiceWS" address="/CalendarService" implementor="#calendarWebService"/>
+	<jaxws:endpoint id="errorServiceWS" address="/ErrorService" implementor="#errorWebService" />
+	<jaxws:endpoint id="groupServiceWS" address="/GroupService" implementor="#groupWebService" />
+	<jaxws:endpoint id="fileServiceWS" address="/FileService" implementor="#fileWebService" />
+	<jaxws:endpoint id="recordServiceWS" address="/RecordService" implementor="#recordWebService" />
+	<jaxws:endpoint id="roomServiceWS" address="/RoomService" implementor="#roomWebService" />
+	<jaxws:endpoint id="serverServiceWS" address="/ServerService" implementor="#serverWebService" />
+	<jaxws:endpoint id="userServiceWS" address="/UserService" implementor="#userWebService" />
 </beans>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml Fri Nov  6 06:18:44 2015
@@ -34,6 +34,20 @@
         <listener-class>org.apache.openmeetings.util.OMContextListener</listener-class>
     </listener>
     
+	<servlet>
+		<servlet-name>CXFServlet</servlet-name>
+		<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+		<init-param>
+			<param-name>config-location</param-name>
+			<param-value>classpath:openmeetings-applicationContext.xml</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>CXFServlet</servlet-name>
+		<url-pattern>/services/*</url-pattern>
+	</servlet-mapping>
+	
     <filter>
         <filter-name>LoggerContextFilter</filter-name>
         <filter-class>org.red5.logging.LoggerContextFilter</filter-class>
@@ -53,7 +67,7 @@
 		</init-param>
 		<init-param>
 			<param-name>configuration</param-name>
-			<param-value>@wicket.mode@</param-value>
+			<param-value>${wicket.mode}</param-value>
 		</init-param>
 		<init-param>
 			<param-name>ignorePaths</param-name>
@@ -64,7 +78,7 @@
 		<filter-name>OpenmeetingsApplication</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
-	 
+
     <context-param>
         <param-name>contextConfigLocation</param-name>
         <param-value>/WEB-INF/red5-*.xml</param-value>
@@ -93,13 +107,7 @@
     </servlet>
     <servlet>
         <servlet-name>ExportToImage</servlet-name>
-        <servlet-class>org.apache.openmeetings.servlet.outputhandler.ExportToImage</servlet-class>
-    </servlet>
-    <!-- Axis2 Settings -->
-    <servlet>
-        <servlet-name>AxisServlet</servlet-name>
-        <servlet-class>org.apache.axis2.transport.http.AxisServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
+        <servlet-class>org.apache.openmeetings.core.servlet.outputhandler.ExportToImage</servlet-class>
     </servlet>
 	
 	<servlet-mapping>
@@ -114,11 +122,6 @@
         <servlet-name>ExportToImage</servlet-name>
         <url-pattern>/ExportToImage</url-pattern>
     </servlet-mapping>
-    <!-- Axis2 -->
-    <servlet-mapping>
-        <servlet-name>AxisServlet</servlet-name>
-        <url-pattern>/services/*</url-pattern>
-    </servlet-mapping>
     <mime-mapping>
         <extension>inc</extension>
         <mime-type>text/plain</mime-type>

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/activities.css
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/activities.css?rev=1712911&view=auto
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/activities.css (added)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/activities.css Fri Nov  6 06:18:44 2015
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+#activitiesPanel {
+	position: fixed;
+	z-index: 2000;
+	bottom: 0px;
+	left: 10px;
+	width: 600px;
+	height: 20px;
+}
+#activitiesPanel .control.block .ui-icon {
+	text-align: center;
+}
+#activitiesPanel .control.block .label {
+	display: inline-block;
+	padding-left: 20px;
+}
+#activitiesPanel .area {
+	height: 310px;
+	overflow-y: auto;
+	padding: 5px;
+}
\ No newline at end of file

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/calendar.css
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/calendar.css?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/calendar.css (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/calendar.css Fri Nov  6 06:18:44 2015
@@ -37,11 +37,11 @@
 	height: 80px;
 }
 
-.appointmentPopUp select[name="remind"] {
+.appointmentPopUp select[name="reminder"] {
 	width: 426px;
 }
 
-.appointmentPopUp select[name="room.roomtype"] {
+.appointmentPopUp select[name="room.type"] {
 	width: 426px;
 }
 
@@ -53,6 +53,9 @@
 	float: left;
 }
 
+.appointmentPopUp td {
+	vertical-align: middle;
+}
 .appointmentPopUp .attendeeContainer {
 	background-color: #FFFFFF;
 	border: solid 1px #aacfe4;
@@ -62,23 +65,6 @@
 	float: left;
 }
 
-.appointmentPopUp .attendeeContainer table td:FIRST-CHILD div {
-	width: 130px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-
-.appointmentPopUp .attendeeContainer table td:nth-child(2) div {
-	width: 260px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-
-.appointmentPopUp .attendeeContainer table td:nth-child(3) div {
-	width: 20px;
-}
 .appointment.attendees {
 	width: 100%;
 }

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/chat.css
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/chat.css?rev=1712911&view=auto
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/chat.css (added)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/chat.css Fri Nov  6 06:18:44 2015
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+#chatPanel {
+	position: fixed;
+	z-index: 2000;
+	bottom: 0px;
+	right: 10px;
+	width: 600px;
+	height: 20px;
+}
+#chatPanel #chat {
+	height: 20px;
+}
+#chatPanel #chat .btn-toolbar {
+	margin-top: 2px;
+	margin-bottom: 0;
+	margin-left: 5px;
+}
+#chatPanel #chat #chatTabs.ui-tabs {
+	padding: 0;
+}
+#chatPanel #chat #chatTabs.ui-tabs .ui-tabs-nav {
+	padding: 0;
+}
+#chatPanel #chat #chatTabs.ui-tabs .ui-tabs-nav li {
+	margin: 0;
+}
+#chatPanel #chat #chatTabs.ui-tabs .ui-tabs-nav li .ui-icon.ui-icon-close {
+	float: left;
+}
+#chatPanel #chat #chatTabs.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
+	padding: 2px .5em;
+	float: left;
+}
+#chatPanel #chat .control.block .ui-icon {
+	text-align: center;
+}
+#chatPanel #chat .control.block .label {
+	display: inline-block;
+	padding-left: 20px;
+}
+#chatPanel #chat .messageArea .date {
+    margin-right: 5px;
+    font-style: italic;
+    font-size: smaller;
+}
+#chatPanel #chat .messageArea .from {
+	margin-left: 5px;
+    margin-right: 5px;
+	font-weight: bold;
+}
+.ui-tabs .ui-tabs-panel.messageArea {
+	height: 165px;
+	overflow-y: auto;
+	padding: 5px;
+}
+#chatMessage .wysiwyg-editor {
+	height: 70px;
+	max-height: 70px;
+}

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/chart_pie.png
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/chart_pie.png?rev=1712911&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/chart_pie.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/exit_button.png
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/exit_button.png?rev=1712911&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/exit_button.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/logo.png
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/logo.png?rev=1712911&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/logo.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/map.png
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/map.png?rev=1712911&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/map.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/monitor_go.png
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/monitor_go.png?rev=1712911&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/monitor_go.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/page_edit.png
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/page_edit.png?rev=1712911&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/page_edit.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/photo.png
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/photo.png?rev=1712911&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/photo.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/report.png
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/report.png?rev=1712911&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/report.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/user_add.png
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/user_add.png?rev=1712911&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/user_add.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/wizzard_button_1.png
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/wizzard_button_1.png?rev=1712911&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/wizzard_button_1.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/wizzard_button_2.png
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/wizzard_button_2.png?rev=1712911&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/wizzard_button_2.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/wizzard_button_3.png
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/wizzard_button_3.png?rev=1712911&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/wizzard_button_3.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/wizzard_button_4.png
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/wizzard_button_4.png?rev=1712911&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/images/wizzard_button_4.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/jquery.ui.menubar.css
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/jquery.ui.menubar.css?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/jquery.ui.menubar.css (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/jquery.ui.menubar.css Fri Nov  6 06:18:44 2015
@@ -28,7 +28,7 @@
 }
 
 .ui-menubar .ui-menu {
-	width: 200px;
+	width: 300px;
 	position: absolute;
 	z-index: 9999;
 	font-weight: normal;

Added: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/room.css
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/room.css?rev=1712911&view=auto
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/room.css (added)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/room.css Fri Nov  6 06:18:44 2015
@@ -0,0 +1,111 @@
+/*
+ * 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.
+ */
+.room.container {
+	width: 100%;
+}
+.room.menu.exit {
+	padding-left: 20px;
+	background-image: url(images/exit_button.png);
+	background-repeat: no-repeat;
+	background-position: 5px 5px;
+}
+.room.menu.right {
+	position: absolute;
+	top: 0px;
+	margin-right: 5px;
+	right: 0px;
+	display: inline-block;
+}
+.room.menu.right .room {
+	float: right;
+	padding-top: 5px;
+	padding-right: 5px;
+}
+.room.menu.right .room.name {
+	font-weight: bold;
+}
+.room.menu.right .room.recording {
+	color: red;
+}
+.room.menu.right .icon {
+	width: 30px;
+	height: 30px;
+	background-repeat: no-repeat;
+	background-position: 5px 5px;
+	float: right;
+}
+.room.menu.right .icon.share {
+	background-image: url(images/monitor_go.png);
+}
+.room.menu.right .icon.ask {
+	background-image: url(images/user_add.png);
+}
+.room.sidebar.left {
+	min-width: 200px;
+	width: 20%;
+	float: left;
+}
+.room.wb.area {
+	width: 80%;
+	float: left;
+}
+.room.sidebar.left .user.list {
+	border-right: 1px solid #dddddd;
+	height: 100%;
+	overflow-y: auto;
+}
+.room.sidebar.left .user.list .user {
+	height: 40px;
+	padding-left: 5px;
+    padding-top: 5px;
+}
+.room.sidebar.left .user.list .user .user.name {
+	line-height: 18px;
+	height: 18px;
+	padding: 0;
+}
+.room.sidebar.left .user.list .user .user.actions {
+	position: relative;
+	height: 18px;
+	padding: 0;
+}
+.private-chat.om-icon {
+	background-image: url(images/page_edit.png);
+}
+.room.sidebar.left .tabs, .room.sidebar.left .tabs #utab, .room.sidebar.left .tabs #ftab {
+	padding: 0;
+}
+.room.sidebar.left .user.list .user.current {
+	font-weight: bold;
+}
+.ui-dialog.video, .ui-dialog.video .ui-dialog-titlebar, .ui-dialog.video .video.ui-dialog-content {
+	padding: 0;
+	overflow: hidden;
+}
+.input.select2-container-multi .select2-choices {
+	max-height: 100px;
+	overflow-y: auto;
+}
+.activity.item {
+	position: relative;
+}
+.activity.item .ui-dialog-titlebar-close {
+	width: 20px;
+	height: 20px;
+}

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css Fri Nov  6 06:18:44 2015
@@ -25,9 +25,10 @@ html, body {
 	font-size: 28px;
 	line-height: 40px;
 	font-weight: bold;
-	background-image: url(../public/themes/basic-theme/general/logo.png);
+	background-image: url(images/logo.png);
 	background-repeat: no-repeat;
 	padding-left: 150px;
+	margin-bottom: 10px;
 }
 #topLinks {
 	position: absolute;
@@ -46,9 +47,13 @@ html, body {
 	border-right: none;
 }
 
-#menu {
+#menu, #roomMenu {
 	background-color: #AFCBFB;
-	margin-top: 10px;
+	max-height: 30px;
+	overflow-y: hidden;
+}
+#menu .ui-menubar.ui-widget-header.ui-helper-clearfix, #roomMenu .ui-menubar.ui-widget-header.ui-helper-clearfix {
+	border-right: 0;
 }
 .ui-menubar .ui-menu {
 	width: 250px;
@@ -68,45 +73,17 @@ html, body {
 #busy_indicator {
 	display: none;
 	float: right;
-	margin-top: 5px;
 	z-index: 1000;
 	width: 200px;
 	font-weight: bold;
 	text-align: center;
 	font-size: 1em;
 	color: #FF0000;
+	height: 30px;
+	border: 0;
 }
-
-#chatPanel {
-	position: fixed;
-	z-index: 2000;
-	bottom: 0px;
-	right: 10px;
-	width: 600px;
-}
-#chatPanel #chat {
-	height: 20px;
-}
-#chatPanel #chat #controlBlock #control {
-	text-align: center;
-}
-#chatPanel #chat #messageArea .date {
-    margin-right: 5px;
-    font-style: italic;
-    font-size: smaller;
-}
-#chatPanel #chat #messageArea .from {
-	margin-left: 5px;
-    margin-right: 5px;
-	font-weight: bold;
-}
-#messageArea {
-	height: 165px;
-	overflow-y: auto;
-}
-#chatMessage .wysiwyg-editor {
-	height: 70px;
-	max-height: 70px;
+#busy_indicator span {
+	vertical-align: sub;
 }
 .clickable {
 	cursor: pointer;
@@ -247,18 +224,18 @@ html, body {
 	display: inline-block;
 }
 .start_step1 {
-	background-image: url(../public/themes/basic-theme/dashboard/wizzard_button_1.png);
+	background-image: url(images/wizzard_button_1.png);
 }
 .start_step2 {
-	background-image: url(../public/themes/basic-theme/dashboard/wizzard_button_2.png);
+	background-image: url(images/wizzard_button_2.png);
 	margin-left: 20px;
 }
 .start_step3 {
-	background-image: url(../public/themes/basic-theme/dashboard/wizzard_button_3.png);
+	background-image: url(images/wizzard_button_3.png);
 	margin-left: 40px;
 }
 .start_step4 {
-	background-image: url(../public/themes/basic-theme/dashboard/wizzard_button_4.png);
+	background-image: url(images/wizzard_button_4.png);
 	margin-left: 60px;
 }
 .widget {
@@ -267,6 +244,8 @@ html, body {
 .widget td {
 	min-width: 150px;
 }
+#contents {
+}
 #contents .dragbox-content {
 	min-height: 300px;
 	max-height: 300px;
@@ -277,13 +256,18 @@ html, body {
 #feeds.ui-accordion .ui-accordion-header {
 	margin-bottom: 2px;
 }
-.recording {
+.file.tree.container {
+	border: 1px solid #ccc;
+}
+.file.tree {
 	width: 100%;
 	display: inline-block;
 }
-.recording .files {
-	width: 250px;
-	border: 1px solid #ccc;
+.file.tree .trees {
+	min-height: 400px;
+	max-height: 600px;
+	overflow-x: hidden;
+	overflow-y: auto;
 }
 .trash-toolbar {
 	font-weight: bold;
@@ -293,16 +277,10 @@ html, body {
 .trash-toolbar-hover {
 	color: inherit;
 }
-.recording .files .trees {
-	min-height: 400px;
-	max-height: 600px;
-	overflow-x: hidden;
-	overflow-y: auto;
-}
-.recording .files .sizes table, .recording .files .info table {
+.file.tree .files .sizes table, .file.tree .files .info table {
 	width: 100%;
 }
-.recording .files .info input {
+.file.tree .files .info input {
 	width: 100%;
 	padding-right: 5px;
 	padding-left: 5px;
@@ -378,45 +356,61 @@ html, body {
 	padding-left: 18px;
 	background-image: url(images/film_processing.png);
 }
-.my-recordings.om-icon {
+.file.om-icon {
 	padding-left: 18px;
+}
+.my.file.om-icon {
 	background-image: url(images/house_link.png);
 }
-.public-recordings.om-icon {
-	padding-left: 18px;
+.public.file.om-icon {
 	background-image: url(images/world_link.png);
 }
+.image.file.om-icon {
+	background-image: url(images/photo.png);
+}
+.chart.file.om-icon {
+	background-image: url(images/chart_pie.png);
+}
+.wml.file.om-icon {
+	background-image: url(images/map.png);
+}
+.doc.file.om-icon {
+	background-image: url(images/report.png);
+}
+.selected .file.item {
+	background-color: #0099FF;
+}
 .tree-theme-windows span.tree-content {
 	display: flex !important;
 }
-.recording.item {
+.file.item {
 	position: relative;
+	display: inline-block;
 	vertical-align: top;
 }
-.recording.item .name {
+.file.item .name {
 	color: black;
 	display: block;
 	overflow: hidden;
 	width: 230px;
 }
-.recording.item .errors {
+.file.item .errors {
 	position: absolute;
 	right: 0px;
 	background-image: url(images/script_error.png);
 	width: 16px;
 	height: 16px;
 	background-repeat: no-repeat;
-	padding-right: 20px;
 }
-.recording.dialog.errors {
+.file.tree .dialog.errors {
 	width: 600px;
 	height: 500px;
 	font-size: small;
 }
-.recording.dialog.errors .alert {
+.file.tree .dialog.errors .alert {
 	color: red;
 }
-.recording.dialog.errors .message {
+.file.tree .dialog.errors .message {
 	display: block;
 	unicode-bidi: embed;
 	font-family: monospace;
@@ -538,6 +532,9 @@ select.messages.selector {
 	width: 1px;
 	height: 1px;
 }
+#messagesTable tr.selected {
+	background-color: #d7ebf9;
+}
 #messagesTable tr.unread {
 	font-weight: bold;
 }
@@ -601,6 +598,13 @@ select.messages.selector {
 .user.info.panel fieldset table, .user.info.panel fieldset table textarea {
 	width: 100%;
 }
+#topControls #wicketDebugBar {
+	right: initial;
+	top: initial;
+	z-index: 2;
+	bottom: 0;
+	position: fixed;
+}
 form .input {
 	display: block;
 	float: left;

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/languages/errorvalues.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/languages/errorvalues.xml?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/languages/errorvalues.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/languages/errorvalues.xml Fri Nov  6 06:18:44 2015
@@ -26,7 +26,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">334</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">2</field>
@@ -34,7 +34,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">319</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">3</field>
@@ -42,7 +42,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">320</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">4</field>
@@ -50,7 +50,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">321</field>
-      <field name="errortype_id">2</field>
+      <field name="type">info</field>
     </row>
     <row>
       <field name="errorvalues_id">5</field>
@@ -58,7 +58,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">324</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">6</field>
@@ -66,7 +66,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">330</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">7</field>
@@ -74,7 +74,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">331</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">8</field>
@@ -82,7 +82,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">332</field>
-      <field name="errortype_id">2</field>
+      <field name="type">info</field>
     </row>
     <row>
       <field name="errorvalues_id">9</field>
@@ -90,7 +90,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">318</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">10</field>
@@ -98,7 +98,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">335</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">11</field>
@@ -106,7 +106,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">336</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">12</field>
@@ -114,7 +114,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">337</field>
-      <field name="errortype_id">2</field>
+      <field name="type">info</field>
     </row>
     <row>
       <field name="errorvalues_id">13</field>
@@ -122,7 +122,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">103</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">14</field>
@@ -130,7 +130,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">338</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">15</field>
@@ -138,7 +138,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">105</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">16</field>
@@ -146,7 +146,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">107</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">17</field>
@@ -154,7 +154,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">106</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">18</field>
@@ -162,7 +162,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">236</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">19</field>
@@ -170,7 +170,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">339</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">20</field>
@@ -178,7 +178,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">340</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">21</field>
@@ -186,7 +186,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">341</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">22</field>
@@ -194,7 +194,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">342</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">23</field>
@@ -202,7 +202,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">343</field>
-      <field name="errortype_id">2</field>
+      <field name="type">info</field>
     </row>
     <row>
       <field name="errorvalues_id">24</field>
@@ -210,7 +210,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">345</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">25</field>
@@ -218,7 +218,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">346</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">26</field>
@@ -226,7 +226,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">347</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">27</field>
@@ -234,7 +234,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">358</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">28</field>
@@ -242,7 +242,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">357</field>
-      <field name="errortype_id">2</field>
+      <field name="type">info</field>
     </row>
     <row>
       <field name="errorvalues_id">29</field>
@@ -250,7 +250,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">358</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">30</field>
@@ -258,7 +258,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">403</field>
-      <field name="errortype_id">2</field>
+      <field name="type">info</field>
     </row>
     <row>
       <field name="errorvalues_id">31</field>
@@ -266,7 +266,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">533</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">32</field>
@@ -274,7 +274,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">534</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">33</field>
@@ -282,7 +282,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">535</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">34</field>
@@ -290,7 +290,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">538</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">35</field>
@@ -298,7 +298,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">276</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">36</field>
@@ -306,7 +306,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">664</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">37</field>
@@ -314,7 +314,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">665</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">38</field>
@@ -322,7 +322,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">663</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">39</field>
@@ -330,7 +330,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">666</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>	
     <row>
       <field name="errorvalues_id">40</field>
@@ -338,7 +338,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">674</field>
-      <field name="errortype_id">2</field>
+      <field name="type">info</field>
     </row>  
     <row>
       <field name="errorvalues_id">41</field>
@@ -346,7 +346,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">673</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>  	
     <row>
       <field name="errorvalues_id">42</field>
@@ -354,7 +354,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">787</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>  
     <row>
       <field name="errorvalues_id">43</field>
@@ -362,7 +362,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">920</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">44</field>
@@ -370,7 +370,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">1000</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row> 	
     <row>
       <field name="errorvalues_id">45</field>
@@ -378,7 +378,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">1195</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row> 
     <row>
       <field name="errorvalues_id">46</field>
@@ -386,7 +386,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">1226</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">47</field>
@@ -394,7 +394,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">1227</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>		
     <row>
       <field name="errorvalues_id">48</field>
@@ -402,7 +402,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">1228</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">49</field>
@@ -410,7 +410,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">1231</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>	
     <row>
       <field name="errorvalues_id">50</field>
@@ -418,7 +418,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">1271</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">51</field>
@@ -426,7 +426,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">1309</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>   	
     <row>
       <field name="errorvalues_id">52</field>
@@ -434,7 +434,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">1310</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row> 	
     <row>
       <field name="errorvalues_id">53</field>
@@ -442,7 +442,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">1416</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row> 	
     <row>
       <field name="errorvalues_id">54</field>
@@ -450,7 +450,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">1431</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">55</field>
@@ -458,7 +458,7 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">1540</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
     <row>
       <field name="errorvalues_id">56</field>
@@ -466,6 +466,6 @@
       <field name="updatetime" />
       <field name="deleted">false</field>
       <field name="fieldvalues_id">1544</field>
-      <field name="errortype_id">1</field>
+      <field name="type">error</field>
     </row>
 </ROOT>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1712911&r1=1712910&r2=1712911&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java Fri Nov  6 06:18:44 2015
@@ -18,20 +18,16 @@
  */
 package org.apache.openmeetings.test;
 
+import static org.apache.openmeetings.util.OpenmeetingsVariables.configKeyCryptClassName;
 import static org.junit.Assert.assertNotNull;
 
 import java.util.Date;
-import java.util.List;
 
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
-import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
-import org.apache.openmeetings.db.dao.room.RoomTypeDao;
 import org.apache.openmeetings.db.dao.user.UserDao;
 import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
 import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.db.entity.room.RoomType;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.installation.ImportInitvalues;
 import org.apache.openmeetings.installation.InstallationConfig;
@@ -43,8 +39,8 @@ import org.springframework.beans.factory
 public abstract class AbstractJUnitDefaults extends AbstractSpringTest {
 	private static final Logger log = Red5LoggerFactory.getLogger(AbstractJUnitDefaults.class);
 	
-	protected static final String username = "swagner";
-	protected static final String userpass = "qweqwe";
+	protected static final String username = "admin";
+	protected static final String userpass = "12345";
 	private static final String orgname = "smoketest";
 	private static final String timeZone = "Europe/Berlin";
 	private static final String useremail = "junit@openmeetings.apache.org";
@@ -52,32 +48,26 @@ public abstract class AbstractJUnitDefau
 	@Autowired
 	private AppointmentDao appointmentDao;
 	@Autowired
-	private AppointmentReminderTypDao reminderTypeDao;
-	@Autowired
-	private RoomTypeDao roomTypeDao;
-	@Autowired
 	private UserDao userDao;
 	@Autowired
 	private ImportInitvalues importInitvalues;
 	@Autowired
 	private ConfigurationDao configurationDao;
-	
-	private List<AppointmentReminderTyps> remindTypes;
-	private List<RoomType> roomTypes;
 
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
 		configurationDao.getCryptKey();
-        if (userDao.count() < 1) {
-            makeDefaultScheme();
-            log.info("Default scheme created successfully");
-        } else {
-            log.info("Default scheme already created");
-        }
-        remindTypes = reminderTypeDao.getAppointmentReminderTypList(1L);
-        roomTypes = roomTypeDao.getAll(1L);
-    }
+		if (userDao.count() < 1) {
+			makeDefaultScheme();
+			log.info("Default scheme created successfully");
+		} else {
+			log.info("Default scheme already created");
+		}
+		if (configKeyCryptClassName == null) {
+			assertNotNull("Crypt class name should not be null", configurationDao.getCryptKey());
+		}
+	}
 
 	public Appointment createAppointment() {
 		Date appointmentstart = new Date();
@@ -109,14 +99,12 @@ public abstract class AbstractJUnitDefau
 		ap.setOwner(userDao.get(1L));
 		ap.setConnectedEvent(false);
 
-		if (ap.getRemind() == null && !remindTypes.isEmpty()) {
-			ap.setRemind(remindTypes.get(0));
+		if (ap.getReminder() == null) {
+			ap.setReminder(Appointment.Reminder.none);
 		}
 		
 		Room r = new Room();
-		if (!roomTypes.isEmpty()) {
-			r.setRoomtype(roomTypes.get(0));
-		}
+		r.setType(Room.Type.conference);
 		r.setAppointment(true);
 		ap.setRoom(r);
 		return ap;
@@ -156,7 +144,7 @@ public abstract class AbstractJUnitDefau
 		u.setLastname("lastname" + rnd);
 		u.setLogin("login" + rnd);
 		u.updatePassword(configurationDao, "pass" + rnd);
-		u.setLanguage_id(1L);
+		u.setLanguageId(1L);
 		return u;
 	}
 
@@ -180,7 +168,7 @@ public abstract class AbstractJUnitDefau
 	public User createUserContact(int rnd, Long ownerId) {
 		User user = userDao.getContact("email" + rnd, "firstname" + rnd, "lastname" + rnd, ownerId);
 		user = userDao.update(user, ownerId);
-		assertNotNull("Can't add user contact", user);
+		assertNotNull("Cann't add user", user);
 		return user;
 	}