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 2014/01/30 14:59:51 UTC
svn commit: r1562828 - in /openmeetings/trunk/singlewebapp: ./
WebContent/red5/
src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/
Author: solomax
Date: Thu Jan 30 13:59:51 2014
New Revision: 1562828
URL: http://svn.apache.org/r1562828
Log:
[OPENMEETINGS-894] red5 server is updated to r4756
Removed:
openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml
openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.bat
openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.sh
openmeetings/trunk/singlewebapp/build-red5_ivy.xsl
openmeetings/trunk/singlewebapp/build-red5_ivysettings.xsl
Modified:
openmeetings/trunk/singlewebapp/.classpath
openmeetings/trunk/singlewebapp/LICENSE
openmeetings/trunk/singlewebapp/build.properties
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java
Modified: openmeetings/trunk/singlewebapp/.classpath
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.classpath?rev=1562828&r1=1562827&r2=1562828&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.classpath (original)
+++ openmeetings/trunk/singlewebapp/.classpath Thu Jan 30 13:59:51 2014
@@ -36,9 +36,33 @@
</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&ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=%24%7Bworkspace_loc%3AOpenmeetings%2Fivysettings.xml%7D&loadSettingsOnDemand=false&propertyFiles="/>
- <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=Openmeetings&ivyXmlPath=build%2Fred5%2Fserver%2Fivy.xml&confs=default%2Cjava6&ivySettingsPath=%24%7Bworkspace_loc%3AOpenmeetings%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.2.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/red5-server.jar"/>
+ <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-3.1.4.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-beans-3.1.4.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/commons-collections-20040616.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-web-3.1.4.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-asm-3.1.4.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-expression-3.1.4.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-context-3.1.4.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-context-support-3.1.4.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-3.1.4.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-test-3.1.4.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-jar-r4393.jar"/>
<classpathentry kind="output" path="build/classes/eclipse"/>
</classpath>
Modified: openmeetings/trunk/singlewebapp/LICENSE
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/LICENSE?rev=1562828&r1=1562827&r2=1562828&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/LICENSE (original)
+++ openmeetings/trunk/singlewebapp/LICENSE Thu Jan 30 13:59:51 2014
@@ -223,8 +223,8 @@ webapps/openmeetings/css/theme.css
webapps/openmeetings/docs/*
webapps/openmeetings/js/openmeetings_functions.js
webapps/openmeetings/languages/*
-webapps/openmeetings/public/favicon.ico
webapps/openmeetings/public/config.*
+webapps/openmeetings/public/favicon.ico
webapps/openmeetings/public/main.as3.swf11.swf
webapps/openmeetings/public/main.swf8.swf
webapps/openmeetings/public/maindebug.as3.swf11.swf
@@ -236,7 +236,6 @@ webapps/openmeetings/screensharing
webapps/openmeetings/streams/*
webapps/openmeetings/upload/*
-webapps/openmeetings/WEB-INF/openmeetings-applicationContext.xml
webapps/openmeetings/WEB-INF/red5-web.properties
webapps/openmeetings/WEB-INF/red5-web.xml
webapps/openmeetings/WEB-INF/spring-mvc-servlet.xml
@@ -244,6 +243,7 @@ webapps/openmeetings/WEB-INF/velocity.pr
webapps/openmeetings/WEB-INF/web.xml
webapps/openmeetings/WEB-INF/classes/logback.xsd
webapps/openmeetings/WEB-INF/classes/logback-config.xml
+webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml
webapps/openmeetings/WEB-INF/classes/META-INF/db2_persistence.xml
webapps/openmeetings/WEB-INF/classes/META-INF/derby_persistence.xml
webapps/openmeetings/WEB-INF/classes/META-INF/mssql_persistence.xml
@@ -253,20 +253,20 @@ webapps/openmeetings/WEB-INF/classes/MET
webapps/openmeetings/WEB-INF/classes/META-INF/postgres_persistence.xml
webapps/openmeetings/WEB-INF/conf/axis2.xml
webapps/openmeetings/WEB-INF/conf/axis2.xsd
-webapps/openmeetings/WEB-INF/services/oopenmeetings-3.0.0-SNAPSHOT.aar
+webapps/openmeetings/WEB-INF/services/openmeetings-3.1.0-SNAPSHOT.aar
webapps/openmeetings/WEB-INF/services/services.list
webapps/openmeetings/WEB-INF/services/version.aar
-webapps/openmeetings/WEB-INF/lib/openmeetings-axis-3.0.0-SNAPSHOT.jar
-webapps/openmeetings/WEB-INF/lib/openmeetings-cli-3.0.0-SNAPSHOT.jar
-webapps/openmeetings/WEB-INF/lib/openmeetings-core-3.0.0-SNAPSHOT.jar
-webapps/openmeetings/WEB-INF/lib/openmeetings-db-3.0.0-SNAPSHOT.jar
-webapps/openmeetings/WEB-INF/lib/openmeetings-util-3.0.0-SNAPSHOT.jar
-webapps/openmeetings/WEB-INF/lib/openmeetings-web-3.0.0-SNAPSHOT.jar
+webapps/openmeetings/WEB-INF/lib/openmeetings-axis-3.1.0-SNAPSHOT.jar
+webapps/openmeetings/WEB-INF/lib/openmeetings-cli-3.1.0-SNAPSHOT.jar
+webapps/openmeetings/WEB-INF/lib/openmeetings-core-3.1.0-SNAPSHOT.jar
+webapps/openmeetings/WEB-INF/lib/openmeetings-db-3.1.0-SNAPSHOT.jar
+webapps/openmeetings/WEB-INF/lib/openmeetings-util-3.1.0-SNAPSHOT.jar
+webapps/openmeetings/WEB-INF/lib/openmeetings-web-3.1.0-SNAPSHOT.jar
webapps/openmeetings/screensharing/icon.jpg
webapps/openmeetings/screensharing/splashicon.jpg
-webapps/openmeetings/screensharing/openmeetings-screenshare-3.0.0-SNAPSHOT.jar
+webapps/openmeetings/screensharing/openmeetings-screenshare-3.1.0-SNAPSHOT.jar
======================================================================================================================
@@ -276,9 +276,8 @@ projects licensed under the Apache Licen
======================================================================================================================
red5.jar
-webapps/openmeetings/screensharing/red5-client.jar
-webapps/openmeetings/screensharing/red5.jar
-boot.jar
+webapps/openmeetings/screensharing/red5_client-jar-r4393.jar
+webapps/openmeetings/screensharing/red5_server-jar-r4393.jar
commons-cli-jar-1.2.jar
red5.bat
red5.sh
@@ -286,6 +285,8 @@ red5-highperf.sh
red5-highperf.bat
red5-debug.sh
red5-debug.bat
+red5-server-bootstrap.jar
+red5-server.jar
red5-shutdown.sh
red5-shutdown.bat
conf/access.properties
@@ -293,9 +294,7 @@ conf/build_standalone.properties
conf/catalina.policy
conf/context.xml
conf/ehcache.xml
-conf/jee-container-ssl.xml
conf/jee-container.xml
-conf/keystore
conf/keystore.jmx
conf/logback.xml
conf/no-jee-container.xml
@@ -311,7 +310,6 @@ conf/red5.xml
conf/tomcat-users.xml
conf/truststore.jmx
conf/web.xml
-webapps/red5-default.xml
webapps/root/biglogo.png
webapps/root/crossdomain.xml
webapps/root/favicon.ico
@@ -422,14 +420,14 @@ webapps/openmeetings/WEB-INF/lib/XmlSche
webapps/openmeetings/screensharing/commons-beanutils-1.8.3.jar
webapps/openmeetings/screensharing/commons-codec-1.6.jar
-webapps/openmeetings/screensharing/commons-collections-3.2.1.jar
+webapps/openmeetings/screensharing/commons-collections-20040616.jar
webapps/openmeetings/screensharing/ehcache-core-2.5.0.jar
-webapps/openmeetings/screensharing/httpclient-4.2.jar
+webapps/openmeetings/screensharing/httpclient-4.2.1.jar
webapps/openmeetings/screensharing/httpcore-4.2.1.jar
-webapps/openmeetings/screensharing/mina-core-2.0.4.jar
-webapps/openmeetings/screensharing/spring-beans-3.1.1.RELEASE.jar
-webapps/openmeetings/screensharing/spring-context-3.1.1.RELEASE.jar
-webapps/openmeetings/screensharing/spring-core-3.1.1.RELEASE.jar
+webapps/openmeetings/screensharing/mina-core-2.0.7.jar
+webapps/openmeetings/screensharing/spring-beans-3.1.4.RELEASE.jar
+webapps/openmeetings/screensharing/spring-context-3.1.4.RELEASE.jar
+webapps/openmeetings/screensharing/spring-core-3.1.4.RELEASE.jar
lib/cglib-jar-2.2.2.jar
lib/com.springsource.javax.xml.stream-1.0.1.jar
Modified: openmeetings/trunk/singlewebapp/build.properties
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.properties?rev=1562828&r1=1562827&r2=1562828&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.properties (original)
+++ openmeetings/trunk/singlewebapp/build.properties Thu Jan 30 13:59:51 2014
@@ -9,14 +9,14 @@
# 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.
-project.version=3.0.0
+project.version=3.1.0
project.status=SNAPSHOT
project.distname=openmeetings
ivy.install.version=2.3.0
maven.version=3.0.4
-red5.server.revision=4393
+red5.server.revision=4756
red5.client.revision=4393
-red5.server.version=1.0.0
+red5.server.version=1.0.2-RC4
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=1562828&r1=1562827&r2=1562828&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Thu Jan 30 13:59:51 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" />
@@ -105,7 +106,7 @@
<path id="check.classpath">
<fileset dir="${red5.lib}" includes="*.jar" />
<fileset dir="${red5.server.lib}" includes="*.jar" />
- <fileset dir="${red5.client.lib}" includes="red5-client*.jar" />
+ <fileset dir="${red5.client.lib}" includes="red5_client*.jar" />
<fileset dir="${mainlibs.lib.dir}" includes="*.jar" />
<fileset dir="${om.lib.dir}" includes="*.jar" />
<fileset dir="${junit.lib.dir}" includes="*.jar" />
@@ -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">
@@ -518,7 +520,6 @@
<fileset dir="${red5.server.lib}" includes="mina-core*.jar" />
<fileset dir="${red5.server.lib}" includes="com.springsource.slf4j.api*.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" />
@@ -1138,46 +1139,43 @@
</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">
+ <target name="-retrieve-red5-server" unless="red5.server.installed" description="Retrieves the libraries if needed" depends="-ant-task,-maven-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>
- <antcall target="-retrieve" inheritAll="true" inheritRefs="true">
- <param name="ivy.conf.name" value="tomcat7" />
- <param name="ivy.lib.location" value="${red5.server.dir}/plugins" />
- </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>
+ <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>
@@ -1188,22 +1186,14 @@
<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" />
+ <antcall target="-retrieve" inheritAll="true" inheritRefs="true">
+ <param name="ivy.conf.name" value="red5-client" />
+ <param name="ivy.lib.location" value="${red5.client.lib}" />
+ </antcall>
<!-- END of Tomcat 7 patch -->
<echo message="Red5 Client build" />
</target>
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1562828&r1=1562827&r2=1562828&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Thu Jan 30 13:59:51 2014
@@ -37,7 +37,6 @@
<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" />
</configurations>
@@ -52,22 +51,19 @@
<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="3.1.4.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="3.1.4.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="3.1.4.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="3.1.4.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework" name="spring-webmvc" rev="3.1.1.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-webmvc" rev="3.1.4.RELEASE" transitive="false">
<include type="jar" />
</dependency>
<!-- include type="bundle" / FIXME unable to get openjpa without sources -->
@@ -393,35 +389,18 @@
</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">
+ <dependency org="red5_client" name="red5_client" rev="r4393" conf="red5-client->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="red5_server" name="red5_server" rev="r4393" conf="red5-client->*" transitive="false">
<include type="jar" />
- </dependency-->
+ </dependency>
<exclude org="javax.servlet" module="servlet-api" type="*" ext="*" conf="*" matcher="exact"/>
<exclude org="cglib" module="cglib-nodep" type="*" ext="*" conf="*" matcher="exact"/>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java?rev=1562828&r1=1562827&r2=1562828&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java Thu Jan 30 13:59:51 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;