Author: solomax
Date: Mon Oct 22 08:48:30 2012
New Revision: 1400803
URL: http://svn.apache.org/viewvc?rev=1400803&view=rev
Log:
Tomcat 7 patch for red5.
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container-ssl.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/ivy.xml
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container-ssl.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container-ssl.xml?rev=1400803&r1=1400802&r2=1400803&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container-ssl.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container-ssl.xml
Mon Oct 22 08:48:30 2012
@@ -98,21 +98,11 @@
<property name="name" value="${http.host}" />
<property name="unpackWARs" value="true" />
<property name="autoDeploy" value="true" />
- <property name="xmlValidation" value="false" />
- <property name="xmlNamespaceAware" value="false" />
</bean>
</property>
<property name="valves">
<list>
- <bean id="valve.access"
class="org.apache.catalina.valves.AccessLogValve">
- <property name="directory" value="log" />
- <property name="prefix" value="${http.host}_access." />
- <property name="suffix" value=".log" />
- <property name="pattern" value="common" />
- <property name="resolveHosts" value="false" />
- <property name="rotatable" value="true" />
- </bean>
</list>
</property>
@@ -147,8 +137,6 @@
<property name="name" value="${rtmpt.host}" />
<property name="unpackWARs" value="false" />
<property name="autoDeploy" value="false" />
- <property name="xmlValidation" value="false" />
- <property name="xmlNamespaceAware"
value="false" />
</bean>
</property>
@@ -174,8 +162,6 @@
<property name="name" value="${rtmps.host}" />
<property name="unpackWARs" value="false" />
<property name="autoDeploy" value="false" />
- <property name="xmlValidation" value="false" />
- <property name="xmlNamespaceAware"
value="false" />
</bean>
</property>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml?rev=1400803&r1=1400802&r2=1400803&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml
Mon Oct 22 08:48:30 2012
@@ -56,21 +56,11 @@
<property name="name" value="${http.host}" />
<property name="unpackWARs" value="true" />
<property name="autoDeploy" value="true" />
- <property name="xmlValidation" value="false" />
- <property name="xmlNamespaceAware" value="false" />
</bean>
</property>
<property name="valves">
<list>
- <bean id="valve.access"
class="org.apache.catalina.valves.AccessLogValve">
- <property name="directory" value="log" />
- <property name="prefix" value="${http.host}_access." />
- <property name="suffix" value=".log" />
- <property name="pattern" value="common" />
- <property name="resolveHosts" value="false" />
- <property name="rotatable" value="true" />
- </bean>
</list>
</property>
@@ -111,8 +101,6 @@
<property name="name" value="${rtmpt.host}" />
<property name="unpackWARs" value="false" />
<property name="autoDeploy" value="false" />
- <property name="xmlValidation" value="false" />
- <property name="xmlNamespaceAware"
value="false" />
</bean>
</property>
@@ -144,8 +132,6 @@
<property name="name" value="${rtmps.host}" />
<property name="unpackWARs" value="false" />
<property name="autoDeploy" value="false" />
- <property name="xmlValidation" value="false" />
- <property name="xmlNamespaceAware"
value="false" />
</bean>
</property>
@@ -193,14 +179,6 @@
<property name="valves">
<list>
- <bean id="valve.access"
class="org.apache.catalina.valves.AccessLogValve">
- <property name="directory" value="log" />
- <property name="prefix"
value="${rtmps.host}_rtmps_access." />
- <property name="suffix" value=".log" />
- <property name="pattern" value="common" />
- <property name="resolveHosts" value="false" />
- <property name="rotatable" value="true" />
- </bean>
</list>
</property>
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1400803&r1=1400802&r2=1400803&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Mon Oct 22 08:48:30 2012
@@ -847,14 +847,21 @@
<svn refid="svn.settings">
<checkout
url="http://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 -->
<subant target="dist">
<fileset dir="${red5.server.dir}" includes="build.xml"
/>
</subant>
- <echo message="JAVAEE: ${red5.server.lib}/javaee-api-5.1.2.jar"
/>
- <jar destfile="${red5.server.lib}/javaee-api-5.1.2.om.jar">
- <zipfileset
src="${red5.server.lib}/javaee-api-5.1.2.jar"
excludes="javax/persistence/**/*.*" />
- </jar>
- <delete file="${red5.server.lib}/javaee-api-5.1.2.jar" />
+ <!-- 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" />
@@ -890,6 +897,9 @@
<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: incubator/openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1400803&r1=1400802&r2=1400803&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Mon Oct 22 08:48:30 2012
@@ -31,6 +31,7 @@
<conf name="svntask" description="Svn task dependencies" />
<conf name="openlaszlo" description="Openlaszlo dependencies" />
<conf name="mysql" description="MySQL JDBC driver" />
+ <conf name="tomcat7" description="Libraries necessary for
patching Red5 to use Tomcat7" />
</configurations>
<dependencies>
<!-- START OF mainlib -->
@@ -321,6 +322,24 @@
<include type="jar" />
</dependency>
<!-- END OF MySQL Driver -->
+
+ <!-- Tomcat 7 -->
+ <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-core" conf="tomcat7->*" rev="7.0.32" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-jasper" conf="tomcat7->*" rev="7.0.32" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-juli" conf="tomcat7->*" rev="7.0.32"
transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-log4j" conf="tomcat7->*" rev="7.0.32"
transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="tomcatplugin" name="tomcatplugin" rev="1.4"
conf="tomcat7->*" transitive="false">
+ <include type="jar" />
+ </dependency>
+
</dependencies>
</ivy-module>
