[Red5commits] [2243] wars should now work and be easier to configure
pgregoire
luke at codegent.com
Thu Aug 23 15:20:13 PDT 2007
wars should now work and be easier to configure
Timestamp: 08/23/07 17:12:11 EST (less than one hour ago)
Change: 2243
Author: pgregoire
Files (see diff or trac for details):
java/server/trunk/build.xml
java/server/trunk/conf/war/SOSample-context.xml
java/server/trunk/conf/war/applicationContext.xml
java/server/trunk/conf/war/echo-context.xml
java/server/trunk/conf/war/fitcDemo-context.xml
java/server/trunk/conf/war/ofla-context.xml
java/server/trunk/conf/war/red5.properties
java/server/trunk/conf/war/tutorial-context.xml
java/server/trunk/conf/war/web.xml
Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/2243
Index: /java/server/trunk/conf/war/applicationContext.xml
===================================================================
--- /java/server/trunk/conf/war/applicationContext.xml (revision 1737)
+++ /java/server/trunk/conf/war/applicationContext.xml (revision 2243)
@@ -50,5 +50,5 @@
</bean>
- <!-- DEFAULT LOCAL CONTEXT -->
+ <!-- DEFAULT LOCAL CONTEXT
<bean id="web.context" class="org.red5.server.Context"
@@ -65,4 +65,4 @@
value="*,localhost, localhost:5080, 127.0.0.1:5080" />
</bean>
-
+-->
</beans>
Index: /java/server/trunk/conf/war/red5.properties
===================================================================
--- /java/server/trunk/conf/war/red5.properties (revision 1945)
+++ /java/server/trunk/conf/war/red5.properties (revision 2243)
@@ -1,10 +1,10 @@
# HTTP
http.host=0.0.0.0
-http.port=5080
+http.port=8080
# RTMP
rtmp.host=0.0.0.0
rtmp.port=1935
-rtmp.event_threads_core=16
-rtmp.event_threads_max=32
+rtmp.event_threads_core=4
+rtmp.event_threads_max=8
# event threads queue: -1 unbounded, 0 direct (no queue), n bounded queue
rtmp.event_threads_queue=-1
@@ -16,8 +16,5 @@
# RTMPT
rtmpt.host=0.0.0.0
-rtmpt.port=8088
+rtmpt.port=8080
rtmpt.ping_interval=5000
rtmpt.max_inactivity=60000
-# WEBAPP
-webapp.contextPath=/
-webapp.virtualHosts=*,localhost, localhost:5080, 127.0.0.1:5080
Index: /java/server/trunk/conf/war/web.xml
===================================================================
--- /java/server/trunk/conf/war/web.xml (revision 2242)
+++ /java/server/trunk/conf/war/web.xml (revision 2243)
@@ -12,5 +12,5 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-->
- <display-name>Red5 War</display-name>
+ <display-name>Red5 @display.name@ War</display-name>
<context-param>
@@ -25,6 +25,11 @@
<context-param>
+ <param-name>webAppRootKey</param-name>
+ <param-value>@webapp.root.key@</param-value>
+ </context-param>
+
+ <context-param>
<param-name>contextConfigLocation</param-name>
- <param-value>/WEB-INF/applicationContext.xml, /WEB-INF/red5-*.xml</param-value>
+ <param-value>/WEB-INF/applicationContext.xml /WEB-INF/red5-*.xml</param-value>
</context-param>
@@ -35,7 +40,5 @@
<listener>
- <listener-class>
- org.springframework.web.util.Log4jConfigListener
- </listener-class>
+ <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
</listener>
@@ -51,7 +54,5 @@
<servlet>
<servlet-name>gateway</servlet-name>
- <servlet-class>
- org.red5.server.net.servlet.AMFGatewayServlet
- </servlet-class>
+ <servlet-class>org.red5.server.net.servlet.AMFGatewayServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -59,7 +60,5 @@
<servlet>
<servlet-name>rtmpt</servlet-name>
- <servlet-class>
- org.red5.server.net.rtmpt.RTMPTServlet
- </servlet-class>
+ <servlet-class>org.red5.server.net.rtmpt.RTMPTServlet</servlet-class>
<load-on-startup>2</load-on-startup>
</servlet>
Index: /va/server/trunk/conf/war/echo-context.xml
===================================================================
--- /java/server/trunk/conf/war/echo-context.xml (revision 1740)
+++ (revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
- <bean id="echo.context" class="org.red5.server.Context"
- autowire="byType" />
-
- <bean id="echo.scope" class="org.red5.server.WebScope"
- init-method="register">
- <property name="server" ref="red5.server" />
- <property name="parent" ref="global.scope" />
- <property name="context" ref="echo.context" />
- <property name="handler" ref="echo.handler" />
- <property name="contextPath" value="/echo" />
- <property name="virtualHosts" value="*" />
- </bean>
-
- <bean id="echo.handler"
- class="org.red5.server.webapp.echo.Application"
- singleton="true" />
-
-</beans>
Index: /va/server/trunk/conf/war/ofla-context.xml
===================================================================
--- /java/server/trunk/conf/war/ofla-context.xml (revision 1737)
+++ (revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:lang="http://www.springframework.org/schema/lang"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
-
- <!-- oflaDemo -->
- <bean id="ofla.context" class="org.red5.server.Context"
- autowire="byType" />
-
- <bean id="ofla.scope" class="org.red5.server.WebScope"
- init-method="register">
- <property name="server" ref="red5.server" />
- <property name="parent" ref="global.scope" />
- <property name="context" ref="ofla.context" />
- <property name="handler" ref="ofla.handler" />
- <property name="contextPath" value="/oflaDemo" />
- <property name="virtualHosts"
- value="*,localhost, localhost:5080, 127.0.0.1:5080" />
- </bean>
-
- <bean id="ofla.handler"
- class="org.red5.server.webapp.oflaDemo.Application" />
-
- <bean id="demoService.service"
- class="org.red5.server.webapp.oflaDemo.DemoService" />
-
-
-</beans>
Index: /va/server/trunk/conf/war/SOSample-context.xml
===================================================================
--- /java/server/trunk/conf/war/SOSample-context.xml (revision 1737)
+++ (revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:lang="http://www.springframework.org/schema/lang"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
-
- <!-- SOSample -->
- <bean id="SOSample.context" class="org.red5.server.Context" autowire="byType" />
-
- <bean id="SOSample.scope" class="org.red5.server.WebScope"
- init-method="register">
- <property name="server" ref="red5.server" />
- <property name="parent" ref="global.scope" />
- <property name="context" ref="SOSample.context" />
- <property name="handler" ref="SOSample.handler" />
- <property name="contextPath" value="/SOSample" />
- <property name="virtualHosts"
- value="*,localhost, localhost:5080, 127.0.0.1:5080" />
- </bean>
-
- <bean id="SOSample.handler" class="org.red5.server.adapter.ApplicationAdapter" />
-
-</beans>
Index: /va/server/trunk/conf/war/tutorial-context.xml
===================================================================
--- /java/server/trunk/conf/war/tutorial-context.xml (revision 1740)
+++ (revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
- <bean id="tutorial.context" class="org.red5.server.Context"
- autowire="byType" />
-
- <bean id="tutorial.scope" class="org.red5.server.WebScope"
- init-method="register">
- <property name="server" ref="red5.server" />
- <property name="parent" ref="global.scope" />
- <property name="context" ref="tutorial.context" />
- <property name="handler" ref="tutorial.handler" />
- <property name="contextPath" value="/tutorial" />
- <property name="virtualHosts" value="localhost, 127.0.0.1, 192.168.1.2" />
- </bean>
-
- <bean id="tutorial.handler"
- class="org.red5.tutorials.clientlist.Application"
- singleton="true" />
-
-</beans>
Index: /va/server/trunk/conf/war/fitcDemo-context.xml
===================================================================
--- /java/server/trunk/conf/war/fitcDemo-context.xml (revision 1740)
+++ (revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
- <bean id="fitcDemo.context" class="org.red5.server.Context"
- autowire="byType" />
-
- <bean id="fitcDemo.scope" class="org.red5.server.WebScope"
- init-method="register">
- <property name="server" ref="red5.server" />
- <property name="parent" ref="global.scope" />
- <property name="context" ref="fitcDemo.context" />
- <property name="handler" ref="fitcDemo.handler" />
- <property name="contextPath" value="/fitcDemo" />
- <property name="virtualHosts" value="*,localhost, 127.0.0.1" />
- </bean>
-
- <bean id="fitcDemo.handler"
- class="org.red5.demos.fitc.Application"
- singleton="true" />
-
-</beans>
Index: /java/server/trunk/build.xml
===================================================================
--- /java/server/trunk/build.xml (revision 2242)
+++ /java/server/trunk/build.xml (revision 2243)
@@ -730,15 +730,23 @@
<!-- add the configs to the root war -->
+ <filter token="display.name" value=""/>
+ <filter token="webapp.root.key" value="/"/>
<filter token="context.path" value="/"/>
+ <copy todir="${webapps.build.dir}/root/META-INF" overwrite="true" filtering="true">
+ <fileset dir="${config.dir}/war">
+ <include name="context.xml"/>
+ </fileset>
+ </copy>
<copy todir="${webapps.build.dir}/root/WEB-INF" overwrite="true" filtering="true">
<fileset dir="${config.dir}">
- <include name="red5.properties"/>
<include name="log4j.properties"/>
</fileset>
<fileset dir="${config.dir}/war">
+ <include name="web.xml"/>
<include name="applicationContext.xml"/>
<include name="red5-common.xml"/>
<include name="red5-core.xml"/>
<include name="red5-web.properties"/>
+ <include name="red5.properties"/>
</fileset>
</copy>
@@ -779,19 +787,147 @@
</manifest>
</war>
-
- <!-- add the configs to the ofla war -->
- <filter token="context.path" value="/oflaDemo"/>
- <copy todir="${webapps.build.dir}/oflaDemo/WEB-INF" overwrite="true" filtering="true">
+
+ <!-- add the configs to the admin war -->
+ <filter token="display.name" value="admin"/>
+ <filter token="webapp.root.key" value="/admin"/>
+ <filter token="context.path" value="/admin"/>
+ <copy todir="${webapps.build.dir}/admin/WEB-INF" overwrite="true" filtering="true">
<fileset dir="${config.dir}">
- <include name="red5.properties"/>
<include name="log4j.properties"/>
</fileset>
<fileset dir="${config.dir}/war">
+ <include name="web.xml"/>
<include name="applicationContext.xml"/>
<include name="red5-common.xml"/>
<include name="red5-core.xml"/>
<include name="red5-web.properties"/>
+ <include name="red5.properties"/>
</fileset>
</copy>
+ <!-- copy the jmx support files into the webapp classpath -->
+ <copy todir="${webapps.build.dir}/admin/WEB-INF/classes">
+ <fileset dir="${config.dir}">
+ <include name="*.jmx"/>
+ <include name="access.properties"/>
+ <include name="password.properties"/>
+ </fileset>
+ </copy>
+ <!-- war up admin -->
+ <war destfile="${dist.dir}/admin.war" webxml="${webapps.build.dir}/admin/WEB-INF/web.xml">
+ <fileset dir="${webapps.build.dir}/admin">
+ <exclude name="**/src/**"/>
+ </fileset>
+ <fileset dir="${classes.dir}">
+ <exclude name="**/demos/**"/>
+ </fileset>
+ <lib dir="${lib.dir}">
+ <exclude name="*.properties"/>
+ <exclude name="jsp*.jar"/>
+ <exclude name="servlet*.jar"/>
+ <exclude name="catalina*.jar"/>
+ <exclude name="tomcat*.jar"/>
+ <exclude name="annotations-api*.jar"/>
+ <exclude name="el-api*.jar"/>
+ <exclude name="jetty*.jar"/>
+ <exclude name="jasper*.jar"/>
+ <exclude name="ehcache*.jar"/>
+ <exclude name="whirly*.jar"/>
+ <exclude name="Grobo*.jar"/>
+ <exclude name="grobo*.jar"/>
+ <exclude name="junit*.jar"/>
+ <exclude name="ivy*.jar"/>
+ </lib>
+ <manifest>
+ <attribute name="Built-By" value="RED5 Project - red5 at osflash.org"/>
+ <attribute name="Built-On" value="${build.TODAY}"/>
+ </manifest>
+ </war>
+
+ <!-- add the configs to the echo war -->
+ <filter token="display.name" value="echo"/>
+ <filter token="webapp.root.key" value="/echo"/>
+ <filter token="context.path" value="/echo"/>
+ <copy todir="${webapps.build.dir}/echo/WEB-INF" overwrite="true" filtering="true">
+ <fileset dir="${config.dir}">
+ <include name="log4j.properties"/>
+ </fileset>
+ <fileset dir="${config.dir}/war">
+ <include name="web.xml"/>
+ <include name="applicationContext.xml"/>
+ <include name="red5-common.xml"/>
+ <include name="red5-core.xml"/>
+ <include name="red5-web.properties"/>
+ <include name="red5.properties"/>
+ </fileset>
+ </copy>
+ <!-- copy the jmx support files into the webapp classpath -->
+ <copy todir="${webapps.build.dir}/echo/WEB-INF/classes">
+ <fileset dir="${config.dir}">
+ <include name="*.jmx"/>
+ <include name="access.properties"/>
+ <include name="password.properties"/>
+ </fileset>
+ </copy>
+ <!-- war up echo -->
+ <war destfile="${dist.dir}/echo.war" webxml="${webapps.build.dir}/echo/WEB-INF/web.xml">
+ <fileset dir="${webapps.build.dir}/echo">
+ <exclude name="**/src/**"/>
+ </fileset>
+ <fileset dir="${classes.dir}">
+ <exclude name="**/demos/**"/>
+ </fileset>
+ <lib dir="${lib.dir}">
+ <exclude name="*.properties"/>
+ <exclude name="jsp*.jar"/>
+ <exclude name="servlet*.jar"/>
+ <exclude name="catalina*.jar"/>
+ <exclude name="tomcat*.jar"/>
+ <exclude name="annotations-api*.jar"/>
+ <exclude name="el-api*.jar"/>
+ <exclude name="jetty*.jar"/>
+ <exclude name="jasper*.jar"/>
+ <exclude name="ehcache*.jar"/>
+ <exclude name="whirly*.jar"/>
+ <exclude name="Grobo*.jar"/>
+ <exclude name="grobo*.jar"/>
+ <exclude name="junit*.jar"/>
+ <exclude name="ivy*.jar"/>
+ </lib>
+ <manifest>
+ <attribute name="Built-By" value="RED5 Project - red5 at osflash.org"/>
+ <attribute name="Built-On" value="${build.TODAY}"/>
+ </manifest>
+ </war>
+
+ <!-- add the configs to the ofla war -->
+ <filter token="display.name" value="oflaDemo"/>
+ <filter token="webapp.root.key" value="/oflaDemo"/>
+ <filter token="context.path" value="/oflaDemo"/>
+ <copy todir="${webapps.build.dir}/oflaDemo/META-INF" overwrite="true" filtering="true">
+ <fileset dir="${config.dir}/war">
+ <include name="context.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${webapps.build.dir}/oflaDemo/WEB-INF" overwrite="true" filtering="true">
+ <fileset dir="${config.dir}">
+ <include name="log4j.properties"/>
+ </fileset>
+ <fileset dir="${config.dir}/war">
+ <include name="web.xml"/>
+ <include name="applicationContext.xml"/>
+ <include name="red5-common.xml"/>
+ <include name="red5-core.xml"/>
+ <include name="red5-web.properties"/>
+ <include name="red5.properties"/>
+ </fileset>
+ </copy>
+ <!-- copy the jmx support files into the webapp classpath -->
+ <copy todir="${webapps.build.dir}/oflaDemo/WEB-INF/classes">
+ <fileset dir="${config.dir}">
+ <include name="*.jmx"/>
+ <include name="access.properties"/>
+ <include name="password.properties"/>
+ </fileset>
+ </copy>
<!-- war up oflaDemo -->
<war destfile="${dist.dir}/oflaDemo.war" webxml="${webapps.build.dir}/oflaDemo/WEB-INF/web.xml">
Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.
More information about the Red5commits
mailing list