Author: solomax
Date: Fri Jul 19 06:21:20 2013
New Revision: 1504771
URL: http://svn.apache.org/r1504771
Log:
[OPENMEETINGS-688] red5 version is bumped, RTMPT client works somehow (RTMP is
broken)
Modified:
openmeetings/trunk/singlewebapp/.classpath
openmeetings/trunk/singlewebapp/build.properties
openmeetings/trunk/singlewebapp/build.xml
Modified: openmeetings/trunk/singlewebapp/.classpath
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.classpath?rev=1504771&r1=1504770&r2=1504771&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.classpath (original)
+++ openmeetings/trunk/singlewebapp/.classpath Fri Jul 19 06:21:20 2013
@@ -47,6 +47,7 @@
<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/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/server/dist/lib/bcprov-jdk15on-1.47.jar"/>
Modified: openmeetings/trunk/singlewebapp/build.properties
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.properties?rev=1504771&r1=1504770&r2=1504771&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.properties (original)
+++ openmeetings/trunk/singlewebapp/build.properties Fri Jul 19 06:21:20 2013
@@ -13,8 +13,8 @@ project.version=3.0.0
project.status=SNAPSHOT
ivy.install.version=2.3.0
maven.version=3.0.4
-red5.server.revision=4694
-red5.client.revision=4694
+red5.server.revision=4698
+red5.client.revision=4698
red5.server.version=1.0.2-RC1
laszlo.proxied=solo
wicket.mode=DEPLOYMENT
Modified: openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1504771&r1=1504770&r2=1504771&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Fri Jul 19 06:21:20 2013
@@ -975,10 +975,6 @@
<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" /-->
