Author: solomax
Date: Thu Jun 19 14:54:33 2014
New Revision: 1603906
URL: http://svn.apache.org/r1603906
Log:
[OPENMEETINGS-1028] red5 is updated to work with HTTPS/RTMPS
Removed:
openmeetings/branches/3.0.x/WebContent/red5/jee-container.xml
openmeetings/branches/3.0.x/WebContent/red5/red5-core.xml
openmeetings/branches/3.0.x/WebContent/red5/red5.properties
openmeetings/branches/3.0.x/WebContent/red5/server.xml
Modified:
openmeetings/branches/3.0.x/build.properties
openmeetings/branches/3.0.x/build.xml
openmeetings/branches/3.0.x/ivy.xml
Modified: openmeetings/branches/3.0.x/build.properties
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.properties?rev=1603906&r1=1603905&r2=1603906&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.properties (original)
+++ openmeetings/branches/3.0.x/build.properties Thu Jun 19 14:54:33 2014
@@ -14,7 +14,7 @@ project.status=SNAPSHOT
project.distname=openmeetings
ivy.install.version=2.3.0
maven.version=3.2.1
-red5.server.version=1.0.2-RELEASE
+red5.server.version=1.0.3-SNAPSHOT
red5.client.version=1.0.2-RC2
laszlo.proxied=solo
wicket.mode=DEPLOYMENT
Modified: openmeetings/branches/3.0.x/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.xml?rev=1603906&r1=1603905&r2=1603906&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.xml (original)
+++ openmeetings/branches/3.0.x/build.xml Thu Jun 19 14:54:33 2014
@@ -1174,10 +1174,7 @@
<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}" branch="v${red5.server.version}"/>
- <copy todir="${red5.server.dir}/src/main/assembly"
overwrite="true" force="true">
- <fileset dir="${webcontent.base.dir}/red5"
includes="server.xml" />
- </copy>
+ <git-clone uri="https://github.com/Red5/red5-server.git";
dest="${red5.server.dir}"/><!-- branch="v${red5.server.version}" -->
<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" /-->
@@ -1197,7 +1194,7 @@
<delete dir="${red5.lib}/webapps/vod" />
<copy file="${webcontent.base.dir}/red5/index.html"
todir="${red5.lib}/webapps/root" overwrite="true" force="true" />
<copy todir="${red5.lib}" overwrite="true" force="true">
- <fileset dir="${webcontent.base.dir}/red5"
includes="red5*,admin.*,network_test.sh"
excludes="red5-core.xml,red5.properties"/>
+ <fileset dir="${webcontent.base.dir}/red5"
includes="red5*,admin.*,network_test.sh"/>
</copy>
<!-- FIXME need to be removed as soon as JAudioTagger (will be
officially Dual Licensed) -->
<xslt in="${red5.lib}/conf/red5-common.xml"
out="${red5.lib}/conf/red5-common1.xml" style="build-jaudiotagger.xsl" />
@@ -1205,26 +1202,6 @@
<delete>
<fileset dir="${red5.server.lib}"
includes="jaudiotagger*.jar" />
</delete>
- <!-- FIXME need to be removed as soon as red5 1.0.3 will be
released -->
- <copy todir="${red5.lib}/conf" overwrite="true" force="true">
- <fileset dir="${webcontent.base.dir}/red5"
includes="jee-container.xml,red5-core.xml,red5.properties"/>
- </copy>
- <delete>
- <fileset dir="${red5.server.lib}"
includes="red5-io*.jar" />
- </delete>
- <delete>
- <fileset dir="${red5.lib}/plugins"
includes="tomcatplugin-*.jar" />
- </delete>
- <antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
- <param name="ivy.conf.name" value="red5-io" />
- <param name="ivy.lib.location"
value="${red5.server.lib}" />
- <param name="ivy.transitive" value="false" />
- </antcall>
- <antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
- <param name="ivy.conf.name" value="red5-tomcat" />
- <param name="ivy.lib.location"
value="${red5.lib}/plugins" />
- <param name="ivy.transitive" value="false" />
- </antcall>
<antcall target="-patch-red5-server-start-script"/>
</target>
Modified: openmeetings/branches/3.0.x/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1603906&r1=1603905&r2=1603906&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Thu Jun 19 14:54:33 2014
@@ -39,8 +39,6 @@
<conf name="mysql" description="MySQL JDBC driver" />
<conf name="mvn" description="Maven Ant task to build Red5" />
<conf name="red5-client" description="Red5 Client/Server for
screensharing" />
- <conf name="red5-io" description="Red5 io library" />
- <conf name="red5-tomcat" description="Red5 tomcat plugin" />
<conf name="jgit" description="JGit Ant task to retirieve Red5"
/>
</configurations>
<dependencies>
@@ -412,16 +410,6 @@
<include type="jar" />
</dependency>
- <!-- red5-io -->
- <dependency org="org.red5" name="red5-io" conf="red5-io->*"
rev="1.0.4-SNAPSHOT" transitive="false" >
- <include type="jar" />
- </dependency>
-
- <!-- red5-tomcat -->
- <dependency org="org.red5" name="tomcatplugin"
conf="red5-tomcat->*" rev="1.7" transitive="false" >
- <include type="jar" />
- </dependency>
-
<exclude org="javax.servlet" module="servlet-api" type="*"
ext="*" conf="*" matcher="exact"/>
<exclude org="cglib" module="cglib-nodep" type="*" ext="*"
conf="*" matcher="exact"/>
<exclude org="pull-parser" module="pull-parser" type="*"
ext="*" conf="*" matcher="exact"/>
