You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/08/20 18:57:07 UTC
svn commit: r1515875 - in /openmeetings/trunk/singlewebapp: ./
WebContent/red5/ src/org/apache/openmeetings/screen/webstart/
Author: solomax
Date: Tue Aug 20 16:57:07 2013
New Revision: 1515875
URL: http://svn.apache.org/r1515875
Log:
[OPENMEETINGS-679] red5 version is downgraded, screen sharing seems to work as expected
Added:
openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml
Modified:
openmeetings/trunk/singlewebapp/.classpath
openmeetings/trunk/singlewebapp/build.properties
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
Modified: openmeetings/trunk/singlewebapp/.classpath
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.classpath?rev=1515875&r1=1515874&r2=1515875&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.classpath (original)
+++ openmeetings/trunk/singlewebapp/.classpath Tue Aug 20 16:57:07 2013
@@ -27,18 +27,18 @@
<classpathentry kind="lib" path="build/lib/java_16_tools.jar"/>
<classpathentry kind="lib" path="WebContent/screensharing"/>
<classpathentry kind="lib" path="build/red5/server/dist/red5-server.jar" sourcepath="build/red5/server/src/main/java"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/slf4j-api-1.7.5.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/slf4j-api-1.7.2.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/spring-core-3.1.1.RELEASE.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/spring-beans-3.1.1.RELEASE.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/mina-core-2.0.7.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/quartz-2.1.6.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/log4j-over-slf4j-1.7.5.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/log4j-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/commons-collections-20040616.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/spring-web-3.1.1.RELEASE.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/commons-beanutils-1.8.3.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/commons-lang3-3.1.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/logback-core-1.0.13.jar"/>
- <classpathentry kind="lib" path="build/red5/server/dist/lib/logback-classic-1.0.13.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/logback-core-1.0.9.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/logback-classic-1.0.9.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/spring-asm-3.1.1.RELEASE.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/spring-expression-3.1.1.RELEASE.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/spring-context-3.1.1.RELEASE.jar"/>
@@ -48,8 +48,8 @@
<classpathentry kind="lib" path="build/red5/server/dist/lib/spring-test-3.1.1.RELEASE.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/commons-pool-1.5.6.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/ehcache-core-2.5.0.jar"/>
- <classpathentry kind="lib" path="build/red5/client/dist/red5-client-1.0.2-RC1.jar" sourcepath="build/red5/client/src/main/java"/>
- <classpathentry kind="lib" path="build/red5/server/dist/plugins/tomcat-embed-core-7.0.41.jar"/>
+ <classpathentry kind="lib" path="build/red5/client/dist/red5-client-1.0.2-SNAPSHOT.jar" sourcepath="build/red5/client/src/main/java"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/plugins/tomcat-embed-core-jar-7.0.41.jar"/>
<classpathentry kind="lib" path="build/red5/server/dist/lib/bcprov-jdk15on-1.47.jar"/>
<classpathentry kind="output" path="build/classes/eclipse"/>
</classpath>
Added: openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml?rev=1515875&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml (added)
+++ openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml Tue Aug 20 16:57:07 2013
@@ -0,0 +1,268 @@
+<?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.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:lang="http://www.springframework.org/schema/lang" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd">
+
+ <!--
+ The tomcat connectors may be blocking or non-blocking. Select between either option via the constructor-arg.
+ Blocking I/O:
+ <constructor-arg type="java.lang.String" value="org.apache.coyote.http11.Http11Protocol" />
+ Non-blocking I/O:
+ <constructor-arg type="java.lang.String" value="org.apache.coyote.http11.Http11NioProtocol" />
+ -->
+
+ <!-- Tomcat without SSL enabled -->
+ <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" init-method="init" destroy-method="shutdown" depends-on="context.loader">
+
+ <property name="webappFolder" value="${red5.root}/webapps"/>
+
+ <property name="connector">
+ <bean class="org.apache.catalina.connector.Connector">
+ <constructor-arg type="java.lang.String" value="org.apache.coyote.http11.Http11NioProtocol"/>
+ <property name="port" value="${http.port}"/>
+ <property name="redirectPort" value="${https.port}"/>
+ <property name="enableLookups" value="false"/>
+ <property name="useIPVHosts" value="true"/>
+ <property name="URIEncoding" value="${http.URIEncoding}"/>
+ </bean>
+ </property>
+
+ <property name="address">
+ <bean class="java.net.InetSocketAddress">
+ <constructor-arg index="0" type="java.lang.String" value="${http.host}"/>
+ <constructor-arg index="1" type="int" value="${http.port}"/>
+ </bean>
+ </property>
+
+ <property name="baseHost">
+ <bean class="org.apache.catalina.core.StandardHost">
+ <property name="name" value="${http.host}"/>
+ <property name="unpackWARs" value="true"/>
+ <property name="autoDeploy" value="true"/>
+ </bean>
+ </property>
+
+ <property name="valves">
+ <list>
+ </list>
+ </property>
+
+ </bean>
+
+ <!-- Tomcat with SSL enabled -->
+<!--
+ <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" init-method="init" destroy-method="shutdown" depends-on="context.loader">
+
+ <property name="webappFolder" value="${red5.root}/webapps" />
+
+ <property name="connector">
+ <bean class="org.apache.catalina.connector.Connector">
+ <constructor-arg type="java.lang.String" value="org.apache.coyote.http11.Http11Protocol" />
+ <property name="port"><value>${https.port}</value></property>
+ <property name="redirectPort"><value>${http.port}</value></property>
+ <property name="enableLookups"><value>false</value></property>
+ <property name="useIPVHosts"><value>true</value></property>
+ <property name="URIEncoding" value="${http.URIEncoding}" />
+ </bean>
+ </property>
+
+ <property name="address">
+ <bean class="java.net.InetSocketAddress">
+ <constructor-arg index="0" type="java.lang.String" value="${http.host}" />
+ <constructor-arg index="1" type="int" value="${https.port}" />
+ </bean>
+ </property>
+
+ <property name="baseHost">
+ <bean class="org.apache.catalina.core.StandardHost">
+ <property name="name" value="${http.host}" />
+ <property name="unpackWARs" value="true" />
+ <property name="autoDeploy" value="true" />
+ </bean>
+ </property>
+
+ <property name="connectionProperties">
+ <map>
+ <entry>
+ <key><value>port</value></key>
+ <value>${https.port}</value>
+ </entry>
+ <entry>
+ <key><value>redirectPort</value></key>
+ <value>${http.port}</value>
+ </entry>
+ <entry>
+ <key><value>SSLEnabled</value></key>
+ <value>true</value>
+ </entry>
+ <entry>
+ <key><value>sslProtocol</value></key>
+ <value>TLS</value>
+ </entry>
+ <entry>
+ <key><value>clientAuth</value></key>
+ <value>false</value>
+ </entry>
+ <entry>
+ <key><value>keystoreFile</value></key>
+ <value>conf/keystore</value>
+ </entry>
+ <entry>
+ <key><value>keystorePass</value></key>
+ <value>${rtmps.keystorepass}</value>
+ </entry>
+ <entry>
+ <key><value>keystoreType</value></key>
+ <value>JKS</value>
+ </entry>
+ <entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
+ <entry key="useExecutor" value="true"/>
+ <entry key="maxThreads" value="${http.max_threads}"/>
+ <entry key="acceptorThreadCount" value="${http.acceptor_thread_count}"/>
+ <entry key="processorCache" value="${http.processor_cache}"/>
+ </map>
+ </property>
+
+ <property name="valves">
+ <list>
+ </list>
+ </property>
+
+ </bean>
+ -->
+
+ <!-- RTMPT (dedicated server) -->
+<!--
+ <bean id="rtmpt.server" class="org.red5.server.tomcat.rtmpt.RTMPTLoader" init-method="init" lazy-init="true">
+
+ <property name="webappFolder" value="${red5.root}/webapps" />
+
+ <property name="connector">
+ <bean class="org.apache.catalina.connector.Connector">
+ <constructor-arg type="java.lang.String" value="org.apache.coyote.http11.Http11NioProtocol" />
+ <property name="port"><value>${rtmpt.port}</value></property>
+ <property name="enableLookups"><value>false</value></property>
+ <property name="URIEncoding" value="${http.URIEncoding}" />
+ </bean>
+ </property>
+
+ <property name="address">
+ <bean class="java.net.InetSocketAddress">
+ <constructor-arg index="0" type="java.lang.String" value="${rtmpt.host}" />
+ <constructor-arg index="1" type="int" value="${rtmpt.port}" />
+ </bean>
+ </property>
+
+ <property name="host">
+ <bean class="org.apache.catalina.core.StandardHost">
+ <property name="name" value="${rtmpt.host}" />
+ <property name="unpackWARs" value="false" />
+ <property name="autoDeploy" value="false" />
+ </bean>
+ </property>
+
+ <property name="connectionProperties">
+ <map>
+ <entry key="maxKeepAliveRequests" value="${rtmpt.max_keep_alive_requests}"/>
+ <entry key="useExecutor" value="true"/>
+ <entry key="maxThreads" value="${rtmpt.max_threads}"/>
+ <entry key="acceptorThreadCount" value="${rtmpt.acceptor_thread_count}"/>
+ <entry key="processorCache" value="${rtmpt.processor_cache}"/>
+ </map>
+ </property>
+
+ </bean>
+-->
+
+ <!-- RTMPS (dedicated server) -->
+<!--
+ <bean id="rtmps.server" class="org.red5.server.tomcat.rtmps.RTMPSLoader" init-method="init" lazy-init="true">
+
+ <property name="webappFolder" value="${red5.root}/webapps" />
+
+ <property name="connector">
+ <bean class="org.apache.catalina.connector.Connector">
+ <constructor-arg type="java.lang.String" value="org.apache.coyote.http11.Http11NioProtocol" />
+ <property name="port" value="${rtmps.port}" />
+ <property name="redirectPort" value="${rtmp.port}" />
+ <property name="URIEncoding" value="${http.URIEncoding}" />
+ </bean>
+ </property>
+
+ <property name="address">
+ <bean class="java.net.InetSocketAddress">
+ <constructor-arg index="0" type="java.lang.String" value="${rtmps.host}" />
+ <constructor-arg index="1" type="int" value="${rtmps.port}" />
+ </bean>
+ </property>
+
+ <property name="host">
+ <bean class="org.apache.catalina.core.StandardHost">
+ <property name="name" value="${rtmps.host}" />
+ <property name="unpackWARs" value="false" />
+ <property name="autoDeploy" value="false" />
+ </bean>
+ </property>
+
+ <property name="connectionProperties">
+ <map>
+ <entry>
+ <key><value>port</value></key>
+ <value>${rtmps.port}</value>
+ </entry>
+ <entry>
+ <key><value>redirectPort</value></key>
+ <value>${rtmp.port}</value>
+ </entry>
+ <entry>
+ <key><value>SSLEnabled</value></key>
+ <value>true</value>
+ </entry>
+ <entry>
+ <key><value>sslProtocol</value></key>
+ <value>TLS</value>
+ </entry>
+ <entry>
+ <key><value>clientAuth</value></key>
+ <value>false</value>
+ </entry>
+ <entry>
+ <key><value>keystoreFile</value></key>
+ <value>conf/keystore</value>
+ </entry>
+ <entry>
+ <key><value>keystorePass</value></key>
+ <value>${rtmps.keystorepass}</value>
+ </entry>
+ <entry>
+ <key><value>keystoreType</value></key>
+ <value>JKS</value>
+ </entry>
+ <entry key="maxKeepAliveRequests" value="${rtmps.max_keep_alive_requests}"/>
+ <entry key="useExecutor" value="true"/>
+ <entry key="maxThreads" value="${rtmps.max_threads}"/>
+ <entry key="acceptorThreadCount" value="${rtmps.acceptor_thread_count}"/>
+ <entry key="processorCache" value="${rtmps.processor_cache}"/>
+ </map>
+ </property>
+
+ <property name="valves">
+ <list>
+ </list>
+ </property>
+
+ </bean>
+-->
+
+</beans>
Modified: openmeetings/trunk/singlewebapp/build.properties
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.properties?rev=1515875&r1=1515874&r2=1515875&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.properties (original)
+++ openmeetings/trunk/singlewebapp/build.properties Tue Aug 20 16:57:07 2013
@@ -13,9 +13,9 @@ project.version=3.0.0
project.status=SNAPSHOT
ivy.install.version=2.3.0
maven.version=3.0.4
-red5.server.revision=4698
-red5.client.revision=4698
-red5.server.version=1.0.2-RC1
+red5.server.revision=4639
+red5.client.revision=4639
+red5.server.version=1.0.2-SNAPSHOT
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=1515875&r1=1515874&r2=1515875&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Tue Aug 20 16:57:07 2013
@@ -953,11 +953,22 @@
<fileset dir="${red5.lib}/lib" includes="red5-client*.jar" />
</delete>
- <delete file="${red5.lib}/lib/servlet-api-2.5.jar" />
+ <!-- START of Tomcat 7 patch -->
+ <delete>
+ <fileset dir="${red5.lib}/plugins" includes="*.jar" />
+ </delete>
+ <antcall target="-retrieve" inheritAll="true" inheritRefs="true">
+ <param name="ivy.conf.name" value="tomcat7" />
+ <param name="ivy.lib.location" value="${red5.lib}/plugins" />
+ </antcall>
+ <delete file="${red5.lib}/lib/javaee-api-5.1.2.jar" />
+ <delete file="${red5.lib}/lib/servlet-api-2.5.jar" />
+ <!-- END of Tomcat 7 patch -->
<delete dir="${red5.lib}/webapps/installer" />
<delete dir="${red5.lib}/webapps/live" />
<delete dir="${red5.lib}/webapps/vod" />
<copy file="${webcontent.src.dir}/red5/index.html" todir="${red5.lib}/webapps/root" overwrite="true" force="true" />
+ <copy file="${webcontent.src.dir}/red5/jee-container.xml" todir="${red5.lib}/conf" overwrite="true" force="true" />
<copy todir="${red5.lib}" overwrite="true" force="true">
<fileset dir="${webcontent.src.dir}/red5" includes="admin.*,network_test.sh" />
</copy>
@@ -977,7 +988,6 @@
</svn>
<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" />
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1515875&r1=1515874&r2=1515875&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Tue Aug 20 16:57:07 2013
@@ -33,6 +33,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="tomcat7" description="Libraries necessary for patching Red5 to use Tomcat7" />
</configurations>
<dependencies>
<!-- START OF mainlib -->
@@ -384,6 +385,23 @@
<include type="jar" />
</dependency>
+ <!-- Tomcat 7 -->
+ <dependency org="org.apache.tomcat.embed" name="tomcat-embed-core" conf="tomcat7->*" rev="7.0.41" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.tomcat.embed" name="tomcat-embed-jasper" conf="tomcat7->*" rev="7.0.41" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.tomcat.embed" name="tomcat-embed-logging-juli" conf="tomcat7->*" rev="7.0.41" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.tomcat.embed" name="tomcat-embed-logging-log4j" conf="tomcat7->*" rev="7.0.41" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="tomcatplugin" name="tomcatplugin" rev="1.4" conf="tomcat7->*" transitive="false">
+ <include type="jar" />
+ </dependency>
+
<exclude org="javax.servlet" module="servlet-api" type="*" ext="*" conf="*" matcher="exact"/>
</dependencies>
</ivy-module>
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1515875&r1=1515874&r2=1515875&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/CoreScreenShare.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/CoreScreenShare.java Tue Aug 20 16:57:07 2013
@@ -42,9 +42,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;
@@ -294,12 +294,7 @@ public class CoreScreenShare implements
this.readyToRecord = readyToRecord;
}
- protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) {
- if (!(command instanceof Notify)) {
- return;
- }
- Notify invoke = (Notify)command;
-
+ protected void onInvoke(RTMPConnection conn, Channel channel, Header source, org.red5.server.net.rtmp.event.Notify invoke, RTMP rtmp) {
if (invoke.getType() == IEvent.Type.STREAM_DATA) {
return;
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java?rev=1515875&r1=1515874&r2=1515875&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java Tue Aug 20 16:57:07 2013
@@ -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) {
- super.connectionOpened(conn);
+ public void connectionOpened(RTMPConnection conn, RTMP rtmp) {
+ super.connectionOpened(conn, rtmp);
createStream(this);
}
@Override
- public void connectionClosed(RTMPConnection conn) {
- super.connectionClosed(conn);
+ public void connectionClosed(RTMPConnection conn, RTMP rtmp) {
+ super.connectionClosed(conn, rtmp);
connectionClosed();
}
@@ -71,8 +71,8 @@ class RTMPClientPublish extends RTMPClie
}
@Override
- protected void onCommand(RTMPConnection arg0, Channel arg1, Header arg2, ICommand arg3) {
- super.onCommand(arg0, arg1, arg2, arg3);
+ protected void onInvoke(RTMPConnection conn, Channel channel, Header source, Notify invoke, RTMP rtmp) {
+ super.onInvoke(conn, channel, source, invoke, rtmp);
}
public void resultReceived(IPendingServiceCall call) {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java?rev=1515875&r1=1515874&r2=1515875&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java Tue Aug 20 16:57:07 2013
@@ -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;
@@ -66,24 +66,24 @@ public class RTMPSScreenShare extends RT
//
// ------------------------------------------------------------------------
@Override
- public void connectionOpened(RTMPConnection conn) {
+ public void connectionOpened(RTMPConnection conn, RTMP rtmp) {
logger.debug("connection opened");
- super.connectionOpened(conn);
+ super.connectionOpened(conn, rtmp);
this.conn = conn;
}
@Override
- public void connectionClosed(RTMPConnection conn) {
+ public void connectionClosed(RTMPConnection conn, RTMP rtmp) {
logger.debug("connection closed");
- super.connectionClosed(conn);
+ super.connectionClosed(conn, rtmp);
core.stopStream();
}
@Override
- protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) {
- super.onCommand(conn, channel, source, command);
-
- core.onCommand(conn, channel, source, command);
+ 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);
}
@Override
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java?rev=1515875&r1=1515874&r2=1515875&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java Tue Aug 20 16:57:07 2013
@@ -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;
@@ -48,24 +48,24 @@ public class RTMPScreenShare extends RTM
//
// ------------------------------------------------------------------------
@Override
- public void connectionOpened(RTMPConnection conn) {
+ public void connectionOpened(RTMPConnection conn, RTMP rtmp) {
logger.debug("connection opened");
- super.connectionOpened(conn);
+ super.connectionOpened(conn, rtmp);
this.conn = conn;
}
@Override
- public void connectionClosed(RTMPConnection conn) {
+ public void connectionClosed(RTMPConnection conn, RTMP rtmp) {
logger.debug("connection closed");
- super.connectionClosed(conn);
+ super.connectionClosed(conn, rtmp);
core.stopStream();
}
@Override
- protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) {
- super.onCommand(conn, channel, source, command);
+ 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.onCommand(conn, channel, source, command);
+ core.onInvoke(conn, channel, source, invoke, rtmp);
}
@Override
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java?rev=1515875&r1=1515874&r2=1515875&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java Tue Aug 20 16:57:07 2013
@@ -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,24 +46,24 @@ public class RTMPTScreenShare extends RT
//
// ------------------------------------------------------------------------
@Override
- public void connectionOpened(RTMPConnection conn) {
+ public void connectionOpened(RTMPConnection conn, RTMP rtmp) {
logger.debug("connection opened");
- super.connectionOpened(conn);
+ super.connectionOpened(conn, rtmp);
this.conn = conn;
}
@Override
- public void connectionClosed(RTMPConnection conn) {
+ public void connectionClosed(RTMPConnection conn, RTMP rtmp) {
logger.debug("connection closed");
- super.connectionClosed(conn);
+ super.connectionClosed(conn, rtmp);
core.stopStream();
}
@Override
- protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) {
- super.onCommand(conn, channel, source, command);
+ 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.onCommand(conn, channel, source, command);
+ core.onInvoke(conn, channel, source, invoke, rtmp);
}
@Override