Skip to content
Snippets Groups Projects
Commit 48ce35d5 authored by Paul Gregoire's avatar Paul Gregoire
Browse files

Remove cors and rtmpt from apps

parent fbd92c04
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
common/src/main/java/org/red5/server/net/rtmp/RTMPConnection.java
+ 2
− 1
View file @ 48ce35d5
......@@ -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());
......
pom.xml
+ 1
− 1
View file @ 48ce35d5
......@@ -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 -->
......
server/pom.xml
+ 0
− 8
View file @ 48ce35d5
......@@ -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>
......
server/src/main/server/webapps/live/WEB-INF/web.xml
+ 2
− 37
View file @ 48ce35d5
......@@ -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>
server/src/main/server/webapps/root/WEB-INF/web.xml
+ 1
− 15
View file @ 48ce35d5
......@@ -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>
......
server/src/main/server/webapps/vod/WEB-INF/web.xml
+ 0
− 50
View file @ 48ce35d5
......@@ -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>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment