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 2012/09/10 05:56:07 UTC
svn commit: r1382635 [7/9] - in /incubator/openmeetings/trunk/singlewebapp:
./ WebContent/WEB-INF/ WebContent/red5/ docs/ src/ src/META-INF/
src/org/apache/ src/org/apache/openmeetings/
src/org/apache/openmeetings/axis/ src/org/apache/openmeetings/axis...
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/CoreScreenShare.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/CoreScreenShare.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/CoreScreenShare.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart;
+package org.apache.openmeetings.screen.webstart;
import java.awt.MouseInfo;
import java.awt.Point;
@@ -35,8 +35,8 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.openmeetings.screen.webstart.gui.ScreenDimensions;
-import org.openmeetings.screen.webstart.gui.ScreenSharerFrame;
+import org.apache.openmeetings.screen.webstart.gui.ScreenDimensions;
+import org.apache.openmeetings.screen.webstart.gui.ScreenSharerFrame;
import org.red5.client.net.rtmp.INetStreamEventHandler;
import org.red5.io.utils.ObjectMap;
import org.red5.server.api.event.IEvent;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/IScreenEncoder.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenEncoder.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/IScreenEncoder.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/IScreenEncoder.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenEncoder.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenEncoder.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/IScreenEncoder.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart;
+package org.apache.openmeetings.screen.webstart;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/IScreenShare.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/IScreenShare.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/IScreenShare.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/IScreenShare.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart;
+package org.apache.openmeetings.screen.webstart;
import org.red5.client.net.rtmp.INetStreamEventHandler;
import org.red5.server.api.service.IPendingServiceCallback;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPClientPublish.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPClientPublish.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPClientPublish.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart;
+package org.apache.openmeetings.screen.webstart;
import org.red5.client.net.rtmp.ClientExceptionHandler;
import org.red5.client.net.rtmp.INetStreamEventHandler;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPSScreenShare.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPSScreenShare.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPSScreenShare.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart;
+package org.apache.openmeetings.screen.webstart;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPScreenShare.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPScreenShare.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPScreenShare.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart;
+package org.apache.openmeetings.screen.webstart;
import org.red5.client.net.rtmp.ClientExceptionHandler;
import org.red5.client.net.rtmp.RTMPClient;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPTScreenShare.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPTScreenShare.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPTScreenShare.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart;
+package org.apache.openmeetings.screen.webstart;
import org.red5.client.net.rtmp.ClientExceptionHandler;
import org.red5.client.net.rtmpt.RTMPTClient;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/ScreenV1Encoder.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenV1Encoder.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/ScreenV1Encoder.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/ScreenV1Encoder.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenV1Encoder.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenV1Encoder.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/ScreenV1Encoder.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart;
+package org.apache.openmeetings.screen.webstart;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/BlankArea.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/BlankArea.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/BlankArea.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/BlankArea.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart.gui;
+package org.apache.openmeetings.screen.webstart.gui;
import javax.swing.*;
import java.awt.Dimension;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/MouseListenerable.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/MouseListenerable.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/MouseListenerable.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/MouseListenerable.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart.gui;
+package org.apache.openmeetings.screen.webstart.gui;
import java.awt.event.MouseAdapter;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/NumberSpinner.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/NumberSpinner.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/NumberSpinner.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/NumberSpinner.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart.gui;
+package org.apache.openmeetings.screen.webstart.gui;
import javax.swing.JSpinner;
import javax.swing.SpinnerNumberModel;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenDimensions.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenDimensions.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenDimensions.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenDimensions.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart.gui;
+package org.apache.openmeetings.screen.webstart.gui;
import java.awt.Dimension;
import java.awt.Toolkit;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenHeightMouseListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenHeightMouseListener.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenHeightMouseListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenHeightMouseListener.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart.gui;
+package org.apache.openmeetings.screen.webstart.gui;
import java.awt.Component;
import java.awt.Cursor;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenKeyListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenKeyListener.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenKeyListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenKeyListener.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart.gui;
+package org.apache.openmeetings.screen.webstart.gui;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenMouseListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenMouseListener.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenMouseListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenMouseListener.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart.gui;
+package org.apache.openmeetings.screen.webstart.gui;
import java.awt.Component;
import java.awt.Cursor;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart.gui;
+package org.apache.openmeetings.screen.webstart.gui;
import java.awt.AWTException;
import java.awt.Color;
@@ -50,8 +50,8 @@ import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
-import org.openmeetings.screen.webstart.CoreScreenShare;
-import org.openmeetings.screen.webstart.gui.ScreenDimensions.ScreenQuality;
+import org.apache.openmeetings.screen.webstart.CoreScreenShare;
+import org.apache.openmeetings.screen.webstart.gui.ScreenDimensions.ScreenQuality;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenWidthMouseListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenWidthMouseListener.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenWidthMouseListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenWidthMouseListener.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart.gui;
+package org.apache.openmeetings.screen.webstart.gui;
import java.awt.Component;
import java.awt.Cursor;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenXMouseListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenXMouseListener.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenXMouseListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenXMouseListener.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart.gui;
+package org.apache.openmeetings.screen.webstart.gui;
import java.awt.Component;
import java.awt.Cursor;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenYMouseListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenYMouseListener.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenYMouseListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenYMouseListener.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.screen.webstart.gui;
+package org.apache.openmeetings.screen.webstart.gui;
import java.awt.Component;
import java.awt.Cursor;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/AbstractUploadController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/AbstractUploadController.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/AbstractUploadController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/AbstractUploadController.java Mon Sep 10 03:55:51 2012
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.AuthLevelmanagement;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.Sessionmanagement;
-import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.utils.ImportHelper;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.AuthLevelmanagement;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.utils.ImportHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java Mon Sep 10 03:55:51 2012
@@ -16,23 +16,23 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.util.Date;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.Fieldmanagment;
+import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
+import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.view.VelocityViewServlet;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
-import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.File;
import java.io.FileNotFoundException;
@@ -36,54 +36,54 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.transaction.util.FileHelper;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.backup.AppointmentCategoryConverter;
-import org.openmeetings.app.backup.AppointmentConverter;
-import org.openmeetings.app.backup.AppointmentReminderTypeConverter;
-import org.openmeetings.app.backup.DateConverter;
-import org.openmeetings.app.backup.OmTimeZoneConverter;
-import org.openmeetings.app.backup.OrganisationConverter;
-import org.openmeetings.app.backup.PollTypeConverter;
-import org.openmeetings.app.backup.RoomConverter;
-import org.openmeetings.app.backup.RoomTypeConverter;
-import org.openmeetings.app.backup.StateConverter;
-import org.openmeetings.app.backup.UserConverter;
-import org.openmeetings.app.data.basic.AuthLevelmanagement;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.Sessionmanagement;
-import org.openmeetings.app.data.basic.dao.LdapConfigDaoImpl;
-import org.openmeetings.app.data.calendar.daos.AppointmentDaoImpl;
-import org.openmeetings.app.data.calendar.daos.MeetingMemberDaoImpl;
-import org.openmeetings.app.data.conference.PollManagement;
-import org.openmeetings.app.data.conference.Roommanagement;
-import org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
-import org.openmeetings.app.data.file.dao.FileExplorerItemDaoImpl;
-import org.openmeetings.app.data.flvrecord.FlvRecordingDaoImpl;
-import org.openmeetings.app.data.flvrecord.FlvRecordingMetaDataDaoImpl;
-import org.openmeetings.app.data.user.Organisationmanagement;
-import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.data.user.dao.PrivateMessageFolderDaoImpl;
-import org.openmeetings.app.data.user.dao.PrivateMessagesDaoImpl;
-import org.openmeetings.app.data.user.dao.UserContactsDaoImpl;
-import org.openmeetings.app.data.user.dao.UsersDaoImpl;
-import org.openmeetings.app.persistence.beans.adresses.States;
-import org.openmeetings.app.persistence.beans.basic.Configuration;
-import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
-import org.openmeetings.app.persistence.beans.calendar.Appointment;
-import org.openmeetings.app.persistence.beans.calendar.AppointmentCategory;
-import org.openmeetings.app.persistence.beans.calendar.AppointmentReminderTyps;
-import org.openmeetings.app.persistence.beans.domain.Organisation;
-import org.openmeetings.app.persistence.beans.files.FileExplorerItem;
-import org.openmeetings.app.persistence.beans.flvrecord.FlvRecording;
-import org.openmeetings.app.persistence.beans.poll.PollType;
-import org.openmeetings.app.persistence.beans.poll.RoomPoll;
-import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
-import org.openmeetings.app.persistence.beans.rooms.Rooms;
-import org.openmeetings.app.persistence.beans.user.PrivateMessages;
-import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
-import org.openmeetings.utils.OmFileHelper;
-import org.openmeetings.utils.math.CalendarPatterns;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.backup.AppointmentCategoryConverter;
+import org.apache.openmeetings.backup.AppointmentConverter;
+import org.apache.openmeetings.backup.AppointmentReminderTypeConverter;
+import org.apache.openmeetings.backup.DateConverter;
+import org.apache.openmeetings.backup.OmTimeZoneConverter;
+import org.apache.openmeetings.backup.OrganisationConverter;
+import org.apache.openmeetings.backup.PollTypeConverter;
+import org.apache.openmeetings.backup.RoomConverter;
+import org.apache.openmeetings.backup.RoomTypeConverter;
+import org.apache.openmeetings.backup.StateConverter;
+import org.apache.openmeetings.backup.UserConverter;
+import org.apache.openmeetings.data.basic.AuthLevelmanagement;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.basic.dao.LdapConfigDaoImpl;
+import org.apache.openmeetings.data.calendar.daos.AppointmentDaoImpl;
+import org.apache.openmeetings.data.calendar.daos.MeetingMemberDaoImpl;
+import org.apache.openmeetings.data.conference.PollManagement;
+import org.apache.openmeetings.data.conference.Roommanagement;
+import org.apache.openmeetings.data.conference.dao.RoomModeratorsDaoImpl;
+import org.apache.openmeetings.data.file.dao.FileExplorerItemDaoImpl;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingDaoImpl;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDaoImpl;
+import org.apache.openmeetings.data.user.Organisationmanagement;
+import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.data.user.dao.PrivateMessageFolderDaoImpl;
+import org.apache.openmeetings.data.user.dao.PrivateMessagesDaoImpl;
+import org.apache.openmeetings.data.user.dao.UserContactsDaoImpl;
+import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.persistence.beans.adresses.States;
+import org.apache.openmeetings.persistence.beans.basic.Configuration;
+import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
+import org.apache.openmeetings.persistence.beans.calendar.Appointment;
+import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
+import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.persistence.beans.domain.Organisation;
+import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
+import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
+import org.apache.openmeetings.persistence.beans.poll.PollType;
+import org.apache.openmeetings.persistence.beans.poll.RoomPoll;
+import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
+import org.apache.openmeetings.persistence.beans.rooms.Rooms;
+import org.apache.openmeetings.persistence.beans.user.PrivateMessages;
+import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
+import org.apache.openmeetings.utils.OmFileHelper;
+import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.simpleframework.xml.Serializer;
import org.simpleframework.xml.convert.Registry;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExportFacade.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExportFacade.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExportFacade.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExportFacade.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.IOException;
import java.io.OutputStream;
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.File;
import java.io.FileInputStream;
@@ -43,72 +43,72 @@ import javax.xml.transform.dom.DOMSource
import javax.xml.transform.stream.StreamResult;
import org.apache.commons.transaction.util.FileHelper;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.backup.AppointmentCategoryConverter;
-import org.openmeetings.app.backup.AppointmentConverter;
-import org.openmeetings.app.backup.AppointmentReminderTypeConverter;
-import org.openmeetings.app.backup.DateConverter;
-import org.openmeetings.app.backup.IntegerTransform;
-import org.openmeetings.app.backup.LongTransform;
-import org.openmeetings.app.backup.OmTimeZoneConverter;
-import org.openmeetings.app.backup.OrganisationConverter;
-import org.openmeetings.app.backup.PollTypeConverter;
-import org.openmeetings.app.backup.RoomConverter;
-import org.openmeetings.app.backup.RoomTypeConverter;
-import org.openmeetings.app.backup.StateConverter;
-import org.openmeetings.app.backup.UserConverter;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.dao.LdapConfigDaoImpl;
-import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
-import org.openmeetings.app.data.basic.dao.ServerDaoImpl;
-import org.openmeetings.app.data.calendar.daos.AppointmentCategoryDaoImpl;
-import org.openmeetings.app.data.calendar.daos.AppointmentDaoImpl;
-import org.openmeetings.app.data.calendar.daos.AppointmentReminderTypDaoImpl;
-import org.openmeetings.app.data.calendar.daos.MeetingMemberDaoImpl;
-import org.openmeetings.app.data.conference.PollManagement;
-import org.openmeetings.app.data.conference.Roommanagement;
-import org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl;
-import org.openmeetings.app.data.file.dao.FileExplorerItemDaoImpl;
-import org.openmeetings.app.data.flvrecord.FlvRecordingDaoImpl;
-import org.openmeetings.app.data.flvrecord.FlvRecordingMetaDataDaoImpl;
-import org.openmeetings.app.data.user.Organisationmanagement;
-import org.openmeetings.app.data.user.Statemanagement;
-import org.openmeetings.app.data.user.dao.PrivateMessageFolderDaoImpl;
-import org.openmeetings.app.data.user.dao.PrivateMessagesDaoImpl;
-import org.openmeetings.app.data.user.dao.UserContactsDaoImpl;
-import org.openmeetings.app.data.user.dao.UsersDaoImpl;
-import org.openmeetings.app.persistence.beans.adresses.Adresses;
-import org.openmeetings.app.persistence.beans.adresses.States;
-import org.openmeetings.app.persistence.beans.basic.Configuration;
-import org.openmeetings.app.persistence.beans.basic.LdapConfig;
-import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
-import org.openmeetings.app.persistence.beans.basic.Server;
-import org.openmeetings.app.persistence.beans.calendar.Appointment;
-import org.openmeetings.app.persistence.beans.calendar.AppointmentCategory;
-import org.openmeetings.app.persistence.beans.calendar.AppointmentReminderTyps;
-import org.openmeetings.app.persistence.beans.calendar.MeetingMember;
-import org.openmeetings.app.persistence.beans.domain.Organisation;
-import org.openmeetings.app.persistence.beans.files.FileExplorerItem;
-import org.openmeetings.app.persistence.beans.flvrecord.FlvRecording;
-import org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaData;
-import org.openmeetings.app.persistence.beans.poll.PollType;
-import org.openmeetings.app.persistence.beans.poll.RoomPoll;
-import org.openmeetings.app.persistence.beans.rooms.RoomModerators;
-import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
-import org.openmeetings.app.persistence.beans.rooms.Rooms;
-import org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation;
-import org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers;
-import org.openmeetings.app.persistence.beans.sip.asterisk.Extensions;
-import org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe;
-import org.openmeetings.app.persistence.beans.user.PrivateMessageFolder;
-import org.openmeetings.app.persistence.beans.user.PrivateMessages;
-import org.openmeetings.app.persistence.beans.user.UserContacts;
-import org.openmeetings.app.persistence.beans.user.UserSipData;
-import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
-import org.openmeetings.utils.OmFileHelper;
-import org.openmeetings.utils.math.CalendarPatterns;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.backup.AppointmentCategoryConverter;
+import org.apache.openmeetings.backup.AppointmentConverter;
+import org.apache.openmeetings.backup.AppointmentReminderTypeConverter;
+import org.apache.openmeetings.backup.DateConverter;
+import org.apache.openmeetings.backup.IntegerTransform;
+import org.apache.openmeetings.backup.LongTransform;
+import org.apache.openmeetings.backup.OmTimeZoneConverter;
+import org.apache.openmeetings.backup.OrganisationConverter;
+import org.apache.openmeetings.backup.PollTypeConverter;
+import org.apache.openmeetings.backup.RoomConverter;
+import org.apache.openmeetings.backup.RoomTypeConverter;
+import org.apache.openmeetings.backup.StateConverter;
+import org.apache.openmeetings.backup.UserConverter;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.LdapConfigDaoImpl;
+import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ServerDaoImpl;
+import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDaoImpl;
+import org.apache.openmeetings.data.calendar.daos.AppointmentDaoImpl;
+import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDaoImpl;
+import org.apache.openmeetings.data.calendar.daos.MeetingMemberDaoImpl;
+import org.apache.openmeetings.data.conference.PollManagement;
+import org.apache.openmeetings.data.conference.Roommanagement;
+import org.apache.openmeetings.data.conference.dao.RoomModeratorsDaoImpl;
+import org.apache.openmeetings.data.file.dao.FileExplorerItemDaoImpl;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingDaoImpl;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDaoImpl;
+import org.apache.openmeetings.data.user.Organisationmanagement;
+import org.apache.openmeetings.data.user.Statemanagement;
+import org.apache.openmeetings.data.user.dao.PrivateMessageFolderDaoImpl;
+import org.apache.openmeetings.data.user.dao.PrivateMessagesDaoImpl;
+import org.apache.openmeetings.data.user.dao.UserContactsDaoImpl;
+import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.persistence.beans.adresses.Adresses;
+import org.apache.openmeetings.persistence.beans.adresses.States;
+import org.apache.openmeetings.persistence.beans.basic.Configuration;
+import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
+import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
+import org.apache.openmeetings.persistence.beans.basic.Server;
+import org.apache.openmeetings.persistence.beans.calendar.Appointment;
+import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
+import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
+import org.apache.openmeetings.persistence.beans.domain.Organisation;
+import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
+import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
+import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
+import org.apache.openmeetings.persistence.beans.poll.PollType;
+import org.apache.openmeetings.persistence.beans.poll.RoomPoll;
+import org.apache.openmeetings.persistence.beans.rooms.RoomModerators;
+import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
+import org.apache.openmeetings.persistence.beans.rooms.Rooms;
+import org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation;
+import org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUsers;
+import org.apache.openmeetings.persistence.beans.sip.asterisk.Extensions;
+import org.apache.openmeetings.persistence.beans.sip.asterisk.MeetMe;
+import org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder;
+import org.apache.openmeetings.persistence.beans.user.PrivateMessages;
+import org.apache.openmeetings.persistence.beans.user.UserContacts;
+import org.apache.openmeetings.persistence.beans.user.UserSipData;
+import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
+import org.apache.openmeetings.utils.OmFileHelper;
+import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.simpleframework.xml.Serializer;
import org.simpleframework.xml.convert.Registry;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/CalendarServlet.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/CalendarServlet.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/CalendarServlet.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/CalendarServlet.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.IOException;
import java.io.OutputStream;
@@ -31,21 +31,21 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
+import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
+import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.persistence.beans.calendar.Appointment;
+import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.Sessionmanagement;
-import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
-import org.openmeetings.app.data.calendar.management.AppointmentLogic;
-import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.persistence.beans.calendar.Appointment;
-import org.openmeetings.app.persistence.beans.calendar.MeetingMember;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.util.HashMap;
import java.util.Iterator;
@@ -24,13 +24,13 @@ import java.util.Iterator;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.persistence.beans.basic.Configuration;
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.view.VelocityViewServlet;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.persistence.beans.basic.Configuration;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.File;
import java.io.IOException;
@@ -29,13 +29,13 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Sessionmanagement;
-import org.openmeetings.app.data.file.dao.FileExplorerItemDaoImpl;
-import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.persistence.beans.files.FileExplorerItem;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.openmeetings.utils.OmFileHelper;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.file.dao.FileExplorerItemDaoImpl;
+import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.utils.OmFileHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Export.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Export.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Export.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Export.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.IOException;
import java.io.OutputStream;
@@ -28,15 +28,15 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.AuthLevelmanagement;
-import org.openmeetings.app.data.basic.Sessionmanagement;
-import org.openmeetings.app.data.user.Organisationmanagement;
-import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.data.user.dao.UsersDaoImpl;
-import org.openmeetings.app.persistence.beans.domain.Organisation;
-import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.AuthLevelmanagement;
+import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.user.Organisationmanagement;
+import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.persistence.beans.domain.Organisation;
+import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ExportToImage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ExportToImage.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ExportToImage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ExportToImage.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.File;
import java.io.FileWriter;
@@ -34,16 +34,16 @@ import javax.servlet.http.HttpServletRes
import org.apache.batik.dom.GenericDOMImplementation;
import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.svggen.SVGGraphics2D;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.batik.beans.PrintBean;
-import org.openmeetings.app.data.basic.Sessionmanagement;
-import org.openmeetings.app.data.record.WhiteboardMapToSVG;
-import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.documents.GenerateImage;
-import org.openmeetings.app.remote.PrintService;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.openmeetings.utils.OmFileHelper;
-import org.openmeetings.utils.math.CalendarPatterns;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.batik.beans.PrintBean;
+import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.record.WhiteboardMapToSVG;
+import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.documents.GenerateImage;
+import org.apache.openmeetings.remote.PrintService;
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.utils.OmFileHelper;
+import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/HttpServletRequestEx.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/HttpServletRequestEx.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/HttpServletRequestEx.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/HttpServletRequestEx.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ImportController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ImportController.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ImportController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ImportController.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.InputStream;
import java.util.LinkedHashMap;
@@ -25,11 +25,11 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.user.dao.UsersDaoImpl;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.openmeetings.app.xmlimport.LanguageImport;
-import org.openmeetings.app.xmlimport.UserImport;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.xmlimport.LanguageImport;
+import org.apache.openmeetings.xmlimport.UserImport;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.File;
import java.io.IOException;
@@ -27,18 +27,18 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.documents.InstallationDocumentHandler;
+import org.apache.openmeetings.installation.ImportInitvalues;
+import org.apache.openmeetings.installation.InstallationConfig;
+import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.utils.ImportHelper;
+import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.view.VelocityViewServlet;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.documents.InstallationDocumentHandler;
-import org.openmeetings.app.installation.ImportInitvalues;
-import org.openmeetings.app.installation.InstallationConfig;
-import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.openmeetings.utils.OmFileHelper;
-import org.openmeetings.utils.ImportHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.IOException;
import java.io.OutputStream;
@@ -28,19 +28,19 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.FieldLanguageDaoImpl;
+import org.apache.openmeetings.data.basic.Fieldmanagment;
+import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
+import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.FieldLanguageDaoImpl;
-import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.data.basic.Sessionmanagement;
-import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.persistence.beans.lang.FieldLanguage;
-import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/NetworkTestingController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/NetworkTestingController.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/NetworkTestingController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/NetworkTestingController.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.IOException;
import java.util.Arrays;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.File;
import java.io.FileFilter;
@@ -29,18 +29,18 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang.StringUtils;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.Fieldmanagment;
+import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.persistence.beans.rooms.RoomClient;
+import org.apache.openmeetings.remote.red5.ClientListManager;
+import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.data.basic.Sessionmanagement;
-import org.openmeetings.app.persistence.beans.rooms.RoomClient;
-import org.openmeetings.app.remote.red5.ClientListManager;
-import org.openmeetings.utils.OmFileHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -161,13 +161,13 @@ public class ScreenController {
String startUpClass;
switch (conType) {
case rtmp:
- startUpClass = "org.openmeetings.screen.webstart.RTMPScreenShare";
+ startUpClass = "org.apache.openmeetings.screen.webstart.RTMPScreenShare";
break;
case rtmps:
- startUpClass = "org.openmeetings.screen.webstart.RTMPSScreenShare";
+ startUpClass = "org.apache.openmeetings.screen.webstart.RTMPSScreenShare";
break;
case rtmpt:
- startUpClass = "org.openmeetings.screen.webstart.RTMPTScreenShare";
+ startUpClass = "org.apache.openmeetings.screen.webstart.RTMPTScreenShare";
break;
default:
throw new Exception("Unknown connection type");
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ServletRequestExFilter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ServletRequestExFilter.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ServletRequestExFilter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ServletRequestExFilter.java Mon Sep 10 03:55:51 2012
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.*;
import javax.servlet.*;
import javax.servlet.http.*;
-import org.openmeetings.servlet.outputhandler.HttpServletRequestEx;
+import org.apache.openmeetings.servlet.outputhandler.HttpServletRequestEx;
public class ServletRequestExFilter implements Filter {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
+package org.apache.openmeetings.servlet.outputhandler;
import java.io.File;
import java.io.InputStream;
@@ -31,18 +31,18 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.transaction.util.FileHelper;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.file.FileProcessor;
-import org.openmeetings.app.data.file.dao.FileExplorerItemDaoImpl;
-import org.openmeetings.app.data.user.dao.UsersDaoImpl;
-import org.openmeetings.app.documents.GenerateImage;
-import org.openmeetings.app.documents.GeneratePDF;
-import org.openmeetings.app.documents.GenerateThumbs;
-import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.openmeetings.utils.OmFileHelper;
-import org.openmeetings.utils.StoredFile;
-import org.openmeetings.utils.stringhandlers.StringComparer;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.file.FileProcessor;
+import org.apache.openmeetings.data.file.dao.FileExplorerItemDaoImpl;
+import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.documents.GenerateImage;
+import org.apache.openmeetings.documents.GeneratePDF;
+import org.apache.openmeetings.documents.GenerateThumbs;
+import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.utils.OmFileHelper;
+import org.apache.openmeetings.utils.StoredFile;
+import org.apache.openmeetings.utils.stringhandlers.StringComparer;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/ISIPClient.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/ISIPClient.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/ISIPClient.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/ISIPClient.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/ISIPClient.java Mon Sep 10 03:55:51 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.app.sip.api;
+package org.apache.openmeetings.sip.api;
-import org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
-import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
-import org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
-import org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
+import org.apache.openmeetings.sip.api.request.SIPCreateConferenceRequest;
+import org.apache.openmeetings.sip.api.request.SIPCreateUserRequest;
+import org.apache.openmeetings.sip.api.result.SIPCreateUserRequestResult;
+import org.apache.openmeetings.sip.api.result.SipCreateConferenceRequestResult;
/**
* SIP client interface
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/impl/asterisk/AsteriskDbSipClient.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/impl/asterisk/AsteriskDbSipClient.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/impl/asterisk/AsteriskDbSipClient.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/impl/asterisk/AsteriskDbSipClient.java Mon Sep 10 03:55:51 2012
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.app.sip.api.impl.asterisk;
+package org.apache.openmeetings.sip.api.impl.asterisk;
-import org.openmeetings.app.persistence.beans.user.UserSipData;
-import org.openmeetings.app.sip.api.ISIPClient;
-import org.openmeetings.app.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
-import org.openmeetings.app.sip.api.request.SIPCreateConferenceRequest;
-import org.openmeetings.app.sip.api.request.SIPCreateUserRequest;
-import org.openmeetings.app.sip.api.result.SIPCreateUserRequestResult;
-import org.openmeetings.app.sip.api.result.SipCreateConferenceRequestResult;
+import org.apache.openmeetings.persistence.beans.user.UserSipData;
+import org.apache.openmeetings.sip.api.ISIPClient;
+import org.apache.openmeetings.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
+import org.apache.openmeetings.sip.api.request.SIPCreateConferenceRequest;
+import org.apache.openmeetings.sip.api.request.SIPCreateUserRequest;
+import org.apache.openmeetings.sip.api.result.SIPCreateUserRequestResult;
+import org.apache.openmeetings.sip.api.result.SipCreateConferenceRequestResult;
import org.springframework.beans.factory.annotation.Autowired;
/**
*
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java Mon Sep 10 03:55:51 2012
@@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.app.sip.api.impl.asterisk.dao;
+package org.apache.openmeetings.sip.api.impl.asterisk.dao;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.persistence.beans.basic.Configuration;
-import org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers;
-import org.openmeetings.app.persistence.beans.sip.asterisk.Extensions;
-import org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.persistence.beans.basic.Configuration;
+import org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUsers;
+import org.apache.openmeetings.persistence.beans.sip.asterisk.Extensions;
+import org.apache.openmeetings.persistence.beans.sip.asterisk.MeetMe;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/request/ISIPRequest.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/request/ISIPRequest.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/request/ISIPRequest.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/request/ISIPRequest.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.app.sip.api.request;
+package org.apache.openmeetings.sip.api.request;
/**
* Base interface for SIP API requests
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/request/SIPCreateConferenceRequest.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/request/SIPCreateConferenceRequest.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/request/SIPCreateConferenceRequest.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/request/SIPCreateConferenceRequest.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.app.sip.api.request;
+package org.apache.openmeetings.sip.api.request;
/**
* Create SIP conferece request
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/request/SIPCreateUserRequest.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/request/SIPCreateUserRequest.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/request/SIPCreateUserRequest.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/request/SIPCreateUserRequest.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.app.sip.api.request;
+package org.apache.openmeetings.sip.api.request;
/**
* Create User Request
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/result/ISIPRequestResult.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/result/ISIPRequestResult.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/result/ISIPRequestResult.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/result/ISIPRequestResult.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.app.sip.api.result;
+package org.apache.openmeetings.sip.api.result;
/**
* * Base interface for SIP API request's resuslt
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/result/SIPCreateUserRequestResult.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/result/SIPCreateUserRequestResult.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/result/SIPCreateUserRequestResult.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/result/SIPCreateUserRequestResult.java Mon Sep 10 03:55:51 2012
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.app.sip.api.result;
+package org.apache.openmeetings.sip.api.result;
-import org.openmeetings.app.persistence.beans.user.UserSipData;
+import org.apache.openmeetings.persistence.beans.user.UserSipData;
/**
* TODO
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/result/SipCreateConferenceRequestResult.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/result/SipCreateConferenceRequestResult.java?rev=1382635&r1=1382629&r2=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/result/SipCreateConferenceRequestResult.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/result/SipCreateConferenceRequestResult.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.app.sip.api.result;
+package org.apache.openmeetings.sip.api.result;
/**
* TODO
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/EasyX509TrustManager.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/xmlrpc/EasyX509TrustManager.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/EasyX509TrustManager.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/EasyX509TrustManager.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/xmlrpc/EasyX509TrustManager.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/xmlrpc/EasyX509TrustManager.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/EasyX509TrustManager.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.app.sip.xmlrpc;
+package org.apache.openmeetings.sip.xmlrpc;
import java.security.KeyStore;
import java.security.KeyStoreException;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/OpenXGHttpClient.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/OpenXGHttpClient.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/OpenXGHttpClient.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/OpenXGHttpClient.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.app.sip.xmlrpc;
+package org.apache.openmeetings.sip.xmlrpc;
import java.io.InputStream;
import java.nio.charset.Charset;
@@ -45,14 +45,14 @@ import org.apache.http.params.HttpParams
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
import org.apache.http.util.EntityUtils;
-import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.persistence.beans.basic.Configuration;
-import org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject;
-import org.openmeetings.app.persistence.beans.user.UserSipData;
-import org.openmeetings.app.sip.xmlrpc.custom.OpenXGCustomXMLMarshall;
-import org.openmeetings.app.sip.xmlrpc.custom.dao.OpenXGReturnObjectDaoImpl;
-import org.openmeetings.utils.crypt.MD5;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.persistence.beans.basic.Configuration;
+import org.apache.openmeetings.persistence.beans.sip.OpenXGReturnObject;
+import org.apache.openmeetings.persistence.beans.user.UserSipData;
+import org.apache.openmeetings.sip.xmlrpc.custom.OpenXGCustomXMLMarshall;
+import org.apache.openmeetings.sip.xmlrpc.custom.dao.OpenXGReturnObjectDaoImpl;
+import org.apache.openmeetings.utils.crypt.MD5;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java Mon Sep 10 03:55:51 2012
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.app.sip.xmlrpc.custom;
+package org.apache.openmeetings.sip.xmlrpc.custom;
-import org.openmeetings.app.OpenmeetingsVariables;
+import org.apache.openmeetings.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/custom/OpenXGResponseParser.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/xmlrpc/custom/OpenXGResponseParser.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/custom/OpenXGResponseParser.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/custom/OpenXGResponseParser.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/xmlrpc/custom/OpenXGResponseParser.java&r1=1382629&r2=1382635&rev=1382635&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/xmlrpc/custom/OpenXGResponseParser.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/custom/OpenXGResponseParser.java Mon Sep 10 03:55:51 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.app.sip.xmlrpc.custom;
+package org.apache.openmeetings.sip.xmlrpc.custom;
import org.apache.xerces.parsers.SAXParser;