[Red5commits] [1737] Merged WAR version into main trunk
pgregoire
luke at codegent.com
Mon Feb 19 20:00:10 EST 2007
Merged WAR version into main trunk
Timestamp: 02/19/07 19:53:43 EST (less than one hour ago)
Change: 1737
Author: pgregoire
Files (see diff or trac for details):
java/server/trunk/build.xml
java/server/trunk/conf/war
java/server/trunk/conf/war/README.txt
java/server/trunk/conf/war/SOSample-context.xml
java/server/trunk/conf/war/applicationContext.xml
java/server/trunk/conf/war/log4j.properties
java/server/trunk/conf/war/ofla-context.xml
java/server/trunk/conf/war/red5-common.xml
java/server/trunk/conf/war/red5-core.xml
java/server/trunk/conf/war/red5.properties
java/server/trunk/conf/war/web.xml
java/server/trunk/src/org/red5/server/Context.java
java/server/trunk/src/org/red5/server/MainServlet.java
Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/1737
Index: /java/server/trunk/conf/war/ofla-context.xml
===================================================================
--- /java/server/trunk/conf/war/ofla-context.xml (revision 1737)
+++ /java/server/trunk/conf/war/ofla-context.xml (revision 1737)
@@ -0,0 +1,30 @@
+<?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: /java/server/trunk/conf/war/SOSample-context.xml
===================================================================
--- /java/server/trunk/conf/war/SOSample-context.xml (revision 1737)
+++ /java/server/trunk/conf/war/SOSample-context.xml (revision 1737)
@@ -0,0 +1,24 @@
+<?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: /java/server/trunk/conf/war/red5-common.xml
===================================================================
--- /java/server/trunk/conf/war/red5-common.xml (revision 1737)
+++ /java/server/trunk/conf/war/red5-common.xml (revision 1737)
@@ -0,0 +1,178 @@
+<?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">
+ <!-- This context is shared between all child contexts. -->
+ <!-- Server bean -->
+ <bean id="red5.server" class="org.red5.server.Server"/>
+ <!-- Serializes objects to AMF binary -->
+ <bean id="serializer" class="org.red5.io.object.Serializer"/>
+ <!-- Deserializes objects from AMF binary -->
+ <bean id="deserializer" class="org.red5.io.object.Deserializer"/>
+ <!-- Deals with StatusObjects representing statuses like FMS NetConnection.Connect.Success status -->
+ <bean id="statusObjectService" class="org.red5.server.net.rtmp.status.StatusObjectService"
+ autowire="byType" init-method="initialize"/>
+ <!-- RTMP codec factory -->
+ <bean id="rtmpCodecFactory" class="org.red5.server.net.rtmp.codec.RTMPMinaCodecFactory"
+ autowire="byType" init-method="init"/>
+ <!-- Remoting calls codec factory -->
+ <bean id="remotingCodecFactory" class="org.red5.server.net.remoting.codec.RemotingCodecFactory"
+ autowire="byType" init-method="init"/>
+ <!-- Video codec factory -->
+ <bean id="videoCodecFactory" class="org.red5.server.stream.VideoCodecFactory">
+ <property name="codecs">
+ <list>
+ <bean id="screenVideoCodec" class="org.red5.server.stream.codec.ScreenVideo"/>
+ <!--
+ <bean id="sorensonVideoCodec" class="org.red5.server.stream.codec.SorensonVideo"/>
+ -->
+ </list>
+ </property>
+ </bean>
+ <!-- Streamable file factory -->
+ <bean id="streamableFileFactory" class="org.red5.io.StreamableFileFactory">
+ <property name="services">
+ <list>
+ <bean id="flvFileService" class="org.red5.io.flv.impl.FLVService">
+ <property name="generateMetadata" value="true"/>
+ </bean>
+ <bean id="mp3FileService" class="org.red5.io.mp3.impl.MP3Service"/>
+ </list>
+ </property>
+ </bean>
+ <!-- Handles creation / lookup of shared objects -->
+ <bean id="sharedObjectService" class="org.red5.server.so.SharedObjectService">
+ <property name="persistenceClassName">
+ <value>org.red5.server.persistence.FilePersistence</value>
+ </property>
+ </bean>
+ <!-- High level access to streams -->
+ <bean id="streamService" class="org.red5.server.stream.StreamService"/>
+ <!-- Hight level access to broadcasted streams -->
+ <bean id="providerService" class="org.red5.server.stream.ProviderService"/>
+ <!-- Provides output to consumers -->
+ <bean id="consumerService" class="org.red5.server.stream.ConsumerService"/>
+ <!-- Balances flow control -->
+ <!--
+ <bean id="FlowControlService" class="org.red5.server.stream.BalancedFlowControlService"
+ init-method="init">
+ <property name="interval" value="10"/>
+ <property name="defaultCapacity" value="102400"/>
+ </bean> -->
+ <!-- Dummy flow control that does nothing -->
+ <bean id="FlowControlService" class="org.red5.server.stream.DummyFlowControlService" init-method="init">
+ <property name="interval" value="10"/>
+ <property name="defaultCapacity" value="102400"/>
+ </bean>
+ <!-- Scheduling service -->
+ <bean id="schedulingService" class="org.red5.server.scheduling.QuartzSchedulingService"/>
+ <!-- Thread factory -->
+ <bean id="threadFactory" class="org.red5.server.pooling.ThreadObjectFactory"/>
+ <!-- Threadpool settings for the remoting clients -->
+ <bean id="remotingPool" class="org.red5.server.pooling.ThreadPool">
+ <constructor-arg>
+ <ref bean="threadFactory"/>
+ </constructor-arg>
+ <!-- maxIdle: The maximum number of sleeping instances in the pool,
+ without extra objects being released. -->
+ <property name="maxIdle" value="8"/>
+ <!-- minIdle: The minimum number of sleeping instances in the pool,
+ without extra objects being created. -->
+ <property name="minIdle" value="2"/>
+ <!-- maxActive: The maximum number of active instances in the pool. -->
+ <property name="maxActive" value="8"/>
+ <!-- timeBetweenEvictionRunsMillis: The number of milliseconds to
+ sleep between runs of the idle-object evictor thread. When negative,
+ no idle-object evictor thread will run. Use this parameter only when
+ you want the evictor thread to run. -->
+ <property name="timeBetweenEvictionRunsMillis" value="120000"/>
+ <!-- minEvictableIdleTimeMillis: The minimum amount of time an object,
+ if active, may sit idle in the pool before it is eligible for eviction
+ by the idle-object evictor. If a negative value is supplied, no objects
+ are evicted due to idle time alone. -->
+ <property name="minEvictableIdleTimeMillis" value="-1"/>
+ <!-- testOnBorrow: When "true," objects are validated. If the object fails
+ validation, it will be dropped from the pool, and the pool will attempt
+ to borrow another. -->
+ <property name="testOnBorrow" value="true"/>
+ <property name="whenExhaustedAction" value="2"/>
+ </bean>
+ <!--
+ Now we can load the cache engine, only one may be enabled at a time. If no-caching is required select the
+ NoCacheImpl. Three other implementations based on EhCache, WhirlyCache, and Red5Cache are also available.
+ -->
+ <bean id="object.cache" class="org.red5.server.cache.NoCacheImpl"/>
+ <!--
+ <bean id="object.cache" class="org.red5.server.cache.CacheImpl" init-method="init" autowire="byType">
+ <property name="maxEntries"><value>5</value></property>
+ </bean>
+
+ <bean id="object.cache" class="org.red5.server.cache.WhirlyCacheImpl" init-method="init" autowire="byType">
+ <property name="maxEntries" value="5" />
+ <property name="cacheConfig">
+ <bean class="com.whirlycott.cache.CacheConfiguration">
+ <property name="name" value="flv.cache" />
+ <property name="maxSize" value="5" />
+ <property name="policy"><value>com.whirlycott.cache.policy.LFUMaintenancePolicy</value></property>
+ <property name="backend"><value>com.whirlycott.cache.impl.FastHashMapImpl</value></property>
+ </bean>
+ </property>
+ </bean>
+
+ <bean id="object.cache" class="org.red5.server.cache.EhCacheImpl" init-method="init">
+ <property name="diskStore" value="java.io.tmpdir" />
+ <property name="memoryStoreEvictionPolicy" value="LFU" />
+ <property name="cacheManagerEventListener"><null/></property>
+ <property name="cacheConfigs">
+ <list>
+ <bean class="net.sf.ehcache.config.CacheConfiguration">
+ <property name="name" value="flv.cache" />
+ <property name="maxElementsInMemory" value="5" />
+ <property name="eternal" value="false" />
+ <property name="timeToIdleSeconds" value="0" />
+ <property name="timeToLiveSeconds" value="0" />
+ <property name="overflowToDisk" value="false" />
+ <property name="diskPersistent" value="false" />
+ </bean>
+ </list>
+ </property>
+ </bean>
+-->
+ <!--
+ Represents FLV files
+ Use injection to set the cache impl to be used with flvs
+ -->
+ <bean id="flv.impl" class="org.red5.io.flv.impl.FLV">
+ <property name="cache">
+ <ref bean="object.cache"/>
+ </property>
+ </bean>
+ <!-- Use injection to set the buffer type for reading FLV files -->
+ <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <property name="targetObject">
+ <bean class="org.red5.io.flv.impl.FLVReader"/>
+ </property>
+ <property name="targetMethod">
+ <value>setBufferType</value>
+ </property>
+ <!-- Three buffer types are available 'auto', 'heap', and 'direct' -->
+ <property name="arguments" value="auto"/>
+ </bean>
+ <!-- Use injection to set the buffer type for reading FLV files -->
+ <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <property name="targetObject">
+ <bean class="org.red5.io.flv.impl.FLVReader"/>
+ </property>
+ <property name="targetMethod">
+ <value>setBufferSize</value>
+ </property>
+ <property name="arguments" value="4096"/>
+ </bean>
+ <!-- ClientBroadcastStream and PlaylistSubscriberStream
+ that will be used by RTMPConnection and maybe other classes.
+ These beans are lazy-init because most likely server will need
+ to be up and running before we can get a smart implementation
+ of these streams
+ -->
+ <bean id="playlistSubscriberStream" scope="prototype" lazy-init="true" class="org.red5.server.stream.PlaylistSubscriberStream"/>
+ <bean id="clientBroadcastStream" scope="prototype" lazy-init="true" class="org.red5.server.stream.ClientBroadcastStream"/>
+</beans>
Index: /java/server/trunk/conf/war/red5-core.xml
===================================================================
--- /java/server/trunk/conf/war/red5-core.xml (revision 1737)
+++ /java/server/trunk/conf/war/red5-core.xml (revision 1737)
@@ -0,0 +1,85 @@
+<?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">
+ <!-- This context holds all the networking: mina -->
+
+ <bean id="customEditorConfigurer"
+ class="org.springframework.beans.factory.config.CustomEditorConfigurer">
+ <property name="customEditors">
+ <map>
+ <entry key="java.net.SocketAddress">
+ <bean
+ class="org.apache.mina.integration.spring.InetSocketAddressEditor" />
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean id="placeholderConfig"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location" value="classpath:/red5.properties" />
+ </bean>
+
+ <bean id="threadExecutor"
+ class="org.apache.mina.integration.spring.ThreadPoolExecutorFactoryBean">
+ <!-- use configured thread count as core pool size -->
+ <property name="corePoolSize" value="${rtmp.threadcount}" />
+ <!-- use a SynchronousQueue to handle requests to the threads -->
+ <property name="queueCapacity" value="0" />
+ </bean>
+
+ <bean class="org.apache.mina.transport.socket.nio.SocketAcceptor"
+ init-method="bind" destroy-method="unbind">
+ <!-- RTMP -->
+ <constructor-arg value="${rtmp.threadcount}" />
+ <constructor-arg><ref bean="threadExecutor"/></constructor-arg>
+ <property name="localAddress" value="${rtmp.host_port}" />
+ <property name="handler" ref="rtmpMinaIoHandler" />
+ <property name="sessionConfig">
+ <bean
+ class="org.apache.mina.transport.socket.nio.DefaultSocketSessionConfig">
+ <property name="reuseAddress" value="true" />
+ <!--
+ <property name="tcpNoDelay" value="true"/>
+ <property name="sendBufferSize" value="1024"/>
+ <property name="receiveBufferSize" value="1024"/>
+ <property name="soLinger" value="10"/>
+ <property name="oobInline" value="false"/>
+ <property name="keepAlive" value="true"/>
+ -->
+ </bean>
+ </property>
+ </bean>
+
+ <!-- RTMPHandler -->
+ <bean id="rtmpHandler"
+ class="org.red5.server.net.rtmp.RTMPHandler">
+ <property name="server" ref="red5.server" />
+ <property name="statusObjectService" ref="statusObjectService" />
+ </bean>
+
+ <bean id="rtmpMinaIoHandler"
+ class="org.red5.server.net.rtmp.RTMPMinaIoHandler">
+ <property name="handler" ref="rtmpHandler" />
+ <property name="codecFactory" ref="rtmpCodecFactory" />
+ </bean>
+
+ <bean id="rtmptHandler"
+ class="org.red5.server.net.rtmpt.RTMPTHandler" autowire="byType">
+ <property name="codecFactory" ref="rtmpCodecFactory" />
+ </bean>
+
+ <bean id="rtmpMinaConnection" scope="prototype"
+ class="org.red5.server.net.rtmp.RTMPMinaConnection">
+ <property name="keepAliveInterval" value="10000" />
+ </bean>
+
+ <bean id="rtmptConnection" scope="prototype"
+ class="org.red5.server.net.rtmpt.RTMPTConnection">
+ <property name="keepAliveInterval" value="10000" />
+ </bean>
+
+</beans>
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 1737)
@@ -0,0 +1,68 @@
+<?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">
+
+ <!-- DEFAULT GLOBAL CONTEXT -->
+
+ <bean id="global.clientRegistry"
+ class="org.red5.server.ClientRegistry" />
+
+ <bean id="global.serviceInvoker"
+ class="org.red5.server.service.ServiceInvoker">
+ <property name="serviceResolvers">
+ <list>
+ <bean id="scopeServiceResolver"
+ class="org.red5.server.service.ScopeServiceResolver" />
+ <bean id="handlerServiceResolver"
+ class="org.red5.server.service.HandlerServiceResolver" />
+ <bean id="contextServiceResolver"
+ class="org.red5.server.service.ContextServiceResolver" />
+ </list>
+ </property>
+ </bean>
+
+ <bean id="global.mappingStrategy"
+ class="org.red5.server.MappingStrategy" />
+
+ <bean id="global.context" class="org.red5.server.Context"
+ autowire="byType" />
+
+ <bean id="global.handler" class="org.red5.server.CoreHandler"
+ autowire="byType" />
+
+ <bean id="global.scope" class="org.red5.server.GlobalScope"
+ init-method="register">
+ <property name="server" ref="red5.server" />
+ <property name="name" value="default" />
+ <property name="context" ref="global.context" />
+ <property name="handler" ref="global.handler" />
+ <property name="persistenceClass">
+ <value>org.red5.server.persistence.FilePersistence</value>
+ </property>
+ </bean>
+
+ <bean id="red5.scopeResolver"
+ class="org.red5.server.ScopeResolver">
+ <property name="globalScope" ref="global.scope" />
+ </bean>
+
+ <!-- DEFAULT LOCAL CONTEXT -->
+
+ <bean id="web.context" class="org.red5.server.Context"
+ autowire="byType" />
+
+ <bean id="web.scope" class="org.red5.server.WebScope"
+ init-method="register" lazy-init="true">
+ <property name="server" ref="red5.server" />
+ <property name="parent" ref="global.scope" />
+ <property name="context" ref="web.context" />
+ <property name="handler" ref="web.handler" />
+ <property name="contextPath" value="/" />
+ <property name="virtualHosts"
+ value="*,localhost, localhost:5080, 127.0.0.1:5080" />
+ </bean>
+
+</beans>
Index: /java/server/trunk/conf/war/log4j.properties
===================================================================
--- /java/server/trunk/conf/war/log4j.properties (revision 1737)
+++ /java/server/trunk/conf/war/log4j.properties (revision 1737)
@@ -0,0 +1,67 @@
+log4j.rootCategory=DEBUG, CONSOLE
+#Red5
+log4j.logger.org.red5.io=INFO
+log4j.logger.org.red5.server=DEBUG
+log4j.logger.org.red5.server.Standalone=INFO
+log4j.logger.org.red5.server.net.rtmp.status=INFO
+log4j.logger.org.red5.server.net.proxy=INFO
+log4j.logger.org.red5.server.net.remoting=WARN
+log4j.logger.org.red5.server.net=INFO
+log4j.logger.org.red5.server.net.rtmp=WARN
+log4j.logger.org.red5.server.net.rtmp.codec=INFO
+log4j.logger.org.red5.server.net.servlet=WARN
+log4j.logger.org.red5.server.net.rtmpt=WARN
+log4j.logger.org.red5.server.net.servlet.RTMPTServlet=WARN
+log4j.logger.org.red5.server.persistence=WARN
+log4j.logger.org.red5.server.pooling.ThreadObjectFactory=WARN
+log4j.logger.org.red5.server.service=WARN
+log4j.logger.org.red5.server.so=WARN
+log4j.logger.org.red5.server.stream=INFO
+log4j.logger.org.red5.server.stream.consumer=DEBUG
+log4j.logger.org.red5.server.script=INFO
+# Apache / Other
+log4j.logger.org.apache.catalina.authenticator=INFO
+log4j.logger.org.apache.catalina.session=INFO
+log4j.logger.httpclient=WARN
+log4j.logger.org.apache.commons.digester=WARN
+log4j.logger.org.apache.jasper=INFO
+log4j.logger.org.apache.commons.httpclient=WARN
+log4j.logger.org.quartz=WARN
+# Spring
+log4j.logger.org.springframework=INFO
+log4j.logger.org.springframework.beans.factory=INFO
+log4j.logger.org.springframework.beans.factory.xml=WARN
+log4j.logger.org.springframework.web.context=INFO
+log4j.logger.org.springframework.web.context.support=WARN
+log4j.logger.org.springframework.ui.context.support=WARN
+# Cache
+log4j.logger.org.red5.server.cache=WARN
+log4j.logger.net.sf.ehcache=INFO
+log4j.logger.com.whirlycott.cache=INFO
+log4j.logger.com.whirlycott.cache.policy=WARN
+# Mina
+log4j.logger.org.apache.mina=WARN
+log4j.logger.org.apache.mina.filter.thread.ThreadPoolFilter=WARN
+# Demos
+log4j.logger.org.red5.server.webapp.oflaDemo=DEBUG
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=DEBUG
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=[%p] %r %t:( %c.%M ) %m %n
+
+log4j.appender.FLOG=org.apache.log4j.RollingFileAppender
+log4j.appender.FLOG.File=red5.log
+log4j.appender.FLOG.Threshold=DEBUG
+log4j.appender.FLOG.MaxFileSize=20000KB
+log4j.appender.FLOG.MaxBackupIndex=1
+log4j.appender.FLOG.layout=org.apache.log4j.PatternLayout
+log4j.appender.FLOG.layout.ConversionPattern=[%p] %r %t:( %c{1}.%M ) %m %n
+
+log4j.appender.PROXY=org.apache.log4j.RollingFileAppender
+log4j.appender.PROXY.File=proxy.log
+log4j.appender.PROXY.Threshold=DEBUG
+log4j.appender.PROXY.MaxFileSize=20000KB
+log4j.appender.PROXY.MaxBackupIndex=1
+log4j.appender.PROXY.layout=org.apache.log4j.PatternLayout
+log4j.appender.PROXY.layout.ConversionPattern=[%c{1}] (%r) %m %n
Index: /java/server/trunk/conf/war/red5.properties
===================================================================
--- /java/server/trunk/conf/war/red5.properties (revision 1737)
+++ /java/server/trunk/conf/war/red5.properties (revision 1737)
@@ -0,0 +1,11 @@
+rtmp.host_port=0.0.0.0:1935
+rtmp.threadcount=4
+debug_proxy.host_port=0.0.0.0:1936
+proxy_forward.host_port=127.0.0.1:1935
+rtmps.host_port=127.0.0.1:1945
+http.host=0.0.0.0
+http.port=5080
+rtmpt.host=0.0.0.0
+rtmpt.port=8088
+webapp.contextPath=/
+webapp.virtualHosts=*,localhost, localhost:5080, 127.0.0.1:5080
Index: /java/server/trunk/conf/war/README.txt
===================================================================
--- /java/server/trunk/conf/war/README.txt (revision 1737)
+++ /java/server/trunk/conf/war/README.txt (revision 1737)
@@ -0,0 +1,1 @@
+These files are used only by the WAR version of Red5.
Index: /java/server/trunk/conf/war/web.xml
===================================================================
--- /java/server/trunk/conf/war/web.xml (revision 1737)
+++ /java/server/trunk/conf/war/web.xml (revision 1737)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app
+ version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<!--
+ ** For use with servlet v2.5 replace the lines above with these
+ version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-->
+ <display-name>Red5 War</display-name>
+
+ <context-param>
+ <param-name>globalScope</param-name>
+ <param-value>default</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>parentContextKey</param-name>
+ <param-value>default.context</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>/WEB-INF/applicationContext.xml, /WEB-INF/red5-common.xml, /WEB-INF/red5-core.xml, /WEB-INF/*-context.xml</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>log4jConfigLocation</param-name>
+ <param-value>/WEB-INF/log4j.properties</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>
+ org.springframework.web.util.Log4jConfigListener
+ </listener-class>
+ </listener>
+
+ <listener>
+ <!-- Impersonates a org.springframework.web.context.ContextLoaderListener -->
+ <listener-class>org.red5.server.MainServlet</listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>gateway</servlet-name>
+ <servlet-class>
+ org.red5.server.net.servlet.AMFGatewayServlet
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>rtmpt</servlet-name>
+ <servlet-class>
+ org.red5.server.net.rtmpt.RTMPTServlet
+ </se
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