Moved and refactored war deployer service, now its in tomcat plugin

src/main/server/conf/jee-container.xml

@@ -4,7 +4,15 @@
        xmlns:lang="http://www.springframework.org/schema/lang"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
-
+
+    <!-- War deployer -->
+    <bean id="warDeployer" class="org.red5.server.tomcat.WarDeployer" depends-on="tomcat.server">
+        <property name="checkInterval" value="${war.deploy.server.check.interval}"/>
+        <property name="webappFolder" value="${red5.root}/webapps"/>        
+        <!-- Expand war files prior to startup of the remaining services -->
+        <property name="expandWars" value="true" />
+    </bean>      
+
     <!-- 
     The tomcat connectors may be blocking or non-blocking. Select between either option via the protocol property.
         Blocking I/O:
@@ -14,7 +22,7 @@
      -->                           
 
     <!-- Tomcat without SSL enabled -->   
-    <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader" init-method="start" lazy-init="true">
+    <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader,warDeployer" lazy-init="true">
 
         <property name="webappFolder" value="${red5.root}/webapps" />
 
@@ -50,7 +58,7 @@
 
     <!-- Tomcat with SSL enabled -->
 <!-- 
-    <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader" init-method="start" lazy-init="true">
+    <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader" lazy-init="true">
 
         <property name="webappFolder" value="${red5.root}/webapps" />
         

src/main/server/conf/red5-common.xml

@@ -111,13 +111,6 @@
 	<bean id="schedulingService" class="org.red5.server.scheduling.QuartzSchedulingService">
         <property name="configFile" value="${red5.root}/conf/quartz.properties"/>   
     </bean>
-
-    <!-- War deployer -->
-    <bean id="warDeployService" class="org.red5.server.service.WarDeployer" init-method="init" destroy-method="shutdown">
-        <property name="scheduler" ref="schedulingService"/>
-        <property name="checkInterval" value="${war.deploy.server.check.interval}"/>
-        <property name="deploymentDirectory" value="${red5.root}/webapps"/>
-    </bean>		 
 
 	<!-- Use injection to setup thread pool for remoting clients -->
 	<bean id="remotingClient" class="org.red5.server.net.remoting.RemotingClient">

src/main/server/conf/red5-core.xml

@@ -117,7 +117,7 @@
         <!-- Deadlock guard executor -->
         <property name="deadlockGuardScheduler" ref="deadlockGuardScheduler" />
         <!-- Maximum time allowed for a single RTMP packet to be processed -->
-        <property name="maxHandlingTimeout" value="${rtmp.deadlockguard.max_handling_time}" />
+        <property name="maxHandlingTimeout" value="${rtmp.max_handling_time}" />
         <!-- Specify the size of queue that will trigger audio packet dropping, disabled if it's 0 -->
          <property name="executorQueueSizeToDropAudioPackets" value="${rtmp.executor.queue_size_to_drop_audio_packets}" />
 	</bean>
@@ -162,7 +162,7 @@
         <!-- Deadlock guard executor -->
         <property name="deadlockGuardScheduler" ref="deadlockGuardScheduler" />
 		<!-- Maximum time allowed for a single RTMP packet to be processed -->
-        <property name="maxHandlingTimeout" value="${rtmp.deadlockguard.max_handling_time}" />
+        <property name="maxHandlingTimeout" value="${rtmp.max_handling_time}" />
         <!-- Specify the size of queue that will trigger audio packet dropping, disabled if it's 0 -->
          <property name="executorQueueSizeToDropAudioPackets" value="${rtmp.executor.queue_size_to_drop_audio_packets}" />
 	</bean>

src/main/server/conf/red5.properties

@@ -53,10 +53,10 @@ rtmp.executor.max_pool_size=32
 rtmp.executor.queue_capacity=64
 # drop audio packets when queue is almost full, to disable this, set to 0
 rtmp.executor.queue_size_to_drop_audio_packets=60
+# maximum amount of time allotted to process a single rtmp message / packet in milliseconds, set it as 0 to disable timeout
+rtmp.max_handling_time=2000
 # deadlock guard configs
-rtmp.deadlockguard.sheduler.pool_size=32
-# maximum amount of time allotted to process a single rtmp message / packet in milliseconds, set it as 0 to disable timeout (default 1000)
-rtmp.deadlockguard.max_handling_time=1000
+rtmp.deadlockguard.sheduler.pool_size=16
 
 # RTMPS
 rtmps.host=0.0.0.0

src/main/server/plugins/Readme.md

@@ -1,6 +1,6 @@
 Included plugins:
 
- * Red5 Tomcat 1.9
+ * Red5 Tomcat 1.10
  * Red5 WebSocket 1.2
 
 Support libraries:
@@ -9,5 +9,5 @@ Support libraries:
  * ECJ 4.4.2
  * [juli-over-slf4j](https://github.com/Red5/juli-over-slf4j)
 
-Updated: 01/14/2015
+Updated: 09/16/2015
 

src/main/server/red5.bat

@@ -17,7 +17,7 @@ REM Set up security options
 REM set SECURITY_OPTS=-Djava.security.debug=failure -Djava.security.manager -Djava.security.policy="%RED5_HOME%/conf/red5.policy"
 set SECURITY_OPTS=-Djava.security.debug=failure
 REM Set up tomcat options
-set TOMCAT_OPTS=-Dcatalina.home="%RED5_HOME%"
+set TOMCAT_OPTS=-Dcatalina.home=%RED5_HOME%
 REM Setup python/jython path
 set JYTHON_OPTS=-Dpython.home=lib
 REM Combined java options