Author: solomax
Date: Tue Jul 9 06:15:30 2013
New Revision: 1501105
URL: http://svn.apache.org/r1501105
Log:
[OPENMEETINGS-679] client/server libraries are updated (client still unable to
connect)
Modified:
openmeetings/trunk/singlewebapp/.classpath
openmeetings/trunk/singlewebapp/build.properties
openmeetings/trunk/singlewebapp/build.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=1501105&r1=1501104&r2=1501105&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.classpath (original)
+++ openmeetings/trunk/singlewebapp/.classpath Tue Jul 9 06:15:30 2013
@@ -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.
+ -->
<classpath>
<classpathentry kind="src" path="WebContent/WEB-INF"/>
<classpathentry kind="src" path="src"/>
@@ -34,7 +47,8 @@
<classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-aop-3.1.1.RELEASE.jar"/>
<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/red5-client-1.0.2-SNAPSHOT.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-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>
Modified: openmeetings/trunk/singlewebapp/build.properties
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.properties?rev=1501105&r1=1501104&r2=1501105&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.properties (original)
+++ openmeetings/trunk/singlewebapp/build.properties Tue Jul 9 06:15:30 2013
@@ -13,7 +13,8 @@ project.version=3.0.0
project.status=SNAPSHOT
ivy.install.version=2.3.0
maven.version=3.0.4
-red5.server.revision=4675
+red5.server.revision=4678
+red5.client.revision=4678
red5.server.version=1.0.2-SNAPSHOT
laszlo.proxied=solo
wicket.mode=DEPLOYMENT
Modified: openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1501105&r1=1501104&r2=1501105&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Tue Jul 9 06:15:30 2013
@@ -46,8 +46,10 @@
<property name="docs.src" value="xdocs" />
<property name="red5.server.dir" value="${build.base.dir}/red5/server"
/>
+ <property name="red5.client.dir" value="${build.base.dir}/red5/client"
/>
<property name="red5.lib" value="${red5.server.dir}/dist" />
<property name="red5.server.lib" value="${red5.lib}/lib" />
+ <property name="red5.client.lib" value="${red5.client.dir}/dist" />
<property name="red5.root" value="${dist.dir}/red5" />
<property name="dist.webapps.dir"
value="${red5.root}/webapps/${project.distname}" />
<property name="dist.persistence.dir"
value="${dist.webapps.dir}/WEB-INF/classes/META-INF/" />
@@ -86,6 +88,7 @@
<!-- compile classpath -->
<path id="check.classpath">
<fileset dir="${red5.server.lib}" includes="*.jar" />
+ <fileset dir="${red5.client.lib}" includes="*.jar" />
<fileset dir="${red5.lib}" includes="*.jar" />
<fileset dir="${mainlibs.lib.dir}" includes="*.jar" />
<fileset dir="${om.lib.dir}" includes="*.jar" />
@@ -95,6 +98,7 @@
</path>
<path id="compile.classpath">
<fileset dir="${red5.lib}/plugins" includes="*.jar" />
+ <fileset dir="${red5.server.dir}/target/lib"
includes="junit*.jar" />
<path refid="check.classpath"/>
</path>
@@ -105,6 +109,7 @@
<target name="prepare.mkdir" depends="-java6or7.check">
<mkdir dir="${red5.server.lib}" />
<mkdir dir="${red5.lib}/log" />
+ <mkdir dir="${red5.client.dir}/dist" />
<mkdir dir="${dist.dir}" />
<mkdir dir="${main.out.dir}" />
<mkdir dir="${mainlibs.lib.dir}" />
@@ -187,6 +192,7 @@
<!-- build webapp -->
<target name="-copy-libraries" description="All jars downloaded by ivy
copied to appropriate places">
<copy todir="${red5.root}/lib">
+ <fileset dir="${red5.client.lib}"
includes="red5-client*.jar" />
<fileset dir="${mainlibs.lib.dir}" includes="*.jar" />
</copy>
<copy todir="${dist.webapps.dir}/WEB-INF/lib">
@@ -458,7 +464,7 @@
<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-client*.jar" />
+ <fileset dir="${red5.client.lib}"
includes="red5-client*.jar" />
</copy>
<signjar alias="filetest" keystore="${keystore.file}"
storepass="secret" lazy="false"
sigalg="MD5withRSA" digestalg="SHA1">
@@ -796,6 +802,7 @@
<path id="junit.classpath">
<fileset dir="${junit.lib.dir}" includes="*.jar" />
+ <fileset dir="${red5.server.dir}/target/lib"
includes="junit*.jar" />
<fileset dir="${om.dist.webapp}/WEB-INF/lib">
<include name="*.jar" />
<exclude name="openmeetings*.jar" />
@@ -964,6 +971,9 @@
<include name="**/*"/>
</fileset>
</move>
+ <delete>
+ <fileset dir="${red5.lib}/lib"
includes="red5-client*.jar" />
+ </delete>
<delete file="${red5.lib}/lib/servlet-api-2.5.jar" />
<delete dir="${red5.lib}/webapps/installer" />
@@ -982,8 +992,30 @@
<antcall target="-patch-red5-server-start-script"/>
</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">
+ <svn refid="svn.settings">
+ <checkout
url="https://red5.googlecode.com/svn/java/client/trunk/";
revision="${red5.client.revision}" destPath="${red5.client.dir}" />
+ </svn>
+ <delete>
+ <fileset dir="${red5.client.dir}/lib"
includes="red5-server*.jar" />
+ </delete>
+ <copy file="${red5.lib}/red5-server.jar"
todir="${red5.client.dir}/lib" overwrite="true" force="true" />
+ <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-*.jar" excludes="*javadoc.jar,*sources.jar" />
+ </copy>
+ <echo message="Red5 Client build" />
+ </target>
+
<!-- Check for the Top level libraries -->
- <target name="-retrieve-mainlibs" unless="mainlib.installed"
description="Retrieves the libraries if needed" depends="-retrieve-red5-server">
+ <target name="-retrieve-mainlibs" unless="mainlib.installed"
description="Retrieves the libraries if needed" depends="-retrieve-red5-client">
<!-- Ivy configuration -
http://ant.apache.org/ivy/history/trunk/ant.html -->
<antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
<param name="ivy.conf.name" value="mainlib" />
@@ -1164,6 +1196,7 @@
<antcall target="-retrieve-openlaszlo" inheritAll="true"
inheritRefs="true" />
<antcall target="-retrieve-openlaszlo46" inheritAll="true"
inheritRefs="true" />
<antcall target="-retrieve-cmdadmin" inheritAll="true"
inheritRefs="true" />
+ <antcall target="-retrieve-anakia" inheritAll="true"
inheritRefs="true" />
<antcall target="-process-db" inheritAll="true"
inheritRefs="true" />
</target>
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=1501105&r1=1501104&r2=1501105&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 Jul 9 06:15:30 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,9 +294,12 @@ public class CoreScreenShare implements
this.readyToRecord = readyToRecord;
}
- protected void onInvoke(RTMPConnection conn, Channel channel,
- Header source, Notify invoke, RTMP rtmp) {
-
+ protected void onCommand(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/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=1501105&r1=1501104&r2=1501105&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 Jul 9 06:15:30 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, RTMP state) {
- super.connectionOpened(conn, state);
+ public void connectionOpened(RTMPConnection conn) {
+ super.connectionOpened(conn);
createStream(this);
}
@Override
- public void connectionClosed(RTMPConnection conn, RTMP state) {
- super.connectionClosed(conn, state);
+ public void connectionClosed(RTMPConnection conn) {
+ super.connectionClosed(conn);
connectionClosed();
}
@@ -71,10 +71,8 @@ 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 arg0, Channel arg1, Header
arg2, ICommand arg3) {
+ super.onCommand(arg0, arg1, arg2, arg3);
}
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=1501105&r1=1501104&r2=1501105&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 Jul 9 06:15:30 2013
@@ -23,10 +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.event.Notify;
import org.red5.server.net.rtmp.message.Header;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,25 +66,24 @@ public class RTMPSScreenShare extends RT
//
//
------------------------------------------------------------------------
@Override
- public void connectionOpened(RTMPConnection conn, RTMP state) {
+ public void connectionOpened(RTMPConnection conn) {
logger.debug("connection opened");
- super.connectionOpened(conn, state);
+ super.connectionOpened(conn);
this.conn = conn;
}
@Override
- public void connectionClosed(RTMPConnection conn, RTMP state) {
+ public void connectionClosed(RTMPConnection conn) {
logger.debug("connection closed");
- super.connectionClosed(conn, state);
+ super.connectionClosed(conn);
core.stopStream();
}
@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) {
+ super.onCommand(conn, channel, source, command);
- core.onInvoke(conn, channel, source, invoke, rtmp);
+ core.onCommand(conn, channel, source, command);
}
@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=1501105&r1=1501104&r2=1501105&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 Jul 9 06:15:30 2013
@@ -20,10 +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.event.Notify;
import org.red5.server.net.rtmp.message.Header;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,25 +48,24 @@ public class RTMPScreenShare extends RTM
//
//
------------------------------------------------------------------------
@Override
- public void connectionOpened(RTMPConnection conn, RTMP state) {
+ public void connectionOpened(RTMPConnection conn) {
logger.debug("connection opened");
- super.connectionOpened(conn, state);
+ super.connectionOpened(conn);
this.conn = conn;
}
@Override
- public void connectionClosed(RTMPConnection conn, RTMP state) {
+ public void connectionClosed(RTMPConnection conn) {
logger.debug("connection closed");
- super.connectionClosed(conn, state);
+ super.connectionClosed(conn);
core.stopStream();
}
@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) {
+ super.onCommand(conn, channel, source, command);
- core.onInvoke(conn, channel, source, invoke, rtmp);
+ core.onCommand(conn, channel, source, command);
}
@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=1501105&r1=1501104&r2=1501105&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 Jul 9 06:15:30 2013
@@ -20,10 +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.event.Notify;
import org.red5.server.net.rtmp.message.Header;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,25 +46,24 @@ public class RTMPTScreenShare extends RT
//
//
------------------------------------------------------------------------
@Override
- public void connectionOpened(RTMPConnection conn, RTMP state) {
+ public void connectionOpened(RTMPConnection conn) {
logger.debug("connection opened");
- super.connectionOpened(conn, state);
+ super.connectionOpened(conn);
this.conn = conn;
}
@Override
- public void connectionClosed(RTMPConnection conn, RTMP state) {
+ public void connectionClosed(RTMPConnection conn) {
logger.debug("connection closed");
- super.connectionClosed(conn, state);
+ super.connectionClosed(conn);
core.stopStream();
}
@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) {
+ super.onCommand(conn, channel, source, command);
- core.onInvoke(conn, channel, source, invoke, rtmp);
+ core.onCommand(conn, channel, source, command);
}
@Override
