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 2013/12/12 18:50:34 UTC
svn commit: r1550458 - in /openmeetings/trunk/singlewebapp: ./
WebContent/red5/
src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/
src/main/webapp/WEB-INF/classes/META-INF/
Author: solomax
Date: Thu Dec 12 17:50:33 2013
New Revision: 1550458
URL: http://svn.apache.org/r1550458
Log:
[OPENMEETINGS-841] red5 version is downgraded, so video works as expected
Added:
openmeetings/trunk/singlewebapp/build-red5_ivy.xsl
openmeetings/trunk/singlewebapp/build-red5_ivysettings.xsl
Removed:
openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.sh
openmeetings/trunk/singlewebapp/WebContent/red5/red5.bat
openmeetings/trunk/singlewebapp/WebContent/red5/red5.sh
Modified:
openmeetings/trunk/singlewebapp/.classpath
openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.bat
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
openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
Modified: openmeetings/trunk/singlewebapp/.classpath
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.classpath?rev=1550458&r1=1550457&r2=1550458&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.classpath (original)
+++ openmeetings/trunk/singlewebapp/.classpath Thu Dec 12 17:50:33 2013
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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="src/axis/java"/>
<classpathentry kind="src" path="src/db/java"/>
@@ -18,33 +36,9 @@
</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="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/client/dist/red5_client-jar-r4393.jar"/>
+ <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/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.41.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="output" path="build/classes/eclipse"/>
</classpath>
Modified: openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.bat
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.bat?rev=1550458&r1=1550457&r2=1550458&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.bat (original)
+++ openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.bat Thu Dec 12 17:50:33 2013
@@ -13,20 +13,9 @@ REM limitations under the License.
REM #############################################
@echo off
-SETLOCAL
-
if NOT DEFINED RED5_HOME set RED5_HOME=%~dp0
-REM Previous option set
-REM -Xrs -Xms512M -Xmx768M -Xss128K -XX:PermSize=256M -XX:MaxPermSize=512M -XX:NewRatio=2 -XX:MinHeapFreeRatio=20 -XX:+AggressiveHeap -XX:+DisableExplicitGC -XX:ParallelGCThreads=2 -XX:+UseParallelOldGC -XX:+MaxFDLimit -Dsun.rmi.dgc.client.gcInterval=990000 -Dsun.rmi.dgc.server.gcInterval=990000 -Djava.net.preferIPv4Stack=true -Xverify:none
-
-REM Update 06/2008
-REM -Xmx768m -Xms256 -Xmn512m -Xss128k -XX:+AggressiveOpts -XX:+AggressiveHeap -XX:+DisableExplicitGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=31 -Djava.net.preferIPv4Stack=true -Dsun.rmi.dgc.client.gcInterval=990000 -Dsun.rmi.dgc.server.gcInterval=990000
-
-REM Update 03/2013
-set JVM_OPTS=-Xmx1024m -Xms512m -Xss256k -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=512M -XX:+AggressiveOpts -XX:+DisableExplicitGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:+UseStringCache -XX:+UseParNewGC -XX:SurvivorRatio=16 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=31 -Djava.net.preferIPv4Stack=true -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true
+set JAVA_OPTS= -Xmx768m -Xms512m -Xmn512m -Xss256k -XX:+AggressiveOpts -XX:+DisableExplicitGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:SurvivorRatio=16 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=31 -Djava.net.preferIPv4Stack=true
echo Running High Performance Red5
-"%RED5_HOME%\red5.bat" >> "%RED5_HOME%\log\jvm.stdout"
-
-ENDLOCAL
\ No newline at end of file
+start cmd /c "%RED5_HOME%\red5.bat" >> "%RED5_HOME%\log\jvm.stdout"
Added: openmeetings/trunk/singlewebapp/build-red5_ivy.xsl
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build-red5_ivy.xsl?rev=1550458&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/build-red5_ivy.xsl (added)
+++ openmeetings/trunk/singlewebapp/build-red5_ivy.xsl Thu Dec 12 17:50:33 2013
@@ -0,0 +1,58 @@
+<?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.
+ -->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output omit-xml-declaration="no"/>
+ <xsl:template match="node()|@*">
+ <xsl:copy>
+ <xsl:apply-templates select="node()|@*"/>
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="//*[@name='jaudiotagger']">
+ <xsl:text disable-output-escaping="yes">
+ <dependency org="org" name="jaudiotagger" rev="2.0.4-SNAPSHOT" >
+ <include type="jar" />
+ </dependency>
+ </xsl:text>
+ </xsl:template>
+ <xsl:template match="//*[@name='bcprov-jdk16']">
+ <xsl:text disable-output-escaping="yes">
+ <dependency org="org.bouncycastle" name="bcprov-jdk16" rev="1.45" conf="java6->*" >
+ <include type="jar" />
+ </dependency>
+ </xsl:text>
+ </xsl:template>
+ <xsl:template match="//*[@name='sysout-over-slf4j']">
+ <xsl:text disable-output-escaping="yes">
+ <dependency org="uk.org.lidalia" name="sysout-over-slf4j" rev="1.0.2" >
+ <include type="jar" />
+ </dependency>
+ </xsl:text>
+ </xsl:template>
+ <xsl:template match="//*[@name='httpcore']">
+ <xsl:text disable-output-escaping="yes">
+ <dependency org="org.apache.httpcomponents" name="httpcore" rev="4.2.1" >
+ <include type="jar" />
+ </dependency>
+ </xsl:text>
+ </xsl:template>
+ <xsl:template match="//*[@name='httpclient']">
+ <xsl:text disable-output-escaping="yes">
+ <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.2" >
+ <include type="jar" />
+ </dependency>
+ </xsl:text>
+ </xsl:template>
+</xsl:stylesheet>
Added: openmeetings/trunk/singlewebapp/build-red5_ivysettings.xsl
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build-red5_ivysettings.xsl?rev=1550458&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/build-red5_ivysettings.xsl (added)
+++ openmeetings/trunk/singlewebapp/build-red5_ivysettings.xsl Thu Dec 12 17:50:33 2013
@@ -0,0 +1,29 @@
+<?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.
+ -->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output omit-xml-declaration="no"/>
+ <xsl:template match="node()|@*" name="identity">
+ <xsl:copy>
+ <xsl:apply-templates select="node()|@*"/>
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="url[last()]">
+ <xsl:call-template name="identity"/>
+ <url name="java_net">
+ <artifact pattern="http://download.java.net/maven/2/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]" />
+ </url>
+ </xsl:template>
+</xsl:stylesheet>
Modified: openmeetings/trunk/singlewebapp/build.properties
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.properties?rev=1550458&r1=1550457&r2=1550458&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.properties (original)
+++ openmeetings/trunk/singlewebapp/build.properties Thu Dec 12 17:50:33 2013
@@ -14,9 +14,9 @@ project.status=SNAPSHOT
project.distname=openmeetings
ivy.install.version=2.3.0
maven.version=3.0.4
-red5.server.revision=4738
+red5.server.revision=4393
red5.client.revision=4393
-red5.server.version=1.0.2-RC3
+red5.server.version=1.0.0
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=1550458&r1=1550457&r2=1550458&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Thu Dec 12 17:50:33 2013
@@ -22,7 +22,6 @@
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 +104,7 @@
<path id="check.classpath">
<fileset dir="${red5.lib}" includes="*.jar" />
<fileset dir="${red5.server.lib}" includes="*.jar" />
- <fileset dir="${red5.client.lib}" includes="*.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,7 +113,6 @@
</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>
@@ -411,9 +409,7 @@
</jar>
</target>
- <target name="jar.only" depends="buildJavaDocs, enhance.only, jar.web.only">
-
- </target>
+ <target name="jar.only" depends="buildJavaDocs, enhance.only, jar.web.only"/>
<target name="dist.screen.share" description="Make Screen Share Archive" depends="jar.screen.share, signWebStartJars" />
@@ -864,8 +860,7 @@
</java>
</target>
- <target name="debug-prepare-selenium-copy-test-instance" depends="-prepare-selenium-copy-test-instance">
- </target>
+ <target name="debug-prepare-selenium-copy-test-instance" depends="-prepare-selenium-copy-test-instance"/>
<target name="-prepare-selenium-copy-test-instance" description="Prepare selenium tests by starting up an OpenMeetings instance">
<copy todir="${dist.dir}/testred5">
@@ -898,8 +893,7 @@
</replace>
</target>
- <target name="run-selenium" depends="-dist-test-no-clean, -run-selenium-junit">
- </target>
+ <target name="run-selenium" depends="-dist-test-no-clean, -run-selenium-junit"/>
<target name="-run-selenium" if="${junit.run.selenium}" >
<antcall target="-run-selenium-junit"></antcall>
@@ -952,7 +946,7 @@
<condition property="junit.test.pattern" value="${testcases}" else="Test*">
<isset property="testcases" />
</condition>
-
+
<condition property="junit.test.formatter" value="${test.formatter}" else="xml">
<isset property="test.formatter" />
</condition>
@@ -1100,39 +1094,34 @@
</copy>
</target>
- <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 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>
-
+
<!-- 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">
+ <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>
- <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>
+ <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>
@@ -1155,14 +1144,23 @@
<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">
- <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>
+ <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 -->
<echo message="Red5 Client build" />
</target>
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1550458&r1=1550457&r2=1550458&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Thu Dec 12 17:50:33 2013
@@ -37,6 +37,7 @@
<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>
@@ -389,18 +390,35 @@
</dependency>
<!-- END OF MySQL Driver -->
+ <!-- Tomcat 7 -->
+ <dependency org="org.apache.tomcat.embed" name="tomcat-embed-core" conf="tomcat7->*" rev="7.0.42" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.tomcat.embed" name="tomcat-embed-jasper" conf="tomcat7->*" rev="7.0.42" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.tomcat.embed" name="tomcat-embed-logging-juli" conf="tomcat7->*" rev="7.0.42" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.tomcat.embed" name="tomcat-embed-logging-log4j" conf="tomcat7->*" rev="7.0.42" 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=1550458&r1=1550457&r2=1550458&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 Dec 12 17:50:33 2013
@@ -29,12 +29,12 @@ import java.util.concurrent.TimeUnit;
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/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1550458&r1=1550457&r2=1550458&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml Thu Dec 12 17:50:33 2013
@@ -79,7 +79,7 @@
<property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp.BasicDataSource" />
<property name="openjpa.ConnectionProperties"
value="DriverClassName=com.mysql.jdbc.Driver
- , Url=jdbc:mysql://localhost:3306/openmeetings?autoReconnect=true&useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf-8&connectionCollation=utf8_general_ci&cachePrepStmts=true&cacheCallableStatements=true&cacheServerConfiguration=true&useLocalSessionState=true&elideSetAutoCommits=true&alwaysSendSetIsolation=false&enableQueryTimeouts=false&prepStmtCacheSize=3000&prepStmtCacheSqlLimit=1000
+ , Url=jdbc:mysql://192.168.15.178:3306/openmeetings?autoReconnect=true&useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf-8&connectionCollation=utf8_general_ci&cachePrepStmts=true&cacheCallableStatements=true&cacheServerConfiguration=true&useLocalSessionState=true&elideSetAutoCommits=true&alwaysSendSetIsolation=false&enableQueryTimeouts=false&prepStmtCacheSize=3000&prepStmtCacheSqlLimit=1000
, MaxActive=100
, MaxWait=10000
, TestOnBorrow=true