Author: solomax
Date: Thu Jul 4 04:18:29 2013
New Revision: 1499644
URL: http://svn.apache.org/r1499644
Log:
[OPENMEETINGS-693] Tomcat 7 patch is removed
Removed:
openmeetings/trunk/singlewebapp/WebContent/red5/jee-container-ssl.xml
Modified:
openmeetings/trunk/singlewebapp/.classpath
openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml
openmeetings/trunk/singlewebapp/build.properties
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml
Modified: openmeetings/trunk/singlewebapp/.classpath
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.classpath?rev=1499644&r1=1499643&r2=1499644&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.classpath (original)
+++ openmeetings/trunk/singlewebapp/.classpath Thu Jul 4 04:18:29 2013
@@ -14,18 +14,18 @@
<classpathentry kind="lib" path="build/lib/java_16_tools.jar"/>
<classpathentry kind="lib" path="WebContent/screensharing"/>
<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.2.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.1.RELEASE.jar"/>
<classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-beans-3.1.1.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.2.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.1.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.9.jar"/>
- <classpathentry kind="lib"
path="build/red5/server/dist/lib/logback-classic-1.0.9.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.1.RELEASE.jar"/>
<classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-expression-3.1.1.RELEASE.jar"/>
<classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-context-3.1.1.RELEASE.jar"/>
@@ -35,5 +35,6 @@
<classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-test-3.1.1.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/red5-client-1.0.2-SNAPSHOT.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/plugins/tomcat-embed-core-7.0.41.jar"/>
<classpathentry kind="output" path="build/classes/eclipse"/>
</classpath>
Modified: openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml?rev=1499644&r1=1499643&r2=1499644&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml Thu Jul
4 04:18:29 2013
@@ -23,24 +23,28 @@
xmlns:lang="http://www.springframework.org/schema/lang";
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-3.0.xsd";>
-
+
+ <!--
+ The tomcat connectors may be blocking or non-blocking. Select between
either option via the constructor-arg.
+ Blocking I/O:
+ <constructor-arg type="java.lang.String"
value="org.apache.coyote.http11.Http11Protocol" />
+ Non-blocking I/O:
+ <constructor-arg type="java.lang.String"
value="org.apache.coyote.http11.Http11NioProtocol" />
+ -->
+
+ <!-- Tomcat without SSL enabled -->
<bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader"
init-method="init" destroy-method="shutdown" depends-on="context.loader">
<property name="webappFolder" value="${red5.root}/webapps" />
<property name="connector">
<bean class="org.apache.catalina.connector.Connector">
- <!-- Blocking I/O -->
<constructor-arg type="java.lang.String"
value="org.apache.coyote.http11.Http11Protocol" />
- <!-- Non-blocking I/O -->
- <!--
- <constructor-arg type="java.lang.String"
value="org.apache.coyote.http11.Http11NioProtocol" />
- -->
<property name="port"><value>${http.port}</value></property>
<property
name="redirectPort"><value>${https.port}</value></property>
<property name="enableLookups"><value>false</value></property>
<property name="useIPVHosts"><value>true</value></property>
- <property
name="URIEncoding"><value>${http.URIEncoding}</value></property>
+ <property name="URIEncoding" value="${http.URIEncoding}" />
</bean>
</property>
@@ -58,13 +62,85 @@
<property name="autoDeploy" value="true" />
</bean>
</property>
+
+ </bean>
+
+ <!-- Tomcat with SSL enabled -->
+<!--
+ <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader"
init-method="init" destroy-method="shutdown" depends-on="context.loader">
- <property name="valves">
- <list>
- </list>
+ <property name="webappFolder" value="${red5.root}/webapps" />
+
+ <property name="connector">
+ <bean class="org.apache.catalina.connector.Connector">
+ <constructor-arg type="java.lang.String"
value="org.apache.coyote.http11.Http11Protocol" />
+ <property name="port"><value>${https.port}</value></property>
+ <property
name="redirectPort"><value>${http.port}</value></property>
+ <property name="enableLookups"><value>false</value></property>
+ <property name="useIPVHosts"><value>true</value></property>
+ <property name="URIEncoding" value="${http.URIEncoding}" />
+ </bean>
</property>
-
- </bean>
+
+ <property name="address">
+ <bean class="java.net.InetSocketAddress">
+ <constructor-arg index="0" type="java.lang.String"
value="${http.host}" />
+ <constructor-arg index="1" type="int" value="${https.port}" />
+ </bean>
+ </property>
+
+ <property name="baseHost">
+ <bean class="org.apache.catalina.core.StandardHost">
+ <property name="name" value="${http.host}" />
+ <property name="unpackWARs" value="true" />
+ <property name="autoDeploy" value="true" />
+ </bean>
+ </property>
+
+ <property name="connectionProperties">
+ <map>
+ <entry>
+ <key><value>port</value></key>
+ <value>${https.port}</value>
+ </entry>
+ <entry>
+ <key><value>redirectPort</value></key>
+ <value>${http.port}</value>
+ </entry>
+ <entry>
+ <key><value>SSLEnabled</value></key>
+ <value>true</value>
+ </entry>
+ <entry>
+ <key><value>sslProtocol</value></key>
+ <value>TLS</value>
+ </entry>
+ <entry>
+ <key><value>clientAuth</value></key>
+ <value>false</value>
+ </entry>
+ <entry>
+ <key><value>keystoreFile</value></key>
+ <value>conf/keystore</value>
+ </entry>
+ <entry>
+ <key><value>keystorePass</value></key>
+ <value>${rtmps.keystorepass}</value>
+ </entry>
+ <entry>
+ <key><value>keystoreType</value></key>
+ <value>JKS</value>
+ </entry>
+ <entry key="maxKeepAliveRequests"
value="${http.max_keep_alive_requests}"/>
+ <entry key="useExecutor" value="true"/>
+ <entry key="maxThreads" value="${http.max_threads}"/>
+ <entry key="acceptorThreadCount"
value="${http.acceptor_thread_count}"/>
+ <entry key="processorCache" value="${http.processor_cache}"/>
+ </map>
+ </property>
+
+ </bean>
+ -->
<!-- RTMPT (dedicated server) -->
<bean id="rtmpt.server"
class="org.red5.server.tomcat.rtmpt.RTMPTLoader" init-method="init"
lazy-init="true">
@@ -76,6 +152,7 @@
<constructor-arg type="java.lang.String"
value="org.apache.coyote.http11.Http11NioProtocol" />
<property
name="port"><value>${rtmpt.port}</value></property>
<property
name="enableLookups"><value>false</value></property>
+ <property name="URIEncoding" value="${http.URIEncoding}" />
</bean>
</property>
@@ -85,17 +162,7 @@
<constructor-arg index="1" type="int" value="${rtmpt.port}" />
</bean>
</property>
-
- <property name="connectionProperties">
- <map>
- <entry key="maxKeepAliveRequests"
value="${rtmpt.max_keep_alive_requests}"/>
- <entry key="useExecutor" value="true"/>
- <entry key="maxThreads"
value="${rtmpt.max_threads}"/>
- <entry key="acceptorThreadCount"
value="${rtmpt.acceptor_thread_count}"/>
- <entry key="processorCache"
value="${rtmpt.processor_cache}"/>
- </map>
- </property>
-
+
<property name="host">
<bean class="org.apache.catalina.core.StandardHost">
<property name="name" value="${rtmpt.host}" />
@@ -104,6 +171,16 @@
</bean>
</property>
+ <property name="connectionProperties">
+ <map>
+ <entry key="maxKeepAliveRequests"
value="${rtmpt.max_keep_alive_requests}"/>
+ <entry key="useExecutor" value="true"/>
+ <entry key="maxThreads" value="${rtmpt.max_threads}"/>
+ <entry key="acceptorThreadCount"
value="${rtmpt.acceptor_thread_count}"/>
+ <entry key="processorCache" value="${rtmpt.processor_cache}"/>
+ </map>
+ </property>
+
</bean>
<!-- RTMPS (dedicated server) -->
@@ -117,6 +194,7 @@
<constructor-arg type="java.lang.String"
value="org.apache.coyote.http11.Http11NioProtocol" />
<property name="port" value="${rtmps.port}" />
<property name="redirectPort"
value="${rtmp.port}" />
+ <property name="URIEncoding"
value="${http.URIEncoding}" />
</bean>
</property>
@@ -176,11 +254,6 @@
<entry key="processorCache"
value="${rtmps.processor_cache}"/>
</map>
</property>
-
- <property name="valves">
- <list>
- </list>
- </property>
</bean>
-->
Modified: openmeetings/trunk/singlewebapp/build.properties
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.properties?rev=1499644&r1=1499643&r2=1499644&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.properties (original)
+++ openmeetings/trunk/singlewebapp/build.properties Thu Jul 4 04:18:29 2013
@@ -13,7 +13,7 @@ project.version=3.0.0
project.status=SNAPSHOT
ivy.install.version=2.3.0
maven.version=3.0.4
-red5.server.revision=4666
+red5.server.revision=4675
red5.server.version=1.0.2-SNAPSHOT
laszlo.proxied=solo
wicket.mode=DEPLOYMENT
Modified: openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1499644&r1=1499643&r2=1499644&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Thu Jul 4 04:18:29 2013
@@ -965,17 +965,7 @@
</fileset>
</move>
- <!-- START of Tomcat 7 patch -->
- <delete>
- <fileset dir="${red5.lib}/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.lib}/plugins" />
- </antcall>
- <delete file="${red5.lib}/lib/javaee-api-5.1.2.jar" />
<delete file="${red5.lib}/lib/servlet-api-2.5.jar" />
- <!-- END of Tomcat 7 patch -->
<delete dir="${red5.lib}/webapps/installer" />
<delete dir="${red5.lib}/webapps/live" />
<delete dir="${red5.lib}/webapps/vod" />
Modified: openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html?rev=1499644&r1=1499643&r2=1499644&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html (original)
+++ openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html Thu Jul 4 04:18:29
2013
@@ -816,8 +816,10 @@ limitations under the License.
RTMPS successfully. </p>
<ol>
<li>
- Copy this
<tt>red5/conf/jee-container-ssl.xml</tt>
- file to
<tt>red5/conf/jee-container.xml</tt>
+ Edit
<tt>red5/conf/jee-container.xml</tt> file:<br />
+ Comment <tt>Tomcat without SSL
enabled</tt> section<br />
+ Comment <tt>RTMPT (dedicated
server)</tt> section<br />
+ UNComment <tt>Tomcat with SSL
enabled</tt> section
</li>
<li>
Edit
red5/webapps/openmeetings/public/config.xml and set
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1499644&r1=1499643&r2=1499644&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Thu Jul 4 04:18:29 2013
@@ -33,7 +33,6 @@
<conf name="openlaszlo46" description="Openlaszlo with Flex 4.6
dependencies" />
<conf name="mysql" description="MySQL JDBC driver" />
<conf name="mvn" description="Maven Ant task to build Red5" />
- <conf name="tomcat7" description="Libraries necessary for
patching Red5 to use Tomcat7" />
</configurations>
<dependencies>
<!-- START OF mainlib -->
@@ -385,23 +384,6 @@
<include type="jar" />
</dependency>
- <!-- Tomcat 7 -->
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-core" conf="tomcat7->*" rev="7.0.41" transitive="false" >
- <include type="jar" />
- </dependency>
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-jasper" conf="tomcat7->*" rev="7.0.41" transitive="false" >
- <include type="jar" />
- </dependency>
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-juli" conf="tomcat7->*" rev="7.0.41"
transitive="false" >
- <include type="jar" />
- </dependency>
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-log4j" conf="tomcat7->*" rev="7.0.41"
transitive="false" >
- <include type="jar" />
- </dependency>
- <dependency org="tomcatplugin" name="tomcatplugin" rev="1.4"
conf="tomcat7->*" transitive="false">
- <include type="jar" />
- </dependency>
-
<exclude org="javax.servlet" module="servlet-api" type="*"
ext="*" conf="*" matcher="exact"/>
</dependencies>
</ivy-module>
Modified: openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml?rev=1499644&r1=1499643&r2=1499644&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml Thu Jul 4 04:18:29
2013
@@ -163,8 +163,10 @@
RTMPS successfully. </p>
<ol>
<li>
- Copy this
<tt>red5/conf/jee-container-ssl.xml</tt>
- file to
<tt>red5/conf/jee-container.xml</tt>
+ Edit
<tt>red5/conf/jee-container.xml</tt> file:<br/>
+ Comment <tt>Tomcat without SSL
enabled</tt> section<br/>
+ Comment <tt>RTMPT (dedicated
server)</tt> section<br/>
+ UNComment <tt>Tomcat with SSL
enabled</tt> section
</li>
<li>
Edit
red5/webapps/openmeetings/public/config.xml and set
