Author: solomax
Date: Mon Jun 16 18:02:27 2014
New Revision: 1602943
URL: http://svn.apache.org/r1602943
Log:
[OPENMEETINGS-1021] Red5 updated to 1.0.2-RELEASE
Added:
openmeetings/branches/3.0.x/WebContent/red5/server.xml
Removed:
openmeetings/branches/3.0.x/WebContent/red5/red5-highperf.bat
openmeetings/branches/3.0.x/WebContent/red5/red5-highperf.sh
openmeetings/branches/3.0.x/WebContent/red5/red5.bat
openmeetings/branches/3.0.x/WebContent/red5/red5.sh
openmeetings/branches/3.0.x/build-red5_ivy.xsl
openmeetings/branches/3.0.x/build-red5_ivysettings.xsl
Modified:
openmeetings/branches/3.0.x/.classpath
openmeetings/branches/3.0.x/build.properties
openmeetings/branches/3.0.x/build.xml
openmeetings/branches/3.0.x/ivy.xml
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
Modified: openmeetings/branches/3.0.x/.classpath
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/.classpath?rev=1602943&r1=1602942&r2=1602943&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/.classpath (original)
+++ openmeetings/branches/3.0.x/.classpath Mon Jun 16 18:02:27 2014
@@ -36,9 +36,32 @@
</classpathentry>
<classpathentry exported="true" kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con"
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=Openmeetings+3.0.x&ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=%24%7Bworkspace_loc%3AOpenmeetings+3.0.x%2Fivysettings.xml%7D&loadSettingsOnDemand=false&propertyFiles="/>
- <classpathentry kind="con"
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=Openmeetings+3.0.x&ivyXmlPath=build%2Fred5%2Fserver%2Fivy.xml&confs=default%2Cjava6&ivySettingsPath=%24%7Bworkspace_loc%3AOpenmeetings+3.0.x%7D%2Fbuild%2Fred5%2Fserver%2Fivysettings.xml&loadSettingsOnDemand=false&propertyFiles="/>
- <classpathentry kind="lib" path="build/red5/server/dist/red5.jar"
sourcepath="build/red5/server/src"/>
- <classpathentry kind="lib"
path="build/red5/client/dist/red5-client.jar"
sourcepath="build/red5/client/src"/>
<classpathentry kind="lib" path="build/lib/java_16_tools.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/red5-io-1.0.3.jar"/>
+ <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/spring-core-4.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-beans-4.0.3.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.7.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/commons-collections-20040616.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-web-4.0.3.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/spring-expression-4.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-context-4.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-context-support-4.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/aopalliance-1.0.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-aop-4.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-test-4.0.3.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/server/dist/plugins/tomcat-embed-core-7.0.50.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/bcprov-jdk15on-1.47.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/cglib-nodep-2.2.2.jar"/>
+ <classpathentry kind="lib"
path="build/red5/client/dist/red5-client-1.0.2-RC2.jar"
sourcepath="build/red5/client/src/main/java"/>
<classpathentry kind="output" path="build/classes/eclipse"/>
</classpath>
Added: openmeetings/branches/3.0.x/WebContent/red5/server.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/red5/server.xml?rev=1602943&view=auto
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/red5/server.xml (added)
+++ openmeetings/branches/3.0.x/WebContent/red5/server.xml Mon Jun 16 18:02:27
2014
@@ -0,0 +1,214 @@
+<assembly
+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>server</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <files>
+ <file>
+
<source>${project.build.directory}/red5-server-${project.version}.jar</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>red5-server.jar</destName>
+ </file>
+ <file>
+
<source>${project.build.directory}/lib/red5-service-1.0.2-RELEASE.jar</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>red5-service.jar</destName>
+ </file>
+<!-- jenkins doesnt like this entry; "dependency" seems useful only to eclipse
+ <file>
+
<source>${project.build.directory}/dependency/red5-service-${project.version}.jar</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>red5-service.jar</destName>
+ </file>
+-->
+ </files>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>license.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/lib</directory>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>jboss-servlet-api_3.0_spec-1.0.2.Final.jar</exclude>
+ <exclude>antlr-2.7.7.jar</exclude>
+ <exclude>hamcrest-core-1.1.jar</exclude>
+ <exclude>junit-4.10.jar</exclude>
+ <exclude>groboutils-core-5.jar</exclude>
+ <exclude>red5-service-1.0.2-RELEASE.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.build.directory}/dependency</directory>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+
<exclude>jboss-servlet-api_3.0_spec-1.0.2.Final.jar</exclude>
+ <exclude>antlr-2.7.7.jar</exclude>
+ <exclude>hamcrest-core-1.1.jar</exclude>
+ <exclude>junit-4.10.jar</exclude>
+ <exclude>groboutils-core-5.jar</exclude>
+ <exclude>red5-service-1.0.2-RELEASE.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/src/main/server</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/server</directory>
+ <outputDirectory>/</outputDirectory>
+ <fileMode>0755</fileMode>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/src/main/server/conf</directory>
+ <outputDirectory>/conf</outputDirectory>
+ <includes>
+ <include>*.xml</include>
+ <include>*.properties</include>
+ <include>*.policy</include>
+ <include>*.globals</include>
+ <include>*.jmx</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/src/main/server/plugins</directory>
+ <outputDirectory>/plugins</outputDirectory>
+ <includes>
+ <include>*.xml</include>
+ <include>*.properties</include>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/src/main/server/webapps</directory>
+ <outputDirectory>/webapps</outputDirectory>
+ <includes>
+ <include>*.xml</include>
+ </includes>
+ </fileSet>
+ <!-- ROOT -->
+ <fileSet>
+
<directory>${project.basedir}/src/main/server/webapps/root</directory>
+ <outputDirectory>/webapps/root</outputDirectory>
+ <includes>
+ <include>*.xml</include>
+ <include>*.jsp</include>
+ <include>*.html</include>
+ <include>*.ico</include>
+ <include>*.png</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/src/main/server/webapps/root/WEB-INF</directory>
+ <outputDirectory>/webapps/root/WEB-INF</outputDirectory>
+ <includes>
+ <include>*.xml</include>
+ <include>*.properties</include>
+ </includes>
+ </fileSet>
+ <!-- Uncomment the next two file sets when creating a tarball /
zip -->
+ <!--
+ <fileSet>
+ <directory>../../../flash/trunk/deploy</directory>
+ <outputDirectory>/webapps/root/demos</outputDirectory>
+ <includes>
+ <include>*.html</include>
+ <include>*.xml</include>
+ <include>*.js</include>
+ <include>*.swf</include>
+ <include>*.air</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>../../../flash/trunk/deploy/assets</directory>
+
<outputDirectory>/webapps/root/demos/assets</outputDirectory>
+ <includes>
+ <include>*.js</include>
+ <include>*.swf</include>
+ </includes>
+ </fileSet>
+ -->
+ <!-- Installer -->
+ <fileSet>
+
<directory>${project.basedir}/src/main/server/webapps/installer</directory>
+ <outputDirectory>/webapps/installer</outputDirectory>
+ <includes>
+ <include>*.html</include>
+ <include>*.js</include>
+ <include>*.swf</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/src/main/server/webapps/installer/WEB-INF</directory>
+
<outputDirectory>/webapps/installer/WEB-INF</outputDirectory>
+ <includes>
+ <include>*.xml</include>
+ <include>*.properties</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/src/main/server/webapps/installer/history</directory>
+
<outputDirectory>/webapps/installer/history</outputDirectory>
+ <includes>
+ <include>*.html</include>
+ <include>*.js</include>
+ <include>*.css</include>
+ </includes>
+ </fileSet>
+ <!-- Live -->
+ <fileSet>
+
<directory>${project.basedir}/src/main/server/webapps/live/WEB-INF</directory>
+ <outputDirectory>/webapps/live/WEB-INF</outputDirectory>
+ <includes>
+ <include>*.xml</include>
+ <include>*.properties</include>
+ </includes>
+ </fileSet>
+ <!-- VOD -->
+ <fileSet>
+
<directory>${project.basedir}/src/main/server/webapps/vod</directory>
+ <outputDirectory>/webapps/vod</outputDirectory>
+ <includes>
+ <include>*.html</include>
+ <include>*.js</include>
+ <include>*.swf</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/src/main/server/webapps/vod/WEB-INF</directory>
+ <outputDirectory>/webapps/vod/WEB-INF</outputDirectory>
+ <includes>
+ <include>*.xml</include>
+ <include>*.properties</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/src/main/server/webapps/vod/streams</directory>
+ <outputDirectory>/webapps/vod/streams</outputDirectory>
+ <includes>
+ <include>*.flv</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified: openmeetings/branches/3.0.x/build.properties
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.properties?rev=1602943&r1=1602942&r2=1602943&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.properties (original)
+++ openmeetings/branches/3.0.x/build.properties Mon Jun 16 18:02:27 2014
@@ -13,10 +13,9 @@ project.version=3.0.3
project.status=SNAPSHOT
project.distname=openmeetings
ivy.install.version=2.3.0
-maven.version=3.0.4
-red5.server.revision=4393
-red5.client.revision=4393
-red5.server.version=1.0.0
+maven.version=3.2.1
+red5.server.version=1.0.2-RELEASE
+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/branches/3.0.x/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.xml?rev=1602943&r1=1602942&r2=1602943&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.xml (original)
+++ openmeetings/branches/3.0.x/build.xml Mon Jun 16 18:02:27 2014
@@ -22,6 +22,7 @@
xmlns="antlib:org.apache.tools.ant"
xmlns:rat="antlib:org.apache.rat.anttasks"
xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:artifact="antlib:org.apache.maven.artifact.ant"
>
<loadproperties srcFile="build.properties" />
@@ -114,6 +115,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>
<path id="junit.classpath">
@@ -503,22 +505,24 @@
<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"
/>
- <fileset dir="${red5.lib}" includes="red5*.jar" />
</copy>
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath refid="check.classpath" />
@@ -1040,8 +1044,6 @@
<jvmarg value="-Dbasedir=${basedir}" />
<jvmarg value="-Dred5.config_root=${red5.root}/conf" />
<jvmarg value="-Dbackups.dir=${junit.backups.dir}" />
- <!--jvmarg value="-Xdebug"/>
- <jvmarg
value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/-->
<formatter type="${junit.test.formatter}" />
<batchtest todir="${junit.report.dir}">
<fileset dir="${main.out.dir}">
@@ -1140,46 +1142,60 @@
</copy>
</target>
- <target name="-patch-red5-server-highperf-script">
- <echo>Going to patch red5-highperf.bat</echo>
- <copy todir="${red5.lib}" overwrite="true" force="true">
- <fileset dir="${webcontent.base.dir}/red5"
includes="red5-highperf.bat" />
- </copy>
+ <target name="-maven-task" unless="maven.installed">
+ <antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
+ <param name="ivy.conf.name" value="mvn" />
+ <param name="ivy.lib.location"
value="${project.lib.dir}" />
+ </antcall>
+ <path id="maven-ant-tasks.classpath">
+ <fileset dir="${project.lib.dir}"
includes="maven-ant-tasks*.jar" />
+ </path>
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="maven-ant-tasks.classpath" />
+ <property name="maven.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">
- <svn refid="svn.settings">
- <checkout
url="https://red5.googlecode.com/svn/java/server/trunk/";
revision="${red5.server.revision}" destPath="${red5.server.dir}" />
- </svn>
- <!-- START of Tomcat 7 patch -->
- <delete>
- <fileset dir="${red5.server.dir}/plugins"
includes="*.jar" />
- </delete>
+ <target name="-jgit-task" unless="jgit.installed">
<antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
- <param name="ivy.conf.name" value="tomcat7" />
- <param name="ivy.lib.location"
value="${red5.server.dir}/plugins" />
+ <param name="ivy.conf.name" value="jgit" />
+ <param name="ivy.lib.location"
value="${project.lib.dir}" />
+ <param name="ivy.transitive" value="true" />
</antcall>
- <!-- END of Tomcat 7 patch -->
- <xslt in="${red5.server.dir}/ivy.xml"
out="${red5.server.dir}/ivy1.xml" style="build-red5_ivy.xsl" />
- <move file="${red5.server.dir}/ivy1.xml"
tofile="${red5.server.dir}/ivy.xml" />
- <xslt in="${red5.server.dir}/ivysettings.xml"
out="${red5.server.dir}/ivysettings1.xml" style="build-red5_ivysettings.xsl" />
- <move file="${red5.server.dir}/ivysettings1.xml"
tofile="${red5.server.dir}/ivysettings.xml" />
- <subant target="dist">
- <fileset dir="${red5.server.dir}" includes="build.xml"
/>
- </subant>
- <delete>
- <fileset dir="${red5.lib}/lib"
includes="red5-client*.jar" />
- </delete>
+ <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,-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>
+ <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" /-->
+ <arg value="clean"/>
+ <arg value="install"/>
+ <jvmarg value="-Dmaven.test.skip=true" />
+ </artifact:mvn>
+ <untar
src="${red5.server.dir}/target/red5-server-${red5.server.version}-server.tar.gz"
dest="${red5.server.dir}/target" compression="gzip"/>
+ <move todir="${red5.lib}">
+ <fileset
dir="${red5.server.dir}/target/red5-server-${red5.server.version}">
+ <include name="**/*"/>
+ </fileset>
+ </move>
- <!-- START of Tomcat 7 patch -->
- <delete file="${red5.lib}/lib/javaee-api-5.1.2.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.base.dir}/red5/index.html"
todir="${red5.lib}/webapps/root" overwrite="true" force="true" />
- <copy file="${webcontent.base.dir}/red5/jee-container.xml"
todir="${red5.lib}/conf" overwrite="true" force="true" />
<copy todir="${red5.lib}" overwrite="true" force="true">
<fileset dir="${webcontent.base.dir}/red5"
includes="red5*,admin.*,network_test.sh" />
</copy>
@@ -1190,23 +1206,24 @@
<fileset dir="${red5.server.lib}"
includes="jaudiotagger*.jar" />
</delete>
<antcall target="-patch-red5-server-start-script"/>
- <antcall target="-patch-red5-server-highperf-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="http://red5.googlecode.com/svn/java/client/trunk/";
revision="${red5.client.revision}" destPath="${red5.client.dir}" />
- </svn>
- <copy file="${red5.lib}/red5.jar"
todir="${red5.client.dir}/lib" overwrite="true" force="true" />
- <xslt in="${red5.client.dir}/ivy.xml"
out="${red5.client.dir}/ivy1.xml" style="build-red5_ivy.xsl" />
- <move file="${red5.client.dir}/ivy1.xml"
tofile="${red5.client.dir}/ivy.xml" />
- <subant target="dist">
- <fileset dir="${red5.client.dir}" includes="build.xml"
/>
- </subant>
- <!-- START of Tomcat 7 patch -->
- <delete file="${red5.client.lib}/lib/javaee-api-5.1.2.jar" />
- <!-- 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/branches/3.0.x/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1602943&r1=1602942&r2=1602943&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Mon Jun 16 18:02:27 2014
@@ -37,9 +37,9 @@
<conf name="openlaszlo" description="Openlaszlo dependencies" />
<conf name="openlaszlo46" description="Openlaszlo with Flex 4.6
dependencies" />
<conf name="mysql" description="MySQL JDBC driver" />
- <conf name="tomcat7" description="Libraries necessary for
patching Red5 to use Tomcat7" />
<conf name="mvn" description="Maven Ant task to build Red5" />
<conf name="red5-client" description="Red5 Client/Server for
screensharing" />
+ <conf name="jgit" description="JGit Ant task to retirieve Red5"
/>
</configurations>
<dependencies>
<!-- START OF mainlib -->
@@ -52,22 +52,22 @@
<dependency org="asm" name="asm" rev="3.1" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-aspects"
rev="3.1.1.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-aspects"
rev="4.0.3.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-jdbc"
rev="3.1.1.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-jdbc"
rev="4.0.3.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-orm"
rev="3.1.1.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-orm"
rev="4.0.3.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-tx"
rev="3.1.1.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-tx"
rev="4.0.3.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-webmvc"
rev="3.1.1.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-webmvc"
rev="4.0.3.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework"
name="spring-context-support" rev="3.1.1.RELEASE" transitive="false">
+ <dependency org="org.springframework"
name="spring-context-support" rev="4.0.3.RELEASE" transitive="false">
<include type="jar" />
</dependency>
<!-- include type="bundle" / FIXME unable to get openjpa
without sources -->
@@ -330,7 +330,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.3.RELEASE" conf="junit->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="ant-contrib" name="ant-contrib" rev="1.0b3"
conf="junit->*" transitive="false">
@@ -391,36 +391,17 @@
</dependency>
<!-- END OF MySQL Driver -->
- <!-- Tomcat 7 -->
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-core" conf="tomcat7->*" rev="7.0.50" transitive="false" >
- <include type="jar" />
- </dependency>
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-jasper" conf="tomcat7->*" rev="7.0.50" transitive="false" >
- <include type="jar" />
- </dependency>
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-juli" conf="tomcat7->*" rev="7.0.50"
transitive="false" >
- <include type="jar" />
- </dependency>
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-log4j" conf="tomcat7->*" rev="7.0.50"
transitive="false" >
- <include type="jar" />
- </dependency>
- <dependency org="tomcatplugin" name="tomcatplugin" rev="1.4"
conf="tomcat7->*" transitive="false">
- <include type="jar" />
- </dependency>
-
<!-- MVN -->
<dependency org="org.apache.maven" name="maven-ant-tasks"
conf="mvn->*" rev="2.1.3" transitive="false" >
<include type="jar" />
</dependency>
- <!-- Red5 Client/Server for screensharing -->
- <!-- dependency org="red5_client" name="red5_client"
rev="r4393" conf="red5-client->*" transitive="false">
+ <!-- JGIT -->
+ <dependency org="org.eclipse.jgit" name="org.eclipse.jgit.ant"
conf="jgit->*" rev="3.3.2.201404171909-r" transitive="true" >
<include type="jar" />
+ <exclude org="org.apache.ant"/>
</dependency>
- <dependency org="red5_server" name="red5_server" rev="r4393"
conf="red5-client->*" 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"/>
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java?rev=1602943&r1=1602942&r2=1602943&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java
Mon Jun 16 18:02:27 2014
@@ -32,12 +32,12 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData.Status;
import org.apache.openmeetings.util.OmFileHelper;
import org.red5.io.IStreamableFile;
-import org.red5.io.IStreamableFileFactory;
-import org.red5.io.IStreamableFileService;
import org.red5.io.ITagWriter;
-import org.red5.io.StreamableFileFactory;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.scope.IScope;
+import org.red5.server.api.service.IStreamableFileService;
+import org.red5.server.api.stream.IStreamableFileFactory;
+import org.red5.server.stream.StreamableFileFactory;
import org.red5.server.util.ScopeUtils;
import org.slf4j.Logger;
Modified:
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1602943&r1=1602942&r2=1602943&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Mon Jun 16 18:02:27 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;
@@ -306,7 +306,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 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/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java?rev=1602943&r1=1602942&r2=1602943&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java
(original)
+++
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java
Mon Jun 16 18:02:27 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,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 conn, Channel channel, Header
source, ICommand command) {
+ super.onCommand(conn, channel, source, command);
}
public void resultReceived(IPendingServiceCall call) {
Modified:
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java?rev=1602943&r1=1602942&r2=1602943&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
(original)
+++
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
Mon Jun 16 18:02:27 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,12 +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);
-
- core.onInvoke(conn, channel, source, invoke, rtmp);
+ protected void onCommand(RTMPConnection conn, Channel channel, Header
source, ICommand command) {
+ super.onCommand(conn, channel, source, command);
+ core.onCommand(conn, channel, source, command);
}
-
+
@Override
public void handleException(Throwable throwable) {
logger.error("{}", new Object[] { throwable.getCause() });
Modified:
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java?rev=1602943&r1=1602942&r2=1602943&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
(original)
+++
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
Mon Jun 16 18:02:27 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,12 +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);
-
- core.onInvoke(conn, channel, source, invoke, rtmp);
+ protected void onCommand(RTMPConnection conn, Channel channel, Header
source, ICommand command) {
+ super.onCommand(conn, channel, source, command);
+ core.onCommand(conn, channel, source, command);
}
-
+
@Override
public void handleException(Throwable throwable) {
logger.error("{}", new Object[] { throwable.getCause() });
Modified:
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java?rev=1602943&r1=1602942&r2=1602943&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
(original)
+++
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
Mon Jun 16 18:02:27 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,12 +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) {
+ super.onCommand(conn, channel, source, command);
+ core.onCommand(conn, channel, source, command);
}
-
+
@Override
public void handleException(Throwable throwable) {
logger.error("{}", new Object[] { throwable.getCause() });
