openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebawag...@apache.org
Subject svn commit: r1442417 - in /openmeetings/trunk/singlewebapp: WebContent/WEB-INF/ src/org/apache/openmeetings/conference/ src/org/apache/openmeetings/data/whiteboard/ src/org/apache/openmeetings/data/whiteboard/dto/ src/org/apache/openmeetings/remote/ sr...
Date Mon, 04 Feb 2013 22:57:34 GMT
Author: sebawagner
Date: Mon Feb  4 22:57:33 2013
New Revision: 1442417

URL: http://svn.apache.org/viewvc?rev=1442417&view=rev
Log:
OPENMEETINGS-460 Restructure white-board server side classes into single package and separate
logic from DTOs/Beans

Added:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/EmoticonsManager.java
      - copied, changed from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/EmoticonsManager.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectListManagerById.java
      - copied, changed from r1442407, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManagerById.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectSyncManager.java
      - copied, changed from r1442407, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectSyncManager.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteboardManagement.java
      - copied, changed from r1442407, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardManagement.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/BrowserStatus.java
      - copied, changed from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/BrowserStatus.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/Cliparts.java
      - copied, changed from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/Cliparts.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/RoomStatus.java
      - copied, changed from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/RoomStatus.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObject.java
      - copied, changed from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardObject.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObjectList.java
      - copied, changed from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardObjectList.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardSyncLockObject.java
      - copied, changed from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardSyncLockObject.java
Removed:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/EmoticonsManager.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManagerById.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectSyncManager.java
Modified:
    openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java

Modified: openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1442417&r1=1442416&r2=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Mon Feb  4 22:57:33 2013
@@ -61,16 +61,16 @@
 	    </property>	
 	</bean>
 	<bean id="openmeetings.EmoticonsManager" 
-		class="org.apache.openmeetings.remote.red5.EmoticonsManager" />
+		class="org.apache.openmeetings.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.remote.red5.WhiteBoardObjectListManagerById" />
+	    class="org.apache.openmeetings.data.whiteboard.WhiteBoardObjectListManagerById" />
 	<!-- WhiteBoardObjectSyncManager can stay in the memory, even on cluster! -->
 	<bean id="whiteBoardObjectSyncManager" scope="singleton"  
-	    class="org.apache.openmeetings.remote.red5.WhiteBoardObjectSyncManager" />
+	    class="org.apache.openmeetings.data.whiteboard.WhiteBoardObjectSyncManager" />
 	
 	<!-- Database cache -->
 	<bean id="openmeetings.DatabaseStore"
@@ -283,7 +283,7 @@
 	<bean id="fileUtils" class="org.apache.openmeetings.data.file.FileUtils" />
 	<bean id="ldapLoginManagement" class="org.apache.openmeetings.ldap.LdapLoginManagement"
/>
 	<bean id="timezoneUtil" class="org.apache.openmeetings.utils.math.TimezoneUtil" />
-	<bean id="whiteboardManagement" class="org.apache.openmeetings.conference.whiteboard.WhiteboardManagement"
/>
+	<bean id="whiteboardManagement" class="org.apache.openmeetings.data.whiteboard.WhiteboardManagement"
/>
 	
 	<!-- Templates -->
 	<bean id="registerUserTemplate" class="org.apache.openmeetings.templates.RegisterUserTemplate"
/>

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/EmoticonsManager.java
(from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/EmoticonsManager.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/EmoticonsManager.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/EmoticonsManager.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/EmoticonsManager.java&r1=1439243&r2=1442417&rev=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/EmoticonsManager.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/EmoticonsManager.java
Mon Feb  4 22:57:33 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.remote.red5;
+package org.apache.openmeetings.data.whiteboard;
 
 import java.io.BufferedReader;
 import java.io.File;

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectListManagerById.java
(from r1442407, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManagerById.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectListManagerById.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectListManagerById.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManagerById.java&r1=1442407&r2=1442417&rev=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManagerById.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectListManagerById.java
Mon Feb  4 22:57:33 2013
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.remote.red5;
+package org.apache.openmeetings.data.whiteboard;
 
 import java.util.HashMap;
 
-import org.apache.openmeetings.conference.whiteboard.WhiteboardObject;
-import org.apache.openmeetings.conference.whiteboard.WhiteboardObjectList;
+import org.apache.openmeetings.data.whiteboard.dto.WhiteboardObject;
+import org.apache.openmeetings.data.whiteboard.dto.WhiteboardObjectList;
 
 /**
  * Memory based cache, configured as singleton in spring configuration

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectSyncManager.java
(from r1442407, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectSyncManager.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectSyncManager.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectSyncManager.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectSyncManager.java&r1=1442407&r2=1442417&rev=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectSyncManager.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteBoardObjectSyncManager.java
Mon Feb  4 22:57:33 2013
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.remote.red5;
+package org.apache.openmeetings.data.whiteboard;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.conference.whiteboard.WhiteboardSyncLockObject;
+import org.apache.openmeetings.data.whiteboard.dto.WhiteboardSyncLockObject;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteboardManagement.java
(from r1442407, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardManagement.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteboardManagement.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteboardManagement.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardManagement.java&r1=1442407&r2=1442417&rev=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardManagement.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/WhiteboardManagement.java
Mon Feb  4 22:57:33 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.conference.whiteboard;
+package org.apache.openmeetings.data.whiteboard;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.remote.red5.WhiteBoardObjectListManagerById;
+import org.apache.openmeetings.data.whiteboard.dto.WhiteboardObject;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/BrowserStatus.java
(from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/BrowserStatus.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/BrowserStatus.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/BrowserStatus.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/BrowserStatus.java&r1=1439243&r2=1442417&rev=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/BrowserStatus.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/BrowserStatus.java
Mon Feb  4 22:57:33 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.conference.whiteboard;
+package org.apache.openmeetings.data.whiteboard.dto;
 
 public class BrowserStatus {
 	

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/Cliparts.java
(from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/Cliparts.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/Cliparts.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/Cliparts.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/Cliparts.java&r1=1439243&r2=1442417&rev=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/Cliparts.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/Cliparts.java
Mon Feb  4 22:57:33 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.conference.whiteboard;
+package org.apache.openmeetings.data.whiteboard.dto;
 
 import java.util.List;
 

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/RoomStatus.java
(from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/RoomStatus.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/RoomStatus.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/RoomStatus.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/RoomStatus.java&r1=1439243&r2=1442417&rev=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/RoomStatus.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/RoomStatus.java
Mon Feb  4 22:57:33 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.conference.whiteboard;
+package org.apache.openmeetings.data.whiteboard.dto;
 
 import java.util.List;
 

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObject.java
(from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardObject.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObject.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObject.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardObject.java&r1=1439243&r2=1442417&rev=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardObject.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObject.java
Mon Feb  4 22:57:33 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.conference.whiteboard;
+package org.apache.openmeetings.data.whiteboard.dto;
 
 import java.util.Date;
 import java.util.HashMap;

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObjectList.java
(from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardObjectList.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObjectList.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObjectList.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardObjectList.java&r1=1439243&r2=1442417&rev=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardObjectList.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardObjectList.java
Mon Feb  4 22:57:33 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.conference.whiteboard;
+package org.apache.openmeetings.data.whiteboard.dto;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardSyncLockObject.java
(from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardSyncLockObject.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardSyncLockObject.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardSyncLockObject.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardSyncLockObject.java&r1=1439243&r2=1442417&rev=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardSyncLockObject.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/whiteboard/dto/WhiteboardSyncLockObject.java
Mon Feb  4 22:57:33 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.conference.whiteboard;
+package org.apache.openmeetings.data.whiteboard.dto;
 
 import java.util.Date;
 

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java?rev=1442417&r1=1442416&r2=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java Mon
Feb  4 22:57:33 2013
@@ -32,9 +32,9 @@ import java.util.Set;
 import org.apache.openmeetings.OpenmeetingsVariables;
 import org.apache.openmeetings.data.conference.Roommanagement;
 import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.data.whiteboard.EmoticonsManager;
 import org.apache.openmeetings.persistence.beans.rooms.Client;
 import org.apache.openmeetings.persistence.beans.rooms.Rooms;
-import org.apache.openmeetings.remote.red5.EmoticonsManager;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.apache.openmeetings.remote.util.SessionVariablesUtil;
 import org.apache.openmeetings.session.ISessionManager;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java?rev=1442417&r1=1442416&r2=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java
Mon Feb  4 22:57:33 2013
@@ -28,12 +28,12 @@ import java.util.Set;
 
 import org.apache.commons.transaction.util.FileHelper;
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.conference.whiteboard.WhiteboardManagement;
 import org.apache.openmeetings.data.basic.AuthLevelmanagement;
 import org.apache.openmeetings.data.basic.Sessionmanagement;
 import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
 import org.apache.openmeetings.data.file.dto.LibraryPresentation;
 import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.data.whiteboard.WhiteboardManagement;
 import org.apache.openmeetings.documents.LibraryChartLoader;
 import org.apache.openmeetings.documents.LibraryDocumentConverter;
 import org.apache.openmeetings.documents.LibraryWmlLoader;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java?rev=1442417&r1=1442416&r2=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java
Mon Feb  4 22:57:33 2013
@@ -29,17 +29,17 @@ import java.util.LinkedList;
 import java.util.Map;
 
 import org.apache.commons.collections.ComparatorUtils;
-import org.apache.openmeetings.conference.whiteboard.Cliparts;
-import org.apache.openmeetings.conference.whiteboard.WhiteboardObject;
-import org.apache.openmeetings.conference.whiteboard.WhiteboardObjectList;
-import org.apache.openmeetings.conference.whiteboard.WhiteboardSyncLockObject;
 import org.apache.openmeetings.data.basic.AuthLevelmanagement;
 import org.apache.openmeetings.data.basic.Sessionmanagement;
 import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.data.whiteboard.WhiteBoardObjectListManagerById;
+import org.apache.openmeetings.data.whiteboard.WhiteBoardObjectSyncManager;
+import org.apache.openmeetings.data.whiteboard.dto.Cliparts;
+import org.apache.openmeetings.data.whiteboard.dto.WhiteboardObject;
+import org.apache.openmeetings.data.whiteboard.dto.WhiteboardObjectList;
+import org.apache.openmeetings.data.whiteboard.dto.WhiteboardSyncLockObject;
 import org.apache.openmeetings.persistence.beans.rooms.Client;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.remote.red5.WhiteBoardObjectSyncManager;
-import org.apache.openmeetings.remote.red5.WhiteBoardObjectListManagerById;
 import org.apache.openmeetings.session.ISessionManager;
 import org.apache.openmeetings.utils.OmFileHelper;
 import org.red5.logging.Red5LoggerFactory;

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1442417&r1=1442416&r2=1442417&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Mon Feb  4 22:57:33 2013
@@ -30,9 +30,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.conference.whiteboard.BrowserStatus;
-import org.apache.openmeetings.conference.whiteboard.RoomStatus;
-import org.apache.openmeetings.conference.whiteboard.WhiteboardManagement;
 import org.apache.openmeetings.data.basic.Sessionmanagement;
 import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
 import org.apache.openmeetings.data.basic.dao.ServerDao;
@@ -43,6 +40,10 @@ import org.apache.openmeetings.data.conf
 import org.apache.openmeetings.data.logs.ConferenceLogDao;
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.whiteboard.EmoticonsManager;
+import org.apache.openmeetings.data.whiteboard.WhiteboardManagement;
+import org.apache.openmeetings.data.whiteboard.dto.BrowserStatus;
+import org.apache.openmeetings.data.whiteboard.dto.RoomStatus;
 import org.apache.openmeetings.documents.beans.UploadCompleteMessage;
 import org.apache.openmeetings.persistence.beans.basic.Server;
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;



Mime
View raw message