Skip to content

Commit 6265713

Browse files
mondainmondain
committed
Fixed line endings in jee xml
1 parent 7514c92 commit 6265713

File tree

1 file changed

+125
-125
lines changed

1 file changed

+125
-125
lines changed

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

Lines changed: 125 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,125 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans xmlns="http://www.springframework.org/schema/beans"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xmlns:lang="http://www.springframework.org/schema/lang"
5-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
6-
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
7-
8-
<!-- War deployer -->
9-
<bean id="warDeployer" class="org.red5.server.tomcat.WarDeployer">
10-
<property name="checkInterval" value="${war.deploy.server.check.interval}"/>
11-
<property name="webappFolder" value="${red5.root}/webapps"/>
12-
<!-- Expand war files prior to startup of the remaining services -->
13-
<property name="expandWars" value="true" />
14-
</bean>
15-
16-
<!--
17-
The tomcat connectors may be blocking or non-blocking. Select between either option via the protocol property.
18-
Blocking I/O:
19-
<property name="protocol" value="org.apache.coyote.http11.Http11Protocol" />
20-
Non-blocking I/O:
21-
<property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
22-
-->
23-
24-
<!-- Tomcat without SSL enabled -->
25-
<bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader,warDeployer" lazy-init="true">
26-
27-
<property name="webappFolder" value="${red5.root}/webapps" />
28-
29-
<property name="connectors">
30-
<list>
31-
<bean name="httpConnector" class="org.red5.server.tomcat.TomcatConnector">
32-
<property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
33-
<property name="address" value="${http.host}:${http.port}" />
34-
<property name="redirectPort" value="${https.port}" />
35-
<property name="connectionProperties">
36-
<map>
37-
<entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
38-
<entry key="keepAliveTimout" value="-1"/>
39-
</map>
40-
</property>
41-
</bean>
42-
</list>
43-
</property>
44-
45-
<property name="baseHost">
46-
<bean class="org.apache.catalina.core.StandardHost">
47-
<property name="name" value="${http.host}" />
48-
</bean>
49-
</property>
50-
51-
<property name="valves">
52-
<list>
53-
<bean id="valve.access" class="org.apache.catalina.valves.AccessLogValve">
54-
<property name="directory" value="log" />
55-
<property name="prefix" value="${http.host}_access." />
56-
<property name="suffix" value=".log" />
57-
<property name="pattern" value="common" />
58-
<property name="rotatable" value="true" />
59-
</bean>
60-
</list>
61-
</property>
62-
63-
</bean>
64-
65-
<!-- Tomcat with SSL enabled -->
66-
<!--
67-
<bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader" lazy-init="true">
68-
69-
<property name="webappFolder" value="${red5.root}/webapps" />
70-
71-
<property name="connectors">
72-
<list>
73-
<bean name="httpConnector" class="org.red5.server.tomcat.TomcatConnector">
74-
<property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
75-
<property name="address" value="${http.host}:${http.port}" />
76-
<property name="redirectPort" value="${https.port}" />
77-
</bean>
78-
<bean name="httpsConnector" class="org.red5.server.tomcat.TomcatConnector">
79-
<property name="secure" value="true" />
80-
<property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
81-
<property name="address" value="${http.host}:${https.port}" />
82-
<property name="redirectPort" value="${http.port}" />
83-
<property name="connectionProperties">
84-
<map>
85-
<entry key="port" value="${https.port}" />
86-
<entry key="redirectPort" value="${http.port}" />
87-
<entry key="SSLEnabled" value="true" />
88-
<entry key="sslProtocol" value="TLS" />
89-
<entry key="keystoreFile" value="${rtmps.keystorefile}" />
90-
<entry key="keystorePass" value="${rtmps.keystorepass}" />
91-
<entry key="keystoreType" value="JKS" />
92-
<entry key="truststoreFile" value="${rtmps.truststorefile}" />
93-
<entry key="truststorePass" value="${rtmps.truststorepass}" />
94-
<entry key="clientAuth" value="false" />
95-
<entry key="allowUnsafeLegacyRenegotiation" value="true" />
96-
<entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
97-
<entry key="keepAliveTimout" value="-1"/>
98-
<entry key="useExecutor" value="true"/>
99-
<entry key="maxThreads" value="${http.max_threads}"/>
100-
<entry key="acceptorThreadCount" value="${http.acceptor_thread_count}"/>
101-
<entry key="processorCache" value="${http.processor_cache}"/>
102-
</map>
103-
</property>
104-
</bean>
105-
</list>
106-
</property>
107-
108-
<property name="baseHost">
109-
<bean class="org.apache.catalina.core.StandardHost">
110-
<property name="name" value="${http.host}" />
111-
</bean>
112-
</property>
113-
114-
</bean>
115-
-->
116-
<!-- This entry enabled websocket support on port 8081 at localhost -->
117-
<bean id="webSocketTransport" class="org.red5.net.websocket.WebSocketTransport">
118-
<property name="addresses">
119-
<list>
120-
<value>${ws.host}:${ws.port}</value>
121-
</list>
122-
</property>
123-
</bean>
124-
125-
</beans>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<beans xmlns="http://www.springframework.org/schema/beans"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:lang="http://www.springframework.org/schema/lang"
5+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
6+
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
7+
8+
<!-- War deployer -->
9+
<bean id="warDeployer" class="org.red5.server.tomcat.WarDeployer">
10+
<property name="checkInterval" value="${war.deploy.server.check.interval}"/>
11+
<property name="webappFolder" value="${red5.root}/webapps"/>
12+
<!-- Expand war files prior to startup of the remaining services -->
13+
<property name="expandWars" value="true" />
14+
</bean>
15+
16+
<!--
17+
The tomcat connectors may be blocking or non-blocking. Select between either option via the protocol property.
18+
Blocking I/O:
19+
<property name="protocol" value="org.apache.coyote.http11.Http11Protocol" />
20+
Non-blocking I/O:
21+
<property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
22+
-->
23+
24+
<!-- Tomcat without SSL enabled -->
25+
<bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader,warDeployer" lazy-init="true">
26+
27+
<property name="webappFolder" value="${red5.root}/webapps" />
28+
29+
<property name="connectors">
30+
<list>
31+
<bean name="httpConnector" class="org.red5.server.tomcat.TomcatConnector">
32+
<property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
33+
<property name="address" value="${http.host}:${http.port}" />
34+
<property name="redirectPort" value="${https.port}" />
35+
<property name="connectionProperties">
36+
<map>
37+
<entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
38+
<entry key="keepAliveTimout" value="-1"/>
39+
</map>
40+
</property>
41+
</bean>
42+
</list>
43+
</property>
44+
45+
<property name="baseHost">
46+
<bean class="org.apache.catalina.core.StandardHost">
47+
<property name="name" value="${http.host}" />
48+
</bean>
49+
</property>
50+
51+
<property name="valves">
52+
<list>
53+
<bean id="valve.access" class="org.apache.catalina.valves.AccessLogValve">
54+
<property name="directory" value="log" />
55+
<property name="prefix" value="${http.host}_access." />
56+
<property name="suffix" value=".log" />
57+
<property name="pattern" value="common" />
58+
<property name="rotatable" value="true" />
59+
</bean>
60+
</list>
61+
</property>
62+
63+
</bean>
64+
65+
<!-- Tomcat with SSL enabled -->
66+
<!--
67+
<bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader" lazy-init="true">
68+
69+
<property name="webappFolder" value="${red5.root}/webapps" />
70+
71+
<property name="connectors">
72+
<list>
73+
<bean name="httpConnector" class="org.red5.server.tomcat.TomcatConnector">
74+
<property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
75+
<property name="address" value="${http.host}:${http.port}" />
76+
<property name="redirectPort" value="${https.port}" />
77+
</bean>
78+
<bean name="httpsConnector" class="org.red5.server.tomcat.TomcatConnector">
79+
<property name="secure" value="true" />
80+
<property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
81+
<property name="address" value="${http.host}:${https.port}" />
82+
<property name="redirectPort" value="${http.port}" />
83+
<property name="connectionProperties">
84+
<map>
85+
<entry key="port" value="${https.port}" />
86+
<entry key="redirectPort" value="${http.port}" />
87+
<entry key="SSLEnabled" value="true" />
88+
<entry key="sslProtocol" value="TLS" />
89+
<entry key="keystoreFile" value="${rtmps.keystorefile}" />
90+
<entry key="keystorePass" value="${rtmps.keystorepass}" />
91+
<entry key="keystoreType" value="JKS" />
92+
<entry key="truststoreFile" value="${rtmps.truststorefile}" />
93+
<entry key="truststorePass" value="${rtmps.truststorepass}" />
94+
<entry key="clientAuth" value="false" />
95+
<entry key="allowUnsafeLegacyRenegotiation" value="true" />
96+
<entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
97+
<entry key="keepAliveTimout" value="-1"/>
98+
<entry key="useExecutor" value="true"/>
99+
<entry key="maxThreads" value="${http.max_threads}"/>
100+
<entry key="acceptorThreadCount" value="${http.acceptor_thread_count}"/>
101+
<entry key="processorCache" value="${http.processor_cache}"/>
102+
</map>
103+
</property>
104+
</bean>
105+
</list>
106+
</property>
107+
108+
<property name="baseHost">
109+
<bean class="org.apache.catalina.core.StandardHost">
110+
<property name="name" value="${http.host}" />
111+
</bean>
112+
</property>
113+
114+
</bean>
115+
-->
116+
<!-- This entry enabled websocket support on port 8081 at localhost -->
117+
<bean id="webSocketTransport" class="org.red5.net.websocket.WebSocketTransport">
118+
<property name="addresses">
119+
<list>
120+
<value>${ws.host}:${ws.port}</value>
121+
</list>
122+
</property>
123+
</bean>
124+
125+
</beans>

0 commit comments

Comments
 (0)