You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/09/12 07:36:41 UTC
svn commit: r1522451 - in /openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings: cluster/beans/ data/basic/dao/ data/beans/files/ data/calendar/daos/ data/chat/ data/conference/dao/ data/file/dao/ data/file/dto/ data/logs/ data/oauth/ ...

Author: solomax
Date: Thu Sep 12 05:36:40 2013
New Revision: 1522451

URL: http://svn.apache.org/r1522451
Log:
[OPENMEETINGS-772] empty folders are cleaned up; dto objects are moved to appropriate place

Added:
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/FilesObject.java
      - copied, changed from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/FilesObject.java
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/FoldersObject.java
      - copied, changed from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/FoldersObject.java
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LiberaryObject.java
      - copied, changed from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/LiberaryObject.java
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java
      - copied, changed from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/PresentationObject.java
Removed:
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cluster/beans/
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/chat/
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dao/
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/file/dto/
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/logs/
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/oauth/
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/dto/
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/oauth/
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/
Modified:
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LoadLibraryPresentationToObject.java

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/FilesObject.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/FilesObject.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/FilesObject.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/FilesObject.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/FilesObject.java&r1=1522099&r2=1522451&rev=1522451&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/FilesObject.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/FilesObject.java Thu Sep 12 05:36:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.data.beans.files;
+package org.apache.openmeetings.db.dto.file;
 
 /**
  * This Object will represent a File on the File-System

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/FoldersObject.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/FoldersObject.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/FoldersObject.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/FoldersObject.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/FoldersObject.java&r1=1522099&r2=1522451&rev=1522451&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/FoldersObject.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/FoldersObject.java Thu Sep 12 05:36:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.data.beans.files;
+package org.apache.openmeetings.db.dto.file;
 /**
  * Represents a Folder in the File System
  * @author sebastianwagner

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LiberaryObject.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/LiberaryObject.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LiberaryObject.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LiberaryObject.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/LiberaryObject.java&r1=1522099&r2=1522451&rev=1522451&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/LiberaryObject.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/LiberaryObject.java Thu Sep 12 05:36:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.data.beans.files;
+package org.apache.openmeetings.db.dto.file;
 /**
  * Response of one Library-Files-Request
  * @author sebastianwagner

Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java (from r1522099, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/PresentationObject.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/PresentationObject.java&r1=1522099&r2=1522451&rev=1522451&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/files/PresentationObject.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java Thu Sep 12 05:36:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.data.beans.files;
+package org.apache.openmeetings.db.dto.file;
 
 import java.util.LinkedList;
 /**

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LoadLibraryPresentationToObject.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LoadLibraryPresentationToObject.java?rev=1522451&r1=1522450&r2=1522451&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LoadLibraryPresentationToObject.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/LoadLibraryPresentationToObject.java Thu Sep 12 05:36:40 2013
@@ -22,8 +22,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.beans.files.FilesObject;
-import org.apache.openmeetings.data.beans.files.PresentationObject;
+import org.apache.openmeetings.db.dto.file.FilesObject;
+import org.apache.openmeetings.db.dto.file.PresentationObject;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;