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/05/17 09:55:41 UTC
svn commit: r1339508 - in /incubator/openmeetings/trunk/singlewebapp: ./
WebContent/WEB-INF/ src/ src/META-INF/ src/org/openmeetings/app/
src/org/openmeetings/app/data/calendar/beans/
src/org/openmeetings/app/data/flvrecord/converter/ src/org/openmeeti...
Author: solomax
Date: Thu May 17 07:55:39 2012
New Revision: 1339508
URL: http://svn.apache.org/viewvc?rev=1339508&view=rev
Log:
OPENMEETINGS-97 red5 version is bumped to implement RTPMSClient for ScreenSharing, Apache license headers are added
Modified:
incubator/openmeetings/trunk/singlewebapp/.classpath
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/red5-web.xml
incubator/openmeetings/trunk/singlewebapp/build.properties
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/ivy.xml
incubator/openmeetings/trunk/singlewebapp/ivysettings.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/services.xml
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/OpenmeetingsVariables.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/AppointmentDTO.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/Day.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/MeetingMemberDTO.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/Week.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamAudioListener.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamVideoListener.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamVideoWriter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GenerateThumbs.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/InstallationConfig.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/quartz/scheduler/TestSetupCleanupJob.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/WhiteBoardService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/EmoticonsManager.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebServiceFacade.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/BaseScreenEncoder.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPSScreenShare.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPScreenShare.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPTScreenShare.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/MouseListenerable.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/NumberSpinner.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/AbstractUploadController.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/UploadController.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/ProcessHelper.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/mail/MailUtil.java
incubator/openmeetings/trunk/singlewebapp/src/screenshare.vm
incubator/openmeetings/trunk/singlewebapp/src/xsd_template.vm
Modified: incubator/openmeetings/trunk/singlewebapp/.classpath
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/.classpath?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/.classpath (original)
+++ incubator/openmeetings/trunk/singlewebapp/.classpath Thu May 17 07:55:39 2012
@@ -65,13 +65,13 @@
<classpathentry kind="lib" path="build/red5/dist/lib/mina-integration-beans-2.0.4.jar"/>
<classpathentry kind="lib" path="build/red5/dist/lib/mina-integration-jmx-2.0.4.jar"/>
<classpathentry kind="lib" path="build/red5/dist/lib/quartz-1.8.5.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/spring-asm-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/spring-beans-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/spring-context-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/spring-context-support-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/spring-core-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/spring-expression-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/red5/dist/lib/spring-web-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/spring-asm-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/spring-beans-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/spring-context-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/spring-context-support-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/spring-core-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/spring-expression-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/dist/lib/spring-web-3.1.1.RELEASE.jar"/>
<classpathentry kind="lib" path="build/lib/om/batik-anim-jar-1.7.jar"/>
<classpathentry kind="lib" path="build/lib/om/batik-awt-util-jar-1.7.jar"/>
<classpathentry kind="lib" path="build/lib/om/batik-bridge-jar-1.7.jar"/>
@@ -95,27 +95,16 @@
<classpathentry kind="lib" path="build/lib/om/batik-ttf2svg-jar-1.7.jar"/>
<classpathentry kind="lib" path="build/lib/om/batik-util-jar-1.7.jar"/>
<classpathentry kind="lib" path="build/lib/om/batik-xml-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/cglib-jar-2.2.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/com.springsource.org.aopalliance-jar-1.0.0.jar"/>
<classpathentry kind="lib" path="build/lib/om/commons-dbcp-jar-1.4.jar"/>
<classpathentry kind="lib" path="build/lib/om/commons-digester-jar-2.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/commons-fileupload-jar-1.2.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/commons-io-jar-2.1.jar"/>
<classpathentry kind="lib" path="build/lib/om/commons-lang-jar-2.6.jar"/>
<classpathentry kind="lib" path="build/lib/om/commons-transaction-jar-1.2.jar"/>
<classpathentry kind="lib" path="build/lib/om/derby-jar-10.8.2.2.jar"/>
<classpathentry kind="lib" path="build/lib/om/derbyclient-jar-10.8.2.2.jar"/>
<classpathentry kind="lib" path="build/lib/om/dom4j-jar-1.6.1.jar"/>
<classpathentry kind="lib" path="build/lib/om/fop-jar-1.0.jar"/>
- <classpathentry kind="lib" path="build/lib/om/geronimo-jpa_2.0_spec-bundle-1.1.jar"/>
<classpathentry kind="lib" path="build/lib/om/mail-jar-1.4.4.jar"/>
<classpathentry kind="lib" path="build/lib/om/mysql-connector-java-jar-5.1.9.jar"/>
- <classpathentry kind="lib" path="build/lib/om/org.springframework.aop-jar-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/lib/om/org.springframework.aspects-jar-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/lib/om/org.springframework.jdbc-jar-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/lib/om/org.springframework.orm-jar-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/lib/om/org.springframework.transaction-jar-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="build/lib/om/org.springframework.web.servlet-jar-3.0.6.RELEASE.jar"/>
<classpathentry kind="lib" path="build/lib/om/postgresql-jar-9.1-901.jdbc4.jar"/>
<classpathentry kind="lib" path="build/lib/om/serp-jar-1.13.1.jar"/>
<classpathentry kind="lib" path="build/lib/om/velocity-jar-1.7.jar"/>
@@ -128,10 +117,19 @@
<classpathentry kind="lib" path="build/lib/om/xpp3-jar-1.1.4c.jar"/>
<classpathentry kind="lib" path="build/lib/om/xstream-jar-1.4.2.jar"/>
<classpathentry kind="lib" path="build/lib/junit/junit-jar-4.9.jar"/>
- <classpathentry kind="lib" path="build/lib/junit/org.springframework.test-jar-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/lib/junit/org.springframework.test-jar-3.1.1.RELEASE.jar"/>
<classpathentry kind="lib" path="build/lib/dtd-generator/trang-jar-20091111.jar"/>
<classpathentry kind="lib" path="build/lib/om/axis2-kernel-jar-1.7.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="build/lib/om/axiom-api-bundle-1.2.13-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="build/red5/dist/commons-cli-jar-1.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/mainlibs/red5-client-jar-1.0-RC2.jar"/>
+ <classpathentry kind="lib" path="build/lib/mainlibs/cglib-jar-2.2.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/mainlibs/commons-fileupload-jar-1.2.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/mainlibs/commons-io-jar-2.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/mainlibs/org.springframework.aspects-jar-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/lib/mainlibs/org.springframework.jdbc-jar-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/lib/mainlibs/org.springframework.orm-jar-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/lib/mainlibs/org.springframework.transaction-jar-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/lib/mainlibs/org.springframework.web.servlet-jar-3.1.1.RELEASE.jar"/>
<classpathentry kind="output" path="build/classes/eclipse"/>
</classpath>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/red5-web.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/red5-web.xml?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/red5-web.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/red5-web.xml Thu May 17 07:55:39 2012
@@ -28,7 +28,7 @@
<bean id="web.context" class="org.red5.server.Context" autowire="byType" />
- <bean id="web.scope" class="org.red5.server.WebScope" init-method="register">
+ <bean id="web.scope" class="org.red5.server.scope.WebScope" init-method="register">
<property name="server" ref="red5.server" />
<property name="parent" ref="global.scope" />
<property name="context" ref="web.context" />
Modified: incubator/openmeetings/trunk/singlewebapp/build.properties
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.properties?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.properties (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.properties Thu May 17 07:55:39 2012
@@ -1,6 +1,6 @@
project.version=2.0.0
project.status=SNAPSHOT
-red5.revision=4315
+red5.revision=4364
laszlo.debug=false
laszlo.proxied=solo
db=derby
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Thu May 17 07:55:39 2012
@@ -338,9 +338,11 @@
<fileset dir="${red5.lib}" includes="red5.jar" />
<fileset dir="${red5.server.lib}" includes="spring-context-3*.jar" />
<fileset dir="${red5.server.lib}" includes="spring-core-*.jar" />
+ <fileset dir="${red5.server.lib}" includes="spring-beans-*.jar" />
<fileset dir="${red5.server.lib}" includes="logback*.jar" />
<fileset dir="${red5.server.lib}" includes="mina-core*.jar" />
<fileset dir="${red5.server.lib}" includes="com.springsource.slf4j.api*.jar" />
+ <fileset dir="${mainlibs.lib.dir}" includes="red5-client*.jar" />
</copy>
<signjar alias="filetest" keystore="${keystore.file}" storepass="secret" lazy="false">
<path>
Modified: incubator/openmeetings/trunk/singlewebapp/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Thu May 17 07:55:39 2012
@@ -20,7 +20,7 @@
<conf name="default" />
<conf name="mainlib" extends="default" description="Top level libraries" />
<conf name="mainlib.ext" extends="mainlib" description="Top level libraries with different pattern" />
- <conf name="openmeetings" extends="mainlib.ext" description="Openmeetings required libraries" />
+ <conf name="openmeetings" description="Openmeetings required libraries" />
<conf name="openmeetings.ext" extends="openmeetings" description="Openmeetings required libraries with different pattern" />
<conf name="openmeetings.axis2" extends="openmeetings.ext" description="Axis required libraries with dependencies" />
<conf name="anakia" description="Openmeetings required libraries" />
@@ -39,28 +39,25 @@
<dependency org="commons-io" name="commons-io" rev="2.1" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="org.springframework.aop" rev="3.0.6.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="org.springframework.aspects" rev="3.1.1.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="org.springframework.aspects" rev="3.0.6.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="org.springframework.jdbc" rev="3.1.1.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="org.springframework.jdbc" rev="3.0.6.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="org.springframework.orm" rev="3.1.1.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="org.springframework.orm" rev="3.0.6.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="org.springframework.transaction" rev="3.1.1.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="org.springframework.transaction" rev="3.0.6.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.1.1.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.0.6.RELEASE" transitive="false">
- <include type="jar" />
- </dependency>
- <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" transitive="false">
+ <dependency org="cglib" name="cglib" rev="2.2.2" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="cglib" name="cglib" rev="2.2.2" transitive="false">
+ <dependency org="org/red5" name="red5-client" rev="1.0-RC2" transitive="false">
<include type="jar" />
</dependency>
<!-- include type="bundle" / FIXME unable to get openjpa without sources -->
@@ -244,7 +241,7 @@
<dependency org="junit" name="junit" rev="4.9" conf="junit->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="org.springframework.test" rev="3.0.6.RELEASE" conf="junit->*" transitive="false">
+ <dependency org="org.springframework" name="org.springframework.test" rev="3.1.1.RELEASE" conf="junit->*" transitive="false">
<include type="jar" />
</dependency>
<!-- END OF JUNIT -->
Modified: incubator/openmeetings/trunk/singlewebapp/ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivysettings.xml?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivysettings.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivysettings.xml Thu May 17 07:55:39 2012
@@ -32,6 +32,7 @@
<url name="googlecode">
<artifact pattern="http://openlaszlo-openmeetings-integration.googlecode.com/svn/repository/[artifact](-[revision]).[ext]" />
<artifact pattern="http://openmeetings.googlecode.com/svn/repository/[artifact](-[revision]).[ext]" />
+ <artifact pattern="http://red5.googlecode.com/svn/repository/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]" />
</url>
</chain>
</resolvers>
Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/services.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/services.xml?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/services.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/services.xml Thu May 17 07:55:39 2012
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<serviceGroup>
<service name="UserService">
<description>User Service</description>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/OpenmeetingsVariables.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/OpenmeetingsVariables.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/OpenmeetingsVariables.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/OpenmeetingsVariables.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.app;
public class OpenmeetingsVariables {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/AppointmentDTO.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/AppointmentDTO.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/AppointmentDTO.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/AppointmentDTO.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.app.data.calendar.beans;
import java.util.ArrayList;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/Day.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/Day.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/Day.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/Day.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.app.data.calendar.beans;
import java.util.ArrayList;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/MeetingMemberDTO.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/MeetingMemberDTO.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/MeetingMemberDTO.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/MeetingMemberDTO.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.app.data.calendar.beans;
import org.openmeetings.app.persistence.beans.calendar.MeetingMember;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/Week.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/Week.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/Week.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/beans/Week.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.app.data.calendar.beans;
import java.util.ArrayList;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java Thu May 17 07:55:39 2012
@@ -631,7 +631,7 @@ public class FlvInterviewConverter exten
String runtimeFile = "interviewMerge" + tnow.getTime() + ".bat";
// String runtimeFile = "interviewMerge.bat";
- executable_fileName = ScopeApplicationAdapter.batchFileFir
+ executable_fileName = ScopeApplicationAdapter.batchFileDir
+ runtimeFile;
cmd = new String[1];
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamAudioListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamAudioListener.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamAudioListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamAudioListener.java Thu May 17 07:55:39 2012
@@ -26,7 +26,7 @@ import org.openmeetings.app.data.flvreco
import org.openmeetings.app.data.flvrecord.listener.async.CachedEvent;
import org.openmeetings.app.data.flvrecord.listener.async.StreamAudioWriter;
import org.red5.logging.Red5LoggerFactory;
-import org.red5.server.api.IScope;
+import org.red5.server.api.scope.IScope;
import org.red5.server.api.stream.IBroadcastStream;
import org.red5.server.api.stream.IStreamPacket;
import org.slf4j.Logger;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamVideoListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamVideoListener.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamVideoListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/StreamVideoListener.java Thu May 17 07:55:39 2012
@@ -25,7 +25,7 @@ import org.openmeetings.app.data.flvreco
import org.openmeetings.app.data.flvrecord.listener.async.CachedEvent;
import org.openmeetings.app.data.flvrecord.listener.async.StreamVideoWriter;
import org.red5.logging.Red5LoggerFactory;
-import org.red5.server.api.IScope;
+import org.red5.server.api.scope.IScope;
import org.red5.server.api.stream.IBroadcastStream;
import org.red5.server.api.stream.IStreamPacket;
import org.slf4j.Logger;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java Thu May 17 07:55:39 2012
@@ -33,8 +33,8 @@ import org.red5.io.IStreamableFileServic
import org.red5.io.ITagWriter;
import org.red5.io.StreamableFileFactory;
import org.red5.logging.Red5LoggerFactory;
-import org.red5.server.api.IScope;
-import org.red5.server.api.ScopeUtils;
+import org.red5.server.api.scope.IScope;
+import org.red5.server.util.ScopeUtils;
import org.slf4j.Logger;
public abstract class BaseStreamWriter implements Runnable {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java Thu May 17 07:55:39 2012
@@ -30,7 +30,7 @@ import org.openmeetings.app.persistence.
import org.red5.io.ITag;
import org.red5.io.flv.impl.Tag;
import org.red5.logging.Red5LoggerFactory;
-import org.red5.server.api.IScope;
+import org.red5.server.api.scope.IScope;
import org.slf4j.Logger;
public class StreamAudioWriter extends BaseStreamWriter {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamVideoWriter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamVideoWriter.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamVideoWriter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamVideoWriter.java Thu May 17 07:55:39 2012
@@ -28,7 +28,7 @@ import org.openmeetings.app.persistence.
import org.red5.io.ITag;
import org.red5.io.flv.impl.Tag;
import org.red5.logging.Red5LoggerFactory;
-import org.red5.server.api.IScope;
+import org.red5.server.api.scope.IScope;
import org.slf4j.Logger;
public class StreamVideoWriter extends BaseStreamWriter {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java Thu May 17 07:55:39 2012
@@ -65,7 +65,7 @@ import org.openmeetings.utils.mail.MailH
import org.openmeetings.utils.math.CalendarPatterns;
import org.red5.io.utils.ObjectMap;
import org.red5.logging.Red5LoggerFactory;
-import org.red5.server.api.IScope;
+import org.red5.server.api.scope.IScope;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GenerateThumbs.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GenerateThumbs.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GenerateThumbs.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/GenerateThumbs.java Thu May 17 07:55:39 2012
@@ -129,7 +129,7 @@ public class GenerateThumbs {
String executable_fileName = "";
String runtimeFile = "interviewMerge.bat";
- executable_fileName = ScopeApplicationAdapter.batchFileFir
+ executable_fileName = ScopeApplicationAdapter.batchFileDir
+ runtimeFile;
cmd = new String[4];
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/InstallationConfig.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/InstallationConfig.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/InstallationConfig.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/InstallationConfig.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.app.installation;
import org.openmeetings.utils.crypt.MD5Implementation;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/quartz/scheduler/TestSetupCleanupJob.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/quartz/scheduler/TestSetupCleanupJob.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/quartz/scheduler/TestSetupCleanupJob.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/quartz/scheduler/TestSetupCleanupJob.java Thu May 17 07:55:39 2012
@@ -34,7 +34,7 @@ public class TestSetupCleanupJob {
log.debug("TestSetupClearJob.execute");
try {
//FIXME need to move all these staff to helper
- File streams = new File(ScopeApplicationAdapter.batchFileFir);
+ File streams = new File(ScopeApplicationAdapter.batchFileDir);
File[] folders = streams.listFiles();
if (folders != null) {
for (File folder : folders) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java Thu May 17 07:55:39 2012
@@ -52,8 +52,8 @@ import org.openmeetings.app.remote.red5.
import org.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
-import org.red5.server.api.IScope;
import org.red5.server.api.Red5;
+import org.red5.server.api.scope.IScope;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.api.service.IPendingServiceCallback;
import org.red5.server.api.service.IServiceCapableConnection;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java Thu May 17 07:55:39 2012
@@ -65,7 +65,7 @@ import org.openmeetings.utils.math.Calen
import org.openmeetings.utils.math.TimezoneUtil;
import org.red5.io.utils.ObjectMap;
import org.red5.logging.Red5LoggerFactory;
-import org.red5.server.api.IScope;
+import org.red5.server.api.scope.IScope;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/WhiteBoardService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/WhiteBoardService.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/WhiteBoardService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/WhiteBoardService.java Thu May 17 07:55:39 2012
@@ -43,8 +43,8 @@ import org.openmeetings.app.remote.red5.
import org.openmeetings.app.remote.red5.WhiteBoardObjectListManagerById;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
-import org.red5.server.api.IScope;
import org.red5.server.api.Red5;
+import org.red5.server.api.scope.IScope;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.api.service.IPendingServiceCallback;
import org.slf4j.Logger;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/EmoticonsManager.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/EmoticonsManager.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/EmoticonsManager.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/EmoticonsManager.java Thu May 17 07:55:39 2012
@@ -25,9 +25,9 @@ import java.util.LinkedList;
import org.slf4j.Logger;
import org.red5.logging.Red5LoggerFactory;
+import org.red5.server.api.scope.IScope;
import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.utils.stringhandlers.ChatString;
-import org.red5.server.api.IScope;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.XppDriver;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java Thu May 17 07:55:39 2012
@@ -29,6 +29,10 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Semaphore;
import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.conference.session.RoomClient;
@@ -51,14 +55,18 @@ import org.openmeetings.app.persistence.
import org.openmeetings.app.remote.FLVRecorderService;
import org.openmeetings.app.remote.WhiteBoardService;
import org.openmeetings.utils.math.CalendarPatterns;
+import org.red5.client.net.rtmp.ClientExceptionHandler;
+import org.red5.client.net.rtmp.RTMPClient;
import org.red5.io.utils.ObjectMap;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.adapter.ApplicationAdapter;
-import org.red5.server.api.IBasicScope;
import org.red5.server.api.IClient;
import org.red5.server.api.IConnection;
-import org.red5.server.api.IScope;
import org.red5.server.api.Red5;
+import org.red5.server.api.scope.IBasicScope;
+import org.red5.server.api.scope.IBroadcastScope;
+import org.red5.server.api.scope.IScope;
+import org.red5.server.api.scope.ScopeType;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.api.service.IPendingServiceCallback;
import org.red5.server.api.service.IServiceCapableConnection;
@@ -70,12 +78,10 @@ import org.red5.server.messaging.IMessag
import org.red5.server.messaging.IPipe;
import org.red5.server.messaging.OOBControlMessage;
import org.red5.server.messaging.PipeConnectionEvent;
-import org.red5.server.net.rtmp.ClientExceptionHandler;
-import org.red5.server.net.rtmp.RTMPClient;
import org.red5.server.net.rtmp.event.IRTMPEvent;
import org.red5.server.net.rtmp.event.Notify;
import org.red5.server.net.rtmp.status.StatusCodes;
-import org.red5.server.stream.IBroadcastScope;
+import org.red5.server.stream.StreamState;
import org.red5.server.stream.StreamingProxy;
import org.red5.server.stream.message.RTMPMessage;
import org.slf4j.Logger;
@@ -117,7 +123,7 @@ public class ScopeApplicationAdapter ext
private Map<String, StreamingProxy> streamingProxyMap = new HashMap<String, StreamingProxy>();
// This is the Folder where all executables are written
// for windows platform
- public static String batchFileFir = "webapps" + File.separatorChar + "ROOT"
+ public static String batchFileDir = "webapps" + File.separatorChar + "ROOT"
+ File.separatorChar + "jod" + File.separatorChar;
public static String lineSeperator = System.getProperty("line.separator");
@@ -132,108 +138,199 @@ public class ScopeApplicationAdapter ext
private static long broadCastCounter = 0;
public static boolean initComplete = false;
- private static class MyStreamingProxy extends StreamingProxy {
- private static Logger log = LoggerFactory.getLogger(StreamingProxy.class);
- private List<IMessage> frameBuffer = new ArrayList<IMessage>();
-
- private static final int STOPPED = 0;
- private static final int CONNECTING = 1;
- private static final int STREAM_CREATING = 2;
- private static final int PUBLISHING = 3;
- private static final int PUBLISHED = 4;
- private String host;
- private int port;
- private String app;
- private RTMPClient rtmpClient;
- private int state;
- private String publishName;
- private int streamId;
- private String publishMode;
-
- public void init(ClientExceptionHandler exceptionHandler) {
- rtmpClient = new RTMPClient();
- rtmpClient.setExceptionHandler(exceptionHandler);
- state = STOPPED;
- }
-
- public synchronized void start(String publishName, String publishMode, Object[] params) {
- state = CONNECTING;
- this.publishName = publishName;
- this.publishMode = publishMode;
-
- Map<String, Object> defParams = rtmpClient.makeDefaultConnectionParams(host, port, app);
- rtmpClient.connect(host, port, defParams, this, params);
- }
-
- public synchronized void stop() {
- if (state >= STREAM_CREATING) {
- rtmpClient.disconnect();
- }
- state = STOPPED;
- }
-
- public void onPipeConnectionEvent(PipeConnectionEvent event) {
- // nothing to do
- }
-
- public synchronized void pushMessage(IPipe pipe, IMessage message) throws IOException {
- if (state >= PUBLISHED && message instanceof RTMPMessage) {
- RTMPMessage rtmpMsg = (RTMPMessage) message;
- rtmpClient.publishStreamData(streamId, rtmpMsg);
- } else {
- frameBuffer.add(message);
- }
- }
-
- public void onOOBControlMessage(IMessageComponent source, IPipe pipe, OOBControlMessage oobCtrlMsg) {
- }
-
- public void setHost(String host) {
- this.host = host;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
- public void setApp(String app) {
- this.app = app;
- }
-
- public synchronized void onStreamEvent(Notify notify) {
- log.debug("onStreamEvent: {}", notify);
- ObjectMap<?, ?> map = (ObjectMap<?, ?>) notify.getCall().getArguments()[0];
- String code = (String) map.get("code");
- log.debug("<:{}", code);
- if (StatusCodes.NS_PUBLISH_START.equals(code)) {
- state = PUBLISHED;
- rtmpClient.invoke("FCPublish", new Object[] { publishName }, this);
- while (frameBuffer.size() > 0) {
- rtmpClient.publishStreamData(streamId, frameBuffer.remove(0));
- }
- }
- }
-
- public synchronized void resultReceived(IPendingServiceCall call) {
- log.debug("resultReceived:> {}", call.getServiceMethodName());
- if ("connect".equals(call.getServiceMethodName())) {
- state = STREAM_CREATING;
- rtmpClient.createStream(this);
- } else if ("createStream".equals(call.getServiceMethodName())) {
- state = PUBLISHING;
- Object result = call.getResult();
- if (result instanceof Integer) {
- Integer streamIdInt = (Integer) result;
- streamId = streamIdInt.intValue();
- log.debug("Publishing: {}", state);
- rtmpClient.publish(streamIdInt.intValue(), publishName, publishMode, this);
- } else {
- rtmpClient.disconnect();
- state = STOPPED;
- }
- }
- }
- }
+ //FIXME copy/pasted StreamingProxy necessary to set ClientExceptionHandler
+ private static class MyStreamingProxy extends StreamingProxy {
+ private static Logger log = LoggerFactory
+ .getLogger(StreamingProxy.class);
+ private ConcurrentLinkedQueue<IMessage> frameBuffer = new ConcurrentLinkedQueue<IMessage>();
+ private String host;
+ private int port;
+ private String app;
+ private RTMPClient rtmpClient;
+ private StreamState state;
+ private String publishName;
+ private int streamId;
+ private String publishMode;
+ private final Semaphore lock = new Semaphore(1, true);
+
+ // task timer
+ private static Timer timer;
+
+ public void init(ClientExceptionHandler exceptionHandler) {
+ rtmpClient = new RTMPClient();
+ rtmpClient.setExceptionHandler(exceptionHandler);
+ setState(StreamState.STOPPED);
+ // create a timer
+ timer = new Timer();
+ }
+
+ public void start(String publishName, String publishMode,
+ Object[] params) {
+ setState(StreamState.CONNECTING);
+ this.publishName = publishName;
+ this.publishMode = publishMode;
+ // construct the default params
+ Map<String, Object> defParams = rtmpClient
+ .makeDefaultConnectionParams(host, port, app);
+ defParams.put("swfUrl", "app:/Red5-StreamProxy.swf");
+ // defParams.put("pageUrl", String.format("http://%s:%d/%s", host, port, app));
+ defParams.put("pageUrl", "");
+ rtmpClient.setSwfVerification(true);
+ // set this as the netstream handler
+ rtmpClient.setStreamEventHandler(this);
+ // connect the client
+ rtmpClient.connect(host, port, defParams, this, params);
+ }
+
+ public void stop() {
+ timer.cancel();
+ if (state != StreamState.STOPPED) {
+ rtmpClient.disconnect();
+ }
+ setState(StreamState.STOPPED);
+ frameBuffer.clear();
+ }
+
+ private void createStream() {
+ setState(StreamState.STREAM_CREATING);
+ rtmpClient.createStream(this);
+ }
+
+ public void onPipeConnectionEvent(PipeConnectionEvent event) {
+ log.debug("onPipeConnectionEvent: {}", event);
+ }
+
+ public void pushMessage(IPipe pipe, IMessage message)
+ throws IOException {
+ if (isPublished() && message instanceof RTMPMessage) {
+ RTMPMessage rtmpMsg = (RTMPMessage) message;
+ rtmpClient.publishStreamData(streamId, rtmpMsg);
+ } else {
+ log.trace("Adding message to buffer. Current size: {}",
+ frameBuffer.size());
+ frameBuffer.add(message);
+ }
+ }
+
+ public void onOOBControlMessage(IMessageComponent source, IPipe pipe,
+ OOBControlMessage oobCtrlMsg) {
+ log.debug("onOOBControlMessage: {}", oobCtrlMsg);
+ }
+
+ /**
+ * Called when bandwidth has been configured.
+ */
+ public void onBWDone() {
+ log.debug("onBWDone");
+ rtmpClient.onBWDone(null);
+ }
+
+ public void setHost(String host) {
+ this.host = host;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public void setApp(String app) {
+ this.app = app;
+ }
+
+ public void onStreamEvent(Notify notify) {
+ log.debug("onStreamEvent: {}", notify);
+ ObjectMap<?, ?> map = (ObjectMap<?, ?>) notify.getCall()
+ .getArguments()[0];
+ String code = (String) map.get("code");
+ log.debug("<:{}", code);
+ if (StatusCodes.NS_PUBLISH_START.equals(code)) {
+ setState(StreamState.PUBLISHED);
+ IMessage message = null;
+ while ((message = frameBuffer.poll()) != null) {
+ rtmpClient.publishStreamData(streamId, message);
+ }
+ } else if (StatusCodes.NS_UNPUBLISHED_SUCCESS.equals(code)) {
+ setState(StreamState.UNPUBLISHED);
+ }
+ }
+
+ public void resultReceived(IPendingServiceCall call) {
+ String method = call.getServiceMethodName();
+ log.debug("resultReceived:> {}", method);
+ if ("connect".equals(method)) {
+ // rtmpClient.releaseStream(this, new Object[] { publishName });
+ timer.schedule(new BandwidthStatusTask(), 2000L);
+ } else if ("releaseStream".equals(method)) {
+ // rtmpClient.invoke("FCPublish", new Object[] { publishName },
+ // this);
+ } else if ("createStream".equals(method)) {
+ setState(StreamState.PUBLISHING);
+ Object result = call.getResult();
+ if (result instanceof Integer) {
+ streamId = ((Integer) result).intValue();
+ log.debug("Publishing: {}", state);
+ rtmpClient
+ .publish(streamId, publishName, publishMode, this);
+ } else {
+ rtmpClient.disconnect();
+ setState(StreamState.STOPPED);
+ }
+ } else if ("FCPublish".equals(method)) {
+
+ }
+ }
+
+ protected void setState(StreamState state) {
+ try {
+ lock.acquire();
+ this.state = state;
+ } catch (InterruptedException e) {
+ log.warn("Exception setting state", e);
+ } finally {
+ lock.release();
+ }
+ }
+
+ protected StreamState getState() {
+ return state;
+ }
+
+ public void setConnectionClosedHandler(Runnable connectionClosedHandler) {
+ log.debug("setConnectionClosedHandler: {}", connectionClosedHandler);
+ rtmpClient.setConnectionClosedHandler(connectionClosedHandler);
+ }
+
+ public void setExceptionHandler(ClientExceptionHandler exceptionHandler) {
+ log.debug("setExceptionHandler: {}", exceptionHandler);
+ rtmpClient.setExceptionHandler(exceptionHandler);
+ }
+
+ public boolean isPublished() {
+ return getState().equals(StreamState.PUBLISHED);
+ }
+
+ public boolean isRunning() {
+ return !getState().equals(StreamState.STOPPED);
+ }
+
+ /**
+ * Continues to check for onBWDone
+ */
+ private final class BandwidthStatusTask extends TimerTask {
+
+ @Override
+ public void run() {
+ // check for onBWDone
+ log.debug("Bandwidth check done: {}",
+ rtmpClient.isBandwidthCheckDone());
+ // cancel this task
+ this.cancel();
+ // initate the stream creation
+ createStream();
+ }
+
+ }
+ }
public synchronized void resultReceived(IPendingServiceCall arg0) {
// TODO Auto-generated method stub
@@ -243,11 +340,11 @@ public class ScopeApplicationAdapter ext
public synchronized boolean appStart(IScope scope) {
try {
webAppPath = scope.getResource("/").getFile().getAbsolutePath();
- batchFileFir = webAppPath + File.separatorChar + OpenmeetingsVariables.STREAMS_DIR
+ batchFileDir = webAppPath + File.separatorChar + OpenmeetingsVariables.STREAMS_DIR
+ File.separatorChar;
log.debug("webAppPath : " + webAppPath);
- log.debug("batchFileFir : " + batchFileFir);
+ log.debug("batchFileFir : " + batchFileDir);
// Only load this Class one time
// Initially this value might by empty, because the DB is empty yet
@@ -266,13 +363,8 @@ public class ScopeApplicationAdapter ext
// not set yet
emoticonsManager.loadEmot(scope);
- for (Iterator<String> subIterate = scope.getScopeNames(); subIterate
- .hasNext();) {
-
- String scopeName = subIterate.next();
-
+ for (String scopeName : scope.getScopeNames()) {
log.debug("scopeName :: " + scopeName);
-
}
ScopeApplicationAdapter.initComplete = true;
@@ -915,7 +1007,7 @@ public class ScopeApplicationAdapter ext
}
public IBroadcastScope getBroadcastScope(IScope scope, String name) {
- IBasicScope basicScope = scope.getBasicScope(IBroadcastScope.TYPE, name);
+ IBasicScope basicScope = scope.getBasicScope(ScopeType.BROADCAST, name);
if (!(basicScope instanceof IBroadcastScope)) {
return null;
} else {
@@ -950,7 +1042,7 @@ public class ScopeApplicationAdapter ext
}
});
bsScope.subscribe(proxy, null);
- proxy.start(id, StreamingProxy.LIVE, null);
+ proxy.start(id, "live", null);
streamingProxyMap.put(publishName, proxy);
stream.addStreamListener(new IStreamListener() {
public void packetReceived(IBroadcastStream stream, IStreamPacket packet) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/ISIPRequestResult.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.app.sip.api.result;
/**
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SIPCreateUserRequestResult.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.app.sip.api.result;
import org.openmeetings.app.persistence.beans.user.UserSipData;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/result/SipCreateConferenceRequestResult.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.app.sip.api.result;
/**
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.axis.services;
import java.util.List;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebServiceFacade.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebServiceFacade.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebServiceFacade.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebServiceFacade.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.axis.services;
import javax.servlet.ServletContext;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/BaseScreenEncoder.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/BaseScreenEncoder.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/BaseScreenEncoder.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/BaseScreenEncoder.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.screen.webstart;
import java.awt.Image;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.screen.webstart;
import java.awt.MouseInfo;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java Thu May 17 07:55:39 2012
@@ -1,8 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.screen.webstart;
+import org.red5.client.net.rtmp.INetStreamEventHandler;
import org.red5.server.api.service.IPendingServiceCallback;
import org.red5.server.messaging.IMessage;
-import org.red5.server.net.rtmp.INetStreamEventHandler;
import org.red5.server.net.rtmp.RTMPConnection;
public interface IScreenShare extends IPendingServiceCallback, INetStreamEventHandler {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPSScreenShare.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPSScreenShare.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPSScreenShare.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPSScreenShare.java Thu May 17 07:55:39 2012
@@ -18,14 +18,14 @@
*/
package org.openmeetings.screen.webstart;
+import org.red5.client.net.rtmp.ClientExceptionHandler;
+import org.red5.client.net.rtmps.RTMPSClient;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.net.rtmp.Channel;
-import org.red5.server.net.rtmp.ClientExceptionHandler;
import org.red5.server.net.rtmp.RTMPConnection;
import org.red5.server.net.rtmp.codec.RTMP;
import org.red5.server.net.rtmp.event.Notify;
import org.red5.server.net.rtmp.message.Header;
-import org.red5.server.net.rtmps.RTMPSClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPScreenShare.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPScreenShare.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPScreenShare.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPScreenShare.java Thu May 17 07:55:39 2012
@@ -18,10 +18,10 @@
*/
package org.openmeetings.screen.webstart;
+import org.red5.client.net.rtmp.ClientExceptionHandler;
+import org.red5.client.net.rtmp.RTMPClient;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.net.rtmp.Channel;
-import org.red5.server.net.rtmp.ClientExceptionHandler;
-import org.red5.server.net.rtmp.RTMPClient;
import org.red5.server.net.rtmp.RTMPConnection;
import org.red5.server.net.rtmp.codec.RTMP;
import org.red5.server.net.rtmp.event.Notify;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPTScreenShare.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPTScreenShare.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPTScreenShare.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/RTMPTScreenShare.java Thu May 17 07:55:39 2012
@@ -18,14 +18,14 @@
*/
package org.openmeetings.screen.webstart;
+import org.red5.client.net.rtmp.ClientExceptionHandler;
+import org.red5.client.net.rtmpt.RTMPTClient;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.net.rtmp.Channel;
-import org.red5.server.net.rtmp.ClientExceptionHandler;
import org.red5.server.net.rtmp.RTMPConnection;
import org.red5.server.net.rtmp.codec.RTMP;
import org.red5.server.net.rtmp.event.Notify;
import org.red5.server.net.rtmp.message.Header;
-import org.red5.server.net.rtmpt.RTMPTClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/MouseListenerable.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/MouseListenerable.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/MouseListenerable.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/MouseListenerable.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.screen.webstart.gui;
import java.awt.event.MouseAdapter;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/NumberSpinner.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/NumberSpinner.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/NumberSpinner.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/NumberSpinner.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.screen.webstart.gui;
import javax.swing.JSpinner;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/AbstractUploadController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/AbstractUploadController.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/AbstractUploadController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/AbstractUploadController.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.servlet.outputhandler;
import javax.servlet.ServletContext;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java Thu May 17 07:55:39 2012
@@ -18,6 +18,9 @@
*/
package org.openmeetings.servlet.outputhandler;
+import java.io.File;
+import java.io.FileFilter;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -170,12 +173,6 @@ public class ScreenRequestHandler extend
// trim whitespaces cause it is a directory name
roomName = StringUtils.deleteWhitespace(roomName);
- String current_dir = getServletContext().getRealPath("/");
- log.debug("Current_dir: " + current_dir);
-
- // String jnlpString =
- // ScreenCastTemplate.getInstance(current_dir).getScreenTemplate(rtmphostlocal,
- // red5httpport, sid, room, domain);
ctx.put("rtmphostlocal", rtmphostlocal); // rtmphostlocal
ctx.put("red5httpport", red5httpport); // red5httpport
@@ -229,10 +226,21 @@ public class ScreenRequestHandler extend
log.debug("Creating JNLP Template for TCP solution");
try {
-
+ final String screenShareDirName = "red5-screenshare";
+ //libs
+ StringBuilder libs = new StringBuilder();
+ File screenShareDir = new File(ScopeApplicationAdapter.webAppPath, screenShareDirName);
+ for (File jar : screenShareDir.listFiles(new FileFilter() {
+ public boolean accept(File pathname) {
+ return pathname.getName().endsWith(".jar");
+ }
+ })) {
+ libs.append("\t\t<jar href=\"").append(jar.getName()).append("\"/>\n");
+ }
+ ctx.put("LIBRARIES", libs);
log.debug("RTMP Sharer labels :: " + label_sharer);
- codebase = baseURL + "red5-screenshare";
+ codebase = baseURL + screenShareDirName;
ConnectionType conType = ConnectionType
.valueOf(httpServletRequest
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/UploadController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/UploadController.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/UploadController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/UploadController.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.servlet.outputhandler;
import java.io.File;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/ProcessHelper.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/ProcessHelper.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/ProcessHelper.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/ProcessHelper.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.utils;
import java.io.BufferedReader;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/mail/MailUtil.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/mail/MailUtil.java?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/mail/MailUtil.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/mail/MailUtil.java Thu May 17 07:55:39 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.openmeetings.utils.mail;
import java.util.regex.Pattern;
@@ -9,9 +27,6 @@ public class MailUtil {
);
public static boolean matches(String email) {
-
return rfc2822.matcher(email).matches();
-
}
-
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/screenshare.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/screenshare.vm?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/screenshare.vm (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/screenshare.vm Thu May 17 07:55:39 2012
@@ -28,23 +28,8 @@ limitations under the License.
<all-permissions/>
</security>
<resources>
- <j2se version='1.4+'/>
- <jar href="bcprov-jdk16-145.jar"/>
- <jar href="commons-beanutils-1.8.3.jar"/>
- <jar href="commons-codec-1.6.jar"/>
- <jar href="commons-collections-3.2.1.jar"/>
- <jar href="jcl-over-slf4j-1.6.1.jar"/>
- <jar href="com.springsource.slf4j.api-1.6.1.jar"/>
- <jar href="ehcache-core-2.5.0.jar"/>
- <jar href="httpclient-4.1.2.jar" />
- <jar href="httpcore-4.1.3.jar" />
- <jar href="logback-classic-0.9.28.jar" />
- <jar href="logback-core-0.9.28.jar" />
- <jar href="mina-core-2.0.4.jar" />
- <jar href="red5.jar" />
- <jar href="red5-screenshare.jar" />
- <jar href="spring-context-3.0.6.RELEASE.jar" />
- <jar href="spring-core-3.0.6.RELEASE.jar" />
+ <j2se version='1.4+'/>
+$LIBRARIES
</resources>
<application-desc main-class='$startUpClass'>
<argument>$red5-host</argument>
Modified: incubator/openmeetings/trunk/singlewebapp/src/xsd_template.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/xsd_template.vm?rev=1339508&r1=1339507&r2=1339508&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/xsd_template.vm (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/xsd_template.vm Thu May 17 07:55:39 2012
@@ -1,4 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
targetNamespace="http://www.laszlosystems.com/2003/05/lzx" xmlns:lzx="http://www.laszlosystems.com/2003/05/lzx">
<xs:simpleType name="booleanLiteral">