Author: solomax
Date: Sun Mar 16 10:37:15 2014
New Revision: 1578020
URL: http://svn.apache.org/r1578020
Log:
[OPENMEETINGS-950] red5 client and server versions are updated
Modified:
openmeetings/trunk/singlewebapp/LICENSE
openmeetings/trunk/singlewebapp/build.properties
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
Modified: openmeetings/trunk/singlewebapp/LICENSE
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/LICENSE?rev=1578020&r1=1578019&r2=1578020&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/LICENSE (original)
+++ openmeetings/trunk/singlewebapp/LICENSE Sun Mar 16 10:37:15 2014
@@ -423,9 +423,9 @@ webapps/openmeetings/screensharing/ehcac
webapps/openmeetings/screensharing/httpclient-4.2.1.jar
webapps/openmeetings/screensharing/httpcore-4.2.1.jar
webapps/openmeetings/screensharing/mina-core-2.0.7.jar
-webapps/openmeetings/screensharing/spring-beans-3.1.4.RELEASE.jar
-webapps/openmeetings/screensharing/spring-context-3.1.4.RELEASE.jar
-webapps/openmeetings/screensharing/spring-core-3.1.4.RELEASE.jar
+webapps/openmeetings/screensharing/spring-beans-4.0.0.RELEASE.jar
+webapps/openmeetings/screensharing/spring-context-4.0.0.RELEASE.jar
+webapps/openmeetings/screensharing/spring-core-4.0.0.RELEASE.jar
lib/cglib-jar-2.2.2.jar
lib/com.springsource.javax.xml.stream-1.0.1.jar
@@ -452,27 +452,27 @@ lib/httpcore-4.2.1.jar
lib/mina-core-2.0.4.jar
lib/mina-integration-beans-2.0.4.jar
lib/mina-integration-jmx-2.0.4.jar
-lib/org.springframework.aspects-jar-3.1.1.RELEASE.jar
-lib/org.springframework.jdbc-jar-3.1.1.RELEASE.jar
-lib/org.springframework.orm-jar-3.1.1.RELEASE.jar
-lib/org.springframework.transaction-jar-3.1.1.RELEASE.jar
-lib/org.springframework.web.servlet-jar-3.1.1.RELEASE.jar
+lib/org.springframework.aspects-jar-4.0.0.RELEASE.jar
+lib/org.springframework.jdbc-jar-4.0.0.RELEASE.jar
+lib/org.springframework.orm-jar-4.0.0.RELEASE.jar
+lib/org.springframework.transaction-jar-4.0.0.RELEASE.jar
+lib/org.springframework.web.servlet-jar-4.0.0.RELEASE.jar
lib/quartz-1.8.5.jar
lib/red5-client.jar
-lib/spring-aop-3.1.1.RELEASE.jar
-lib/spring-asm-3.1.1.RELEASE.jar
-lib/spring-beans-3.1.1.RELEASE.jar
-lib/spring-context-3.1.1.RELEASE.jar
-lib/spring-context-support-3.1.1.RELEASE.jar
-lib/spring-core-3.1.1.RELEASE.jar
-lib/spring-expression-3.1.1.RELEASE.jar
-lib/spring-web-3.1.1.RELEASE.jar
+lib/spring-aop-4.0.0.RELEASE.jar
+lib/spring-asm-4.0.0.RELEASE.jar
+lib/spring-beans-4.0.0.RELEASE.jar
+lib/spring-context-4.0.0.RELEASE.jar
+lib/spring-context-support-4.0.0.RELEASE.jar
+lib/spring-core-4.0.0.RELEASE.jar
+lib/spring-expression-4.0.0.RELEASE.jar
+lib/spring-web-4.0.0.RELEASE.jar
lib/xmlrpc-2.0.1.jar
-plugins/tomcat-embed-core-jar-7.0.42.jar
-plugins/tomcat-embed-jasper-jar-7.0.42.jar
-plugins/tomcat-embed-logging-juli-jar-7.0.42.jar
-plugins/tomcat-embed-logging-log4j-jar-7.0.42.jar
+plugins/tomcat-embed-core-jar-7.0.50.jar
+plugins/tomcat-embed-jasper-jar-7.0.50.jar
+plugins/tomcat-embed-logging-juli-jar-7.0.50.jar
+plugins/tomcat-embed-logging-log4j-jar-7.0.50.jar
plugins/tomcatplugin-jar-1.4.jar
======================================================================================================================
Modified: openmeetings/trunk/singlewebapp/build.properties
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.properties?rev=1578020&r1=1578019&r2=1578020&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.properties (original)
+++ openmeetings/trunk/singlewebapp/build.properties Sun Mar 16 10:37:15 2014
@@ -16,7 +16,8 @@ ivy.install.version=2.3.0
maven.version=3.0.4
red5.server.revision=4756
red5.client.revision=4393
-red5.server.version=1.0.2-RC4
+red5.server.version=1.0.2-M1
+red5.client.version=1.0.2-RC2
laszlo.proxied=solo
wicket.mode=DEPLOYMENT
backup.file.list=backup_v_1_4_rc1_r3326.zip,backup_v_1_5_rc1_r3393.zip,backup_v_1_6_2_r3675.zip,backup_v_1_7_0_r3822.zip,backup_v_1_8_8_r4555.zip,backup_v_1_9_1_r4707.zip,backup_v_2_0_0_r1361497.zip
Modified: openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1578020&r1=1578019&r2=1578020&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Sun Mar 16 10:37:15 2014
@@ -106,7 +106,7 @@
<path id="check.classpath">
<fileset dir="${red5.lib}" includes="*.jar" />
<fileset dir="${red5.server.lib}" includes="*.jar" />
- <fileset dir="${red5.client.lib}" includes="red5_client*.jar" />
+ <fileset dir="${red5.client.lib}" includes="red5-client*.jar" />
<fileset dir="${mainlibs.lib.dir}" includes="*.jar" />
<fileset dir="${om.lib.dir}" includes="*.jar" />
<fileset dir="${junit.lib.dir}" includes="*.jar" />
@@ -505,20 +505,23 @@
<target name="signWebStartJars"
depends="generateSignKey,jar.screen.share">
<copy todir="${screenshare.out.dir}" overwrite="true"
force="true">
<fileset dir="${red5.server.lib}"
includes="commons-codec*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="commons-beanutils*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="commons-collections*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="commons-lang3*.jar" />
<fileset dir="${red5.server.lib}"
includes="httpclient*.jar" />
<fileset dir="${red5.server.lib}"
includes="httpcore*.jar" />
<fileset dir="${red5.server.lib}"
includes="bcprov*.jar" />
<fileset dir="${red5.server.lib}"
includes="ehcache-core*.jar" />
- <fileset dir="${red5.server.lib}"
includes="commons-beanutils*.jar" />
<fileset dir="${red5.server.lib}"
includes="slf4j-api*.jar" />
<fileset dir="${red5.server.lib}"
includes="jcl-over-slf4j*.jar" />
- <fileset dir="${red5.server.lib}"
includes="commons-collections*.jar" />
- <fileset dir="${red5.server.lib}"
includes="spring-context-3*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="spring-context-4*.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="${red5.server.lib}"
includes="red5-io*.jar" />
+ <fileset dir="${red5.lib}" includes="red5-server.jar" />
<fileset dir="${red5.client.lib}" includes="red5*.jar"
/>
</copy>
<taskdef resource="net/sf/antcontrib/antlib.xml">
@@ -1153,11 +1156,25 @@
<property name="maven.installed" value="true" />
</target>
+ <target name="-jgit-task" unless="jgit.installed">
+ <antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
+ <param name="ivy.conf.name" value="jgit" />
+ <param name="ivy.lib.location"
value="${project.lib.dir}" />
+ <param name="ivy.transitive" value="true" />
+ </antcall>
+ <path id="jgit-ant-tasks.classpath">
+ <fileset dir="${project.lib.dir}"
includes="org.eclipse.jgit*.jar" />
+ <fileset dir="${project.lib.dir}" includes="jsch*.jar"
/>
+ </path>
+ <taskdef resource="org/eclipse/jgit/ant/ant-tasks.properties"
classpathref="jgit-ant-tasks.classpath"/>
+ <property name="jgit.installed" value="true" />
+ </target>
+
<!-- Check for the Red5 server libraries -->
- <target name="-retrieve-red5-server" unless="red5.server.installed"
description="Retrieves the libraries if needed" depends="-ant-task,-maven-task">
- <svn refid="svn.settings">
- <checkout
url="https://red5.googlecode.com/svn/java/server/trunk/";
revision="${red5.server.revision}" destPath="${red5.server.dir}" />
- </svn>
+ <target name="-retrieve-red5-server" unless="red5.server.installed"
description="Retrieves the libraries if needed"
depends="-ant-task,-maven-task,-jgit-task">
+ <!-- Needs an empty dir to checkout to -->
+ <delete dir="${red5.server.dir}"></delete>
+ <git-clone uri="https://github.com/Red5/red5-server.git";
dest="${red5.server.dir}" />
<artifact:mvn pom="${red5.server.dir}/pom.xml"
mavenVersion="${maven.version}" fork="true" dir="${red5.server.dir}">
<jvmarg value="-Dmaven.buildNumber.doUpdate=false" />
<!--jvmarg value="-Dassembly.skipAssembly=true" /-->
@@ -1189,12 +1206,21 @@
</target>
<!-- Check for the Red5 client libraries -->
- <target name="-retrieve-red5-client" unless="red5.client.installed"
description="Retrieves the libraries if needed" depends="-retrieve-red5-server">
- <antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
- <param name="ivy.conf.name" value="red5-client" />
- <param name="ivy.lib.location"
value="${red5.client.lib}" />
- </antcall>
- <!-- END of Tomcat 7 patch -->
+ <target name="-retrieve-red5-client" unless="red5.client.installed"
description="Retrieves the libraries if needed"
depends="-retrieve-red5-server,-jgit-task">
+ <!-- Needs an empty dir to checkout to -->
+ <delete dir="${red5.client.dir}"></delete>
+ <git-clone uri="https://github.com/Red5/red5-client.git";
dest="${red5.client.dir}" />
+ <artifact:mvn pom="${red5.client.dir}/pom.xml"
mavenVersion="${maven.version}" fork="true" dir="${red5.client.dir}">
+ <jvmarg value="-Dmaven.buildNumber.doUpdate=false" />
+ <!--jvmarg value="-Dassembly.skipAssembly=true" /-->
+ <arg value="clean"/>
+ <arg value="install"/>
+ <jvmarg value="-Dmaven.test.skip=true" />
+ </artifact:mvn>
+ <copy todir="${red5.client.lib}" overwrite="true" force="true">
+ <fileset dir="${red5.client.dir}/target"
includes="red5-client-${red5.client.version}.jar" />
+ </copy>
+
<echo message="Red5 Client build" />
</target>
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1578020&r1=1578019&r2=1578020&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Sun Mar 16 10:37:15 2014
@@ -38,6 +38,7 @@
<conf name="openlaszlo46" description="Openlaszlo with Flex 4.6
dependencies" />
<conf name="mysql" description="MySQL JDBC driver" />
<conf name="mvn" description="Maven Ant task to build Red5" />
+ <conf name="jgit" description="JGit Ant task to retirieve Red5"
/>
<conf name="red5-client" description="Red5 Client/Server for
screensharing" />
</configurations>
<dependencies>
@@ -51,19 +52,19 @@
<dependency org="asm" name="asm" rev="3.1" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-aspects"
rev="3.1.4.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-aspects"
rev="4.0.0.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-jdbc"
rev="3.1.4.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-jdbc"
rev="4.0.0.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-orm"
rev="3.1.4.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-orm"
rev="4.0.0.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-tx"
rev="3.1.4.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-tx"
rev="4.0.0.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-webmvc"
rev="3.1.4.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-webmvc"
rev="4.0.0.RELEASE" transitive="false">
<include type="jar" />
</dependency>
<!-- include type="bundle" / FIXME unable to get openjpa
without sources -->
@@ -326,7 +327,7 @@
<!-- END OF OPENMEETINGS -->
<!-- START OF JUNIT -->
- <dependency org="org.springframework" name="spring-test"
rev="3.1.1.RELEASE" conf="junit->*" transitive="false">
+ <dependency org="org.springframework" name="spring-test"
rev="4.0.0.RELEASE" conf="junit->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="ant-contrib" name="ant-contrib" rev="1.0b3"
conf="junit->*" transitive="false">
@@ -392,12 +393,10 @@
<include type="jar" />
</dependency>
- <!-- Red5 Client/Server for screensharing -->
- <dependency org="red5_client" name="red5_client" rev="r4393"
conf="red5-client->*" transitive="false">
- <include type="jar" />
- </dependency>
- <dependency org="red5_server" name="red5_server" rev="r4393"
conf="red5-client->*" transitive="false">
+ <!-- JGIT -->
+ <dependency org="org.eclipse.jgit" name="org.eclipse.jgit.ant"
conf="jgit->*" rev="3.3.0.201403021825-r" transitive="true" >
<include type="jar" />
+ <exclude org="org.apache.ant"/>
</dependency>
<exclude org="javax.servlet" module="servlet-api" type="*"
ext="*" conf="*" matcher="exact"/>
Modified:
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1578020&r1=1578019&r2=1578020&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Sun Mar 16 10:37:15 2014
@@ -46,9 +46,9 @@ import org.red5.io.utils.ObjectMap;
import org.red5.server.api.event.IEvent;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.api.service.IPendingServiceCallback;
+import org.red5.server.net.ICommand;
import org.red5.server.net.rtmp.Channel;
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.rtmp.status.StatusCodes;
@@ -305,7 +305,11 @@ public class CoreScreenShare implements
this.readyToRecord = readyToRecord;
}
- protected void onInvoke(RTMPConnection conn, Channel channel, Header
source, org.red5.server.net.rtmp.event.Notify invoke, RTMP rtmp) {
+ protected void onInvoke(RTMPConnection conn, Channel channel, Header
source, ICommand command) {
+ if (!(command instanceof Notify)) {
+ return;
+ }
+ Notify invoke = (Notify)command;
if (invoke.getType() == IEvent.Type.STREAM_DATA) {
return;
}
Modified:
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java?rev=1578020&r1=1578019&r2=1578020&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java
(original)
+++
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java
Sun Mar 16 10:37:15 2014
@@ -23,9 +23,9 @@ import org.red5.client.net.rtmp.INetStre
import org.red5.client.net.rtmp.RTMPClient;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.api.service.IPendingServiceCallback;
+import org.red5.server.net.ICommand;
import org.red5.server.net.rtmp.Channel;
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.slf4j.Logger;
@@ -53,14 +53,14 @@ class RTMPClientPublish extends RTMPClie
}
@Override
- public void connectionOpened(RTMPConnection conn, RTMP rtmp) {
- super.connectionOpened(conn, rtmp);
+ public void connectionOpened(RTMPConnection conn) {
+ super.connectionOpened(conn);
createStream(this);
}
@Override
- public void connectionClosed(RTMPConnection conn, RTMP rtmp) {
- super.connectionClosed(conn, rtmp);
+ public void connectionClosed(RTMPConnection conn) {
+ super.connectionClosed(conn);
connectionClosed();
}
@@ -71,8 +71,9 @@ class RTMPClientPublish extends RTMPClie
}
@Override
- protected void onInvoke(RTMPConnection conn, Channel channel, Header
source, Notify invoke, RTMP rtmp) {
- super.onInvoke(conn, channel, source, invoke, rtmp);
+ protected void onCommand(RTMPConnection conn, Channel channel, Header
source, ICommand command) {
+ // TODO Auto-generated method stub
+ super.onCommand(conn, channel, source, command);
}
public void resultReceived(IPendingServiceCall call) {
Modified:
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java?rev=1578020&r1=1578019&r2=1578020&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
(original)
+++
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
Sun Mar 16 10:37:15 2014
@@ -23,9 +23,9 @@ import org.apache.commons.codec.binary.H
import org.red5.client.net.rtmp.ClientExceptionHandler;
import org.red5.client.net.rtmps.RTMPSClient;
import org.red5.server.api.service.IPendingServiceCallback;
+import org.red5.server.net.ICommand;
import org.red5.server.net.rtmp.Channel;
import org.red5.server.net.rtmp.RTMPConnection;
-import org.red5.server.net.rtmp.codec.RTMP;
import org.red5.server.net.rtmp.message.Header;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,16 +64,16 @@ public class RTMPSScreenShare extends RT
//
//
------------------------------------------------------------------------
@Override
- public void connectionOpened(RTMPConnection conn, RTMP rtmp) {
+ public void connectionOpened(RTMPConnection conn) {
logger.debug("connection opened");
- super.connectionOpened(conn, rtmp);
+ super.connectionOpened(conn);
this.conn = conn;
}
@Override
- public void connectionClosed(RTMPConnection conn, RTMP rtmp) {
+ public void connectionClosed(RTMPConnection conn) {
logger.debug("connection closed");
- super.connectionClosed(conn, rtmp);
+ super.connectionClosed(conn);
if (core.isAudioNotify()) {
AudioTone.play();
}
@@ -81,10 +81,11 @@ public class RTMPSScreenShare extends RT
}
@Override
- protected void onInvoke(RTMPConnection conn, Channel channel, Header
source, org.red5.server.net.rtmp.event.Notify invoke, RTMP rtmp) {
- super.onInvoke(conn, channel, source, invoke, rtmp);
+ protected void onCommand(RTMPConnection conn, Channel channel, Header
source, ICommand command) {
+ // TODO Auto-generated method stub
+ super.onCommand(conn, channel, source, command);
- core.onInvoke(conn, channel, source, invoke, rtmp);
+ core.onInvoke(conn, channel, source, command);
}
@Override
Modified:
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java?rev=1578020&r1=1578019&r2=1578020&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
(original)
+++
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
Sun Mar 16 10:37:15 2014
@@ -20,9 +20,9 @@ package org.apache.openmeetings.screen.w
import org.red5.client.net.rtmp.ClientExceptionHandler;
import org.red5.client.net.rtmp.RTMPClient;
+import org.red5.server.net.ICommand;
import org.red5.server.net.rtmp.Channel;
import org.red5.server.net.rtmp.RTMPConnection;
-import org.red5.server.net.rtmp.codec.RTMP;
import org.red5.server.net.rtmp.message.Header;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,16 +46,16 @@ public class RTMPScreenShare extends RTM
//
//
------------------------------------------------------------------------
@Override
- public void connectionOpened(RTMPConnection conn, RTMP rtmp) {
+ public void connectionOpened(RTMPConnection conn) {
logger.debug("connection opened");
- super.connectionOpened(conn, rtmp);
+ super.connectionOpened(conn);
this.conn = conn;
}
@Override
- public void connectionClosed(RTMPConnection conn, RTMP rtmp) {
+ public void connectionClosed(RTMPConnection conn) {
logger.debug("connection closed");
- super.connectionClosed(conn, rtmp);
+ super.connectionClosed(conn);
if (core.isAudioNotify()) {
AudioTone.play();
}
@@ -63,10 +63,11 @@ public class RTMPScreenShare extends RTM
}
@Override
- protected void onInvoke(RTMPConnection conn, Channel channel, Header
source, org.red5.server.net.rtmp.event.Notify invoke, RTMP rtmp) {
- super.onInvoke(conn, channel, source, invoke, rtmp);
+ protected void onCommand(RTMPConnection conn, Channel channel, Header
source, ICommand command) {
+ // TODO Auto-generated method stub
+ super.onCommand(conn, channel, source, command);
- core.onInvoke(conn, channel, source, invoke, rtmp);
+ core.onInvoke(conn, channel, source, command);
}
@Override
Modified:
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java?rev=1578020&r1=1578019&r2=1578020&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
(original)
+++
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
Sun Mar 16 10:37:15 2014
@@ -20,9 +20,9 @@ package org.apache.openmeetings.screen.w
import org.red5.client.net.rtmp.ClientExceptionHandler;
import org.red5.client.net.rtmpt.RTMPTClient;
+import org.red5.server.net.ICommand;
import org.red5.server.net.rtmp.Channel;
import org.red5.server.net.rtmp.RTMPConnection;
-import org.red5.server.net.rtmp.codec.RTMP;
import org.red5.server.net.rtmp.message.Header;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,16 +46,16 @@ public class RTMPTScreenShare extends RT
//
//
------------------------------------------------------------------------
@Override
- public void connectionOpened(RTMPConnection conn, RTMP rtmp) {
+ public void connectionOpened(RTMPConnection conn) {
logger.debug("connection opened");
- super.connectionOpened(conn, rtmp);
+ super.connectionOpened(conn);
this.conn = conn;
}
@Override
- public void connectionClosed(RTMPConnection conn, RTMP rtmp) {
+ public void connectionClosed(RTMPConnection conn) {
logger.debug("connection closed");
- super.connectionClosed(conn, rtmp);
+ super.connectionClosed(conn);
if (core.isAudioNotify()) {
AudioTone.play();
}
@@ -63,10 +63,11 @@ public class RTMPTScreenShare extends RT
}
@Override
- protected void onInvoke(RTMPConnection conn, Channel channel, Header
source, org.red5.server.net.rtmp.event.Notify invoke, RTMP rtmp) {
- super.onInvoke(conn, channel, source, invoke, rtmp);
-
- core.onInvoke(conn, channel, source, invoke, rtmp);
+ protected void onCommand(RTMPConnection conn, Channel channel, Header
source, ICommand command) {
+ // TODO Auto-generated method stub
+ super.onCommand(conn, channel, source, command);
+
+ core.onInvoke(conn, channel, source, command);
}
@Override
