From f3ee30102893223b90269e9e2fbfa970d3b2a1c5 Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Sun, 21 Sep 2008 17:48:08 +0000 Subject: [PATCH] Change packaging and fix compile errors git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@484 af16638f-c34d-0410-8cfa-b39d5352b314 --- .../fileupload/ISlideDatabase.java | 2 +- .../fileupload/SlideDescriptor.java | 2 +- .../fileupload/document/BaseException.java | 2 +- .../document/IProgressListener.java | 2 +- .../fileupload/document/ISlideManager.java | 4 ++-- .../document/LogProgressListener.java | 2 +- .../document/NullProgressListener.java | 4 ++-- ...upportedPresentationDocumentException.java | 4 ++-- .../document/ZipDocumentHandler.java | 2 +- .../document/impl/FileSystemSlideManager.java | 6 ++--- .../fileupload/document/impl/Helper.java | 2 +- .../document/impl/OOOConnection.java | 2 +- .../fileupload/document/impl/OOODocument.java | 2 +- .../fileupload/document/impl/PageHelper.java | 2 +- .../impl/PdfToSwfDocumentHandler.java | 2 +- .../document/impl/PptDocumentHandler.java | 4 ++-- .../document/impl/PptToJpegConverter.java | 2 +- .../document/impl/PptToSwfConverter.java | 2 +- .../impl/PptToSwfDocumentHandler.java | 2 +- .../fileupload/document/impl/ReturnCode.java | 2 +- .../fileupload/document/impl/SlideInfo.java | 4 ++-- .../document/impl/UpdatesMessageSender.java | 2 +- .../fileupload/manager/UploadListener.java | 4 ++-- .../manager/UploadListenerManager.java | 2 +- .../fileupload/manager/UploadMonitor.java | 2 +- .../fileupload/web/FileUploadController.java | 10 ++++---- .../web/SlidePresentationDocument.java | 24 +++++++++---------- 27 files changed, 50 insertions(+), 50 deletions(-) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/ISlideDatabase.java (94%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/SlideDescriptor.java (93%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/BaseException.java (93%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/IProgressListener.java (92%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/ISlideManager.java (91%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/LogProgressListener.java (93%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/NullProgressListener.java (88%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/UnsupportedPresentationDocumentException.java (91%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/ZipDocumentHandler.java (96%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/impl/FileSystemSlideManager.java (95%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/impl/Helper.java (96%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/impl/OOOConnection.java (93%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/impl/OOODocument.java (93%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/impl/PageHelper.java (96%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/impl/PdfToSwfDocumentHandler.java (96%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/impl/PptDocumentHandler.java (95%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/impl/PptToJpegConverter.java (96%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/impl/PptToSwfConverter.java (96%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/impl/PptToSwfDocumentHandler.java (95%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/impl/ReturnCode.java (93%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/impl/SlideInfo.java (88%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/document/impl/UpdatesMessageSender.java (95%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/manager/UploadListener.java (90%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/manager/UploadListenerManager.java (94%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/manager/UploadMonitor.java (94%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/web/FileUploadController.java (94%) rename bigbluebutton-servlet/src/org/{bigbluebuttonproject => bigbluebutton}/fileupload/web/SlidePresentationDocument.java (89%) diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/ISlideDatabase.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/ISlideDatabase.java similarity index 94% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/ISlideDatabase.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/ISlideDatabase.java index fe7a127ea5..7823366cb3 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/ISlideDatabase.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/ISlideDatabase.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload; +package org.bigbluebutton.fileupload; import java.io.File; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/SlideDescriptor.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/SlideDescriptor.java similarity index 93% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/SlideDescriptor.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/SlideDescriptor.java index 2bdc846955..f7b4159458 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/SlideDescriptor.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/SlideDescriptor.java @@ -19,7 +19,7 @@ */ -package org.bigbluebuttonproject.fileupload; +package org.bigbluebutton.fileupload; import org.springframework.util.Assert; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/BaseException.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/BaseException.java similarity index 93% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/BaseException.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/BaseException.java index b8470ece6e..53f451dcd2 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/BaseException.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/BaseException.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.document; +package org.bigbluebutton.fileupload.document; // TODO: Auto-generated Javadoc /** diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/IProgressListener.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/IProgressListener.java similarity index 92% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/IProgressListener.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/IProgressListener.java index e17ad0f70c..95aeaf07ff 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/IProgressListener.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/IProgressListener.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.document; +package org.bigbluebutton.fileupload.document; // TODO: Auto-generated Javadoc /** diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/ISlideManager.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/ISlideManager.java similarity index 91% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/ISlideManager.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/ISlideManager.java index 57d5dc9e3c..40f1f61209 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/ISlideManager.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/ISlideManager.java @@ -18,14 +18,14 @@ * */ -package org.bigbluebuttonproject.fileupload.document; +package org.bigbluebutton.fileupload.document; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.List; -import org.bigbluebuttonproject.fileupload.SlideDescriptor; +import org.bigbluebutton.fileupload.SlideDescriptor; import org.springframework.web.multipart.MultipartFile; // TODO: Auto-generated Javadoc diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/LogProgressListener.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/LogProgressListener.java similarity index 93% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/LogProgressListener.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/LogProgressListener.java index afab053350..6d698c77ab 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/LogProgressListener.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/LogProgressListener.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.document; +package org.bigbluebutton.fileupload.document; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/NullProgressListener.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/NullProgressListener.java similarity index 88% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/NullProgressListener.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/NullProgressListener.java index 901c56c3ce..d6b5ea36ac 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/NullProgressListener.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/NullProgressListener.java @@ -18,9 +18,9 @@ * */ -package org.bigbluebuttonproject.fileupload.document; +package org.bigbluebutton.fileupload.document; -import org.bigbluebuttonproject.fileupload.document.IProgressListener; +import org.bigbluebutton.fileupload.document.IProgressListener; // TODO: Auto-generated Javadoc /** diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/UnsupportedPresentationDocumentException.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/UnsupportedPresentationDocumentException.java similarity index 91% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/UnsupportedPresentationDocumentException.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/UnsupportedPresentationDocumentException.java index 8e79479c62..c2291fd6e9 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/UnsupportedPresentationDocumentException.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/UnsupportedPresentationDocumentException.java @@ -18,9 +18,9 @@ * */ -package org.bigbluebuttonproject.fileupload.document; +package org.bigbluebutton.fileupload.document; -import org.bigbluebuttonproject.fileupload.document.BaseException; +import org.bigbluebutton.fileupload.document.BaseException; // TODO: Auto-generated Javadoc /** diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/ZipDocumentHandler.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/ZipDocumentHandler.java similarity index 96% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/ZipDocumentHandler.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/ZipDocumentHandler.java index c4c925c703..8daca9072d 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/ZipDocumentHandler.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/ZipDocumentHandler.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.document; +package org.bigbluebutton.fileupload.document; import java.io.BufferedOutputStream; import java.io.File; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/FileSystemSlideManager.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/FileSystemSlideManager.java similarity index 95% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/FileSystemSlideManager.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/FileSystemSlideManager.java index 829b1937d1..264db44777 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/FileSystemSlideManager.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/FileSystemSlideManager.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.document.impl; +package org.bigbluebutton.fileupload.document.impl; import java.awt.Graphics2D; import java.awt.Image; @@ -47,8 +47,8 @@ import javax.imageio.stream.ImageOutputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.bigbluebuttonproject.fileupload.ISlideDatabase; -import org.bigbluebuttonproject.fileupload.SlideDescriptor; +import org.bigbluebutton.fileupload.ISlideDatabase; +import org.bigbluebutton.fileupload.SlideDescriptor; import org.springframework.util.FileCopyUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/Helper.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/Helper.java similarity index 96% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/Helper.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/Helper.java index cc87dc7dd2..12db6e2e7e 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/Helper.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/Helper.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.document.impl; +package org.bigbluebutton.fileupload.document.impl; //from Helper.java sample from OpenOffice.org SDK diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/OOOConnection.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/OOOConnection.java similarity index 93% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/OOOConnection.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/OOOConnection.java index 82ce34eee2..88c47b1819 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/OOOConnection.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/OOOConnection.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.document.impl; +package org.bigbluebutton.fileupload.document.impl; import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiComponentFactory; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/OOODocument.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/OOODocument.java similarity index 93% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/OOODocument.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/OOODocument.java index fa765dd26a..8ea6c9aafe 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/OOODocument.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/OOODocument.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.document.impl; +package org.bigbluebutton.fileupload.document.impl; import com.sun.star.lang.XComponent; import com.sun.star.uno.XComponentContext; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PageHelper.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PageHelper.java similarity index 96% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PageHelper.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PageHelper.java index d10ed2904e..90c4d0e7c3 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PageHelper.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PageHelper.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.document.impl; +package org.bigbluebutton.fileupload.document.impl; //from PageHelper.java sample from OpenOffice.org SDK diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PdfToSwfDocumentHandler.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PdfToSwfDocumentHandler.java similarity index 96% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PdfToSwfDocumentHandler.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PdfToSwfDocumentHandler.java index bf0089ff6c..b64fd7dad1 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PdfToSwfDocumentHandler.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PdfToSwfDocumentHandler.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.document.impl; +package org.bigbluebutton.fileupload.document.impl; import java.io.BufferedReader; import java.io.File; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PptDocumentHandler.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PptDocumentHandler.java similarity index 95% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PptDocumentHandler.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PptDocumentHandler.java index 12b6de73ab..c7dc892988 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PptDocumentHandler.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PptDocumentHandler.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.document.impl; +package org.bigbluebutton.fileupload.document.impl; import com.sun.star.uno.UnoRuntime; import com.sun.star.lang.*; @@ -34,7 +34,7 @@ import com.sun.star.document.XFilter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.bigbluebuttonproject.fileupload.document.IProgressListener; +import org.bigbluebutton.fileupload.document.IProgressListener; import java.io.*; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PptToJpegConverter.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PptToJpegConverter.java similarity index 96% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PptToJpegConverter.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PptToJpegConverter.java index 9db9c0b27c..a853deb845 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PptToJpegConverter.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PptToJpegConverter.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.document.impl; +package org.bigbluebutton.fileupload.document.impl; import com.sun.star.uno.UnoRuntime; import com.sun.star.lang.*; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PptToSwfConverter.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PptToSwfConverter.java similarity index 96% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PptToSwfConverter.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PptToSwfConverter.java index 380cf11fb7..b9ae1709c8 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PptToSwfConverter.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PptToSwfConverter.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.document.impl; +package org.bigbluebutton.fileupload.document.impl; import java.io.BufferedReader; import java.io.File; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PptToSwfDocumentHandler.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PptToSwfDocumentHandler.java similarity index 95% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PptToSwfDocumentHandler.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PptToSwfDocumentHandler.java index 020a663d5d..7214721576 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/PptToSwfDocumentHandler.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/PptToSwfDocumentHandler.java @@ -19,7 +19,7 @@ */ -package org.bigbluebuttonproject.fileupload.document.impl; +package org.bigbluebutton.fileupload.document.impl; import java.io.File; import java.net.ConnectException; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/ReturnCode.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/ReturnCode.java similarity index 93% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/ReturnCode.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/ReturnCode.java index 7e695e05a8..640de7ddaa 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/ReturnCode.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/ReturnCode.java @@ -19,7 +19,7 @@ */ -package org.bigbluebuttonproject.fileupload.document.impl; +package org.bigbluebutton.fileupload.document.impl; /** diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/SlideInfo.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/SlideInfo.java similarity index 88% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/SlideInfo.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/SlideInfo.java index d6ea1e7b4c..0fbd9e4861 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/SlideInfo.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/SlideInfo.java @@ -18,9 +18,9 @@ * */ -package org.bigbluebuttonproject.fileupload.document.impl; +package org.bigbluebutton.fileupload.document.impl; -import org.bigbluebuttonproject.fileupload.document.impl.PptToJpegConverter; +import org.bigbluebutton.fileupload.document.impl.PptToJpegConverter; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/UpdatesMessageSender.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/UpdatesMessageSender.java similarity index 95% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/UpdatesMessageSender.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/UpdatesMessageSender.java index 916619ec7e..c142de9b1c 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/document/impl/UpdatesMessageSender.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/document/impl/UpdatesMessageSender.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.document.impl; +package org.bigbluebutton.fileupload.document.impl; import javax.jms.Destination; import javax.jms.JMSException; import javax.jms.Message; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/manager/UploadListener.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/manager/UploadListener.java similarity index 90% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/manager/UploadListener.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/manager/UploadListener.java index 3d74d0aa6e..ec90a7f78f 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/manager/UploadListener.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/manager/UploadListener.java @@ -18,11 +18,11 @@ * */ -package org.bigbluebuttonproject.fileupload.manager; +package org.bigbluebutton.fileupload.manager; import java.util.ArrayList; -import org.blindsideproject.fileupload.document.IProgressListener; +import org.bigbluebutton.fileupload.document.IProgressListener; // TODO: Auto-generated Javadoc /** diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/manager/UploadListenerManager.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/manager/UploadListenerManager.java similarity index 94% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/manager/UploadListenerManager.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/manager/UploadListenerManager.java index 0f8faa9e9d..2605833d1f 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/manager/UploadListenerManager.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/manager/UploadListenerManager.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.manager; +package org.bigbluebutton.fileupload.manager; import java.util.HashMap; import java.util.Map; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/manager/UploadMonitor.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/manager/UploadMonitor.java similarity index 94% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/manager/UploadMonitor.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/manager/UploadMonitor.java index 8484b1db77..f10e3292b6 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/manager/UploadMonitor.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/manager/UploadMonitor.java @@ -19,7 +19,7 @@ */ -package org.bigbluebuttonproject.fileupload.manager; +package org.bigbluebutton.fileupload.manager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/web/FileUploadController.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/web/FileUploadController.java similarity index 94% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/web/FileUploadController.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/web/FileUploadController.java index 50375e761e..a6806ad8ec 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/web/FileUploadController.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/web/FileUploadController.java @@ -18,7 +18,7 @@ * */ -package org.bigbluebuttonproject.fileupload.web; +package org.bigbluebutton.fileupload.web; import java.io.File; import java.io.IOException; @@ -29,10 +29,10 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.bigbluebuttonproject.fileupload.ISlideDatabase; -import org.bigbluebuttonproject.fileupload.SlideDescriptor; -import org.bigbluebuttonproject.fileupload.document.UnsupportedPresentationDocumentException; -import org.bigbluebuttonproject.fileupload.document.BaseException; +import org.bigbluebutton.fileupload.ISlideDatabase; +import org.bigbluebutton.fileupload.SlideDescriptor; +import org.bigbluebutton.fileupload.document.BaseException; +import org.bigbluebutton.fileupload.document.UnsupportedPresentationDocumentException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/web/SlidePresentationDocument.java b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/web/SlidePresentationDocument.java similarity index 89% rename from bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/web/SlidePresentationDocument.java rename to bigbluebutton-servlet/src/org/bigbluebutton/fileupload/web/SlidePresentationDocument.java index 60338a6d38..e89ddc4da0 100644 --- a/bigbluebutton-servlet/src/org/bigbluebuttonproject/fileupload/web/SlidePresentationDocument.java +++ b/bigbluebutton-servlet/src/org/bigbluebutton/fileupload/web/SlidePresentationDocument.java @@ -18,19 +18,19 @@ * */ -package org.bigbluebuttonproject.fileupload.web; +package org.bigbluebutton.fileupload.web; -import org.bigbluebuttonproject.fileupload.document.UnsupportedPresentationDocumentException; -import org.bigbluebuttonproject.fileupload.document.ZipDocumentHandler; -import org.bigbluebuttonproject.fileupload.document.impl.FileSystemSlideManager; -import org.bigbluebuttonproject.fileupload.document.impl.PdfToSwfDocumentHandler; -import org.bigbluebuttonproject.fileupload.document.impl.PptDocumentHandler; -import org.bigbluebuttonproject.fileupload.document.impl.PptToSwfDocumentHandler; -import org.bigbluebuttonproject.fileupload.document.impl.ReturnCode; -import org.bigbluebuttonproject.fileupload.document.impl.UpdatesMessageSender; -import org.bigbluebuttonproject.fileupload.manager.UploadListener; -import org.bigbluebuttonproject.fileupload.manager.UploadListenerManager; -import org.bigbluebuttonproject.fileupload.manager.UploadMonitor; +import org.bigbluebutton.fileupload.document.UnsupportedPresentationDocumentException; +import org.bigbluebutton.fileupload.document.ZipDocumentHandler; +import org.bigbluebutton.fileupload.document.impl.FileSystemSlideManager; +import org.bigbluebutton.fileupload.document.impl.PdfToSwfDocumentHandler; +import org.bigbluebutton.fileupload.document.impl.PptDocumentHandler; +import org.bigbluebutton.fileupload.document.impl.PptToSwfDocumentHandler; +import org.bigbluebutton.fileupload.document.impl.ReturnCode; +import org.bigbluebutton.fileupload.document.impl.UpdatesMessageSender; +import org.bigbluebutton.fileupload.manager.UploadListener; +import org.bigbluebutton.fileupload.manager.UploadListenerManager; +import org.bigbluebutton.fileupload.manager.UploadMonitor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;