diff --git a/common/src/main/java/org/red5/server/net/rtmp/RTMPConnection.java b/common/src/main/java/org/red5/server/net/rtmp/RTMPConnection.java
index eae251d4f93ecccd63817c6414bd8cf231d4c1d2..c0a6371f6fa327cbe9048e6bb9e8945c3565f719 100755
--- a/common/src/main/java/org/red5/server/net/rtmp/RTMPConnection.java
+++ b/common/src/main/java/org/red5/server/net/rtmp/RTMPConnection.java
@@ -1569,7 +1569,8 @@ public abstract class RTMPConnection extends BaseConnection implements IStreamCa
currentStreamTasks.removeTask(task);
}
- public void onSuccess(@Nullable Packet packet) {
+ public void onSuccess(@Nullable
+ Packet packet) {
log.debug("ReceivedMessageTask success");
if (isDebug) {
log.debug("onSuccess - session: {}, msgType: {}, processingTime: {}, packetNum: {}", sessionId, messageType, getProcessingTime(), task.getPacketNumber());
diff --git a/pom.xml b/pom.xml
index cb775dc59676e172b49a8e15b3fdd66d427eafb7..b633e3e8949da27d81ace0a39b8c2b862ae3b8dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -367,7 +367,7 @@
</execution>
</executions>
<configuration>
- <configFile>${project.parent.basedir}/red5-eclipse-format.xml</configFile>
+ <configFile>${project.basedir}/../red5-eclipse-format.xml</configFile>
<!-- Enforce line-feed (linux,mac) line endings att -->
<lineEnding>LF</lineEnding>
<!-- Exclude xml and props files -->
diff --git a/server/pom.xml b/server/pom.xml
index ee63aaa6fbe81bf89fa9038c9a0b749e7c98b3d3..1f264b25640cf78aa6b894a96ce1218a2d1c1d88 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -12,7 +12,6 @@
<properties>
<build.dir>target</build.dir>
<finalName>${project.artifactId}-${project.version}</finalName>
- <cors-filter.version>2.6</cors-filter.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -174,13 +173,6 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Provides CORS functionality http://software.dzhuvinov.com/cors-filter.html -->
- <dependency>
- <groupId>com.thetransactioncompany</groupId>
- <artifactId>cors-filter</artifactId>
- <version>${cors-filter.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/server/src/main/server/webapps/live/WEB-INF/web.xml b/server/src/main/server/webapps/live/WEB-INF/web.xml
index e9f4a6704909fa954980f317499f0816ab3b92ca..2a9125e4358e863edb48f497e7ca981e7eb2164d 100644
--- a/server/src/main/server/webapps/live/WEB-INF/web.xml
+++ b/server/src/main/server/webapps/live/WEB-INF/web.xml
@@ -8,31 +8,7 @@
<param-name>webAppRootKey</param-name>
<param-value>/live</param-value>
</context-param>
- <filter>
- <filter-name>CORS</filter-name>
- <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class>
- <async-supported>true</async-supported>
- <init-param>
- <param-name>cors.allowOrigin</param-name>
- <param-value>*</param-value>
- </init-param>
- <init-param>
- <param-name>cors.allowSubdomains</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>cors.supportedMethods</param-name>
- <param-value>GET, HEAD</param-value>
- </init-param>
- <init-param>
- <param-name>cors.maxAge</param-name>
- <param-value>3600</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>CORS</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
+ <!-- XXX(paul) unused feature
<servlet>
<servlet-name>rtmpt</servlet-name>
<servlet-class>org.red5.server.net.rtmpt.RTMPTServlet</servlet-class>
@@ -41,21 +17,10 @@
<servlet-mapping>
<servlet-name>rtmpt</servlet-name>
<url-pattern>/fcs/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>rtmpt</servlet-name>
<url-pattern>/open/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>rtmpt</servlet-name>
<url-pattern>/close/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>rtmpt</servlet-name>
<url-pattern>/send/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>rtmpt</servlet-name>
<url-pattern>/idle/*</url-pattern>
</servlet-mapping>
+ -->
</web-app>
diff --git a/server/src/main/server/webapps/root/WEB-INF/web.xml b/server/src/main/server/webapps/root/WEB-INF/web.xml
index a9a64c29d037b11c927912a28eb18661f68df24b..0307f530f48e62d2a60853fc489ca884d2125867 100644
--- a/server/src/main/server/webapps/root/WEB-INF/web.xml
+++ b/server/src/main/server/webapps/root/WEB-INF/web.xml
@@ -10,38 +10,24 @@
<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</servlet-class>
<load-on-startup>2</load-on-startup>
</servlet>
- <!-- XXX(paul) disabled due to issue and lack-of-use; re-enable at your own risk
<servlet-mapping>
<servlet-name>gateway</servlet-name>
<url-pattern>/gateway</url-pattern>
</servlet-mapping>
- -->
<servlet-mapping>
<servlet-name>rtmpt</servlet-name>
<url-pattern>/open/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>rtmpt</servlet-name>
<url-pattern>/idle/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>rtmpt</servlet-name>
<url-pattern>/send/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>rtmpt</servlet-name>
<url-pattern>/close/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>rtmpt</servlet-name>
<url-pattern>/fcs/*</url-pattern>
</servlet-mapping>
+ -->
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
diff --git a/server/src/main/server/webapps/vod/WEB-INF/web.xml b/server/src/main/server/webapps/vod/WEB-INF/web.xml
index ac0cca952f8e6b8030d046075182fec7b2cc7dd0..a053b2271132787b94fbac8fce0235e2ac875e8d 100644
--- a/server/src/main/server/webapps/vod/WEB-INF/web.xml
+++ b/server/src/main/server/webapps/vod/WEB-INF/web.xml
@@ -8,54 +8,4 @@
<param-name>webAppRootKey</param-name>
<param-value>/vod</param-value>
</context-param>
- <filter>
- <filter-name>CORS</filter-name>
- <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class>
- <async-supported>true</async-supported>
- <init-param>
- <param-name>cors.allowOrigin</param-name>
- <param-value>*</param-value>
- </init-param>
- <init-param>
- <param-name>cors.allowSubdomains</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>cors.supportedMethods</param-name>
- <param-value>GET, HEAD</param-value>
- </init-param>
- <init-param>
- <param-name>cors.maxAge</param-name>
- <param-value>3600</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>CORS</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <servlet>
- <servlet-name>rtmpt</servlet-name>
- <servlet-class>org.red5.server.net.rtmpt.RTMPTServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>rtmpt</servlet-name>
- <url-pattern>/fcs/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>rtmpt</servlet-name>
- <url-pattern>/open/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>rtmpt</servlet-name>
- <url-pattern>/close/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>rtmpt</servlet-name>
- <url-pattern>/send/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>rtmpt</servlet-name>
- <url-pattern>/idle/*</url-pattern>
- </servlet-mapping>
</web-app>