Merge branch 'master' of github.com:Red5/red5-server

README.md

@@ -25,10 +25,13 @@ Automatic builds (Courtesy of Apache / OpenMeetings):
  * [Red5](https://builds.apache.org/view/M-R/view/OpenMeetings/job/Red5-server/)
  * [Windows Installer](https://builds.apache.org/view/M-R/view/OpenMeetings/job/red5-installer/)
 
-Current version is <b>1.0.6-SNAPSHOT</b>
+Current version is <b>1.0.6-RELEASE</b>
 
 [Latest Releases](https://github.com/Red5/red5-server/releases/latest)
 ----------------
+<h4>Red5 1.0.6 Release (8 September 2015)</h4>
+[Tarball &amp; ZIP](https://github.com/Red5/red5-server/releases/tag/v1.0.6-RELEASE)
+
 <h4>Red5 1.0.5 Release (7 February 2015)</h4>
 [Tarball &amp; ZIP](https://github.com/Red5/red5-server/releases/tag/v1.0.5-RELEASE) | [Windows] (https://mega.co.nz/#!cAVGCJJR!flZqMKTB9mcD1_nvbQ_xlG88ADTEkFk7-jtuGw2uNOc)
 
@@ -87,7 +90,7 @@ mvn eclipse:eclipse
 3. Access the right-click menu and select "Configure" and then "Convert to Maven Project".
 4. Now the project will build automatically, if you have the maven plugin installed.
 
-[http://screencast.com/t/2sgjMevf9 Screencast]
+[Screencast](http://screencast.com/t/2sgjMevf9)
 
 Previous Releases
 -------------------

pom.xml

@@ -67,6 +67,7 @@
         <quartz.version>2.2.1</quartz.version>
         <bc.version>1.52</bc.version>
         <junit.version>4.12</junit.version>
+        <tomcat.version>8.0.26</tomcat.version>
     </properties>
     <repositories>
         <repository>
@@ -256,11 +257,10 @@
     </dependencyManagement>
     <dependencies>
         <dependency>
-            <groupId>org.jboss.spec.javax.servlet</groupId>
-            <artifactId>jboss-servlet-api_3.0_spec</artifactId>
-            <version>1.0.2.Final</version>
-            <!--$NO-MVN-MAN-VER$ -->
-            <scope>compile</scope>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-servlet-api</artifactId>
+            <version>${tomcat.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

src/main/assembly/server.xml

@@ -42,7 +42,7 @@
 				<include>*.jar</include>
 			</includes>
             <excludes>
-                <exclude>jboss-servlet-api_3.0_spec-1.0.2.Final.jar</exclude>               
+            	<exclude>tomcat-servlet-api-8.0.26.jar</exclude>
                 <exclude>antlr-2.7.7.jar</exclude>
                 <exclude>asm-analysis-4.0.jar</exclude>
                 <exclude>asm-commons-4.0.jar</exclude>

src/main/server/red5.bat

@@ -16,10 +16,12 @@ set LOGGING_OPTS=-Dlogback.ContextSelector=org.red5.logging.LoggingContextSelect
 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%"
 REM Setup python/jython path
 set JYTHON_OPTS=-Dpython.home=lib
 REM Combined java options
-set JAVA_OPTS=%LOGGING_OPTS% %SECURITY_OPTS% %JAVA_OPTS% %JVM_OPTS% %JYTHON_OPTS%
+set JAVA_OPTS=%LOGGING_OPTS% %SECURITY_OPTS% %JAVA_OPTS% %JVM_OPTS% %TOMCAT_OPTS% %JYTHON_OPTS%
 
 set RED5_CLASSPATH=%RED5_HOME%\red5-service.jar;%RED5_HOME%\conf;%CLASSPATH%
 

src/main/server/red5.sh

@@ -34,10 +34,12 @@ fi
 LOGGING_OPTS="-Dlogback.ContextSelector=org.red5.logging.LoggingContextSelector -Dcatalina.useNaming=true"
 # Set up security options
 SECURITY_OPTS="-Djava.security.debug=failure"
+# Set up tomcat options
+TOMCAT_OPTS="-Dcatalina.home=$RED5_HOME"
 # Jython options
 JYTHON="-Dpython.home=lib"
 
-export JAVA_OPTS="$LOGGING_OPTS $SECURITY_OPTS $JAVA_OPTS $JVM_OPTS $JYTHON"
+export JAVA_OPTS="$LOGGING_OPTS $SECURITY_OPTS $JAVA_OPTS $JVM_OPTS $TOMCAT_OPTS $JYTHON"
 
 if [ -z "$RED5_MAINCLASS" ]; then
   export RED5_MAINCLASS=org.red5.server.Bootstrap

src/main/server/webapps/root/flvdemo.html

@@ -7,6 +7,7 @@
 <script type="text/javascript">
 swfobject.embedSWF("demos/ofla_demo.swf", "myContent", "640", "480", "8.0.0", "demos/assets/expressInstall.swf");
 </script>
+</head>
 <body>
 	<div id="myContent">
 		<h1>You need the Adobe Flash Player for this demo, download it by clicking the image below.</h1>