You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/06/19 16:29:53 UTC
svn commit: r1603891 - in /openmeetings: branches/3.0.x/
branches/3.0.x/WebContent/red5/ branches/3.0.x/src/main/webapp/public/
trunk/singlewebapp/openmeetings-server/src/site/xdoc/ trunk/site/
Author: solomax
Date: Thu Jun 19 14:29:52 2014
New Revision: 1603891
URL: http://svn.apache.org/r1603891
Log:
[OPENMEETINGS-1028] red5 is updated to work with HTTPS/RTMPS
Added:
openmeetings/branches/3.0.x/WebContent/red5/red5-core.xml
openmeetings/branches/3.0.x/WebContent/red5/red5.properties
Modified:
openmeetings/branches/3.0.x/WebContent/red5/jee-container.xml
openmeetings/branches/3.0.x/build.xml
openmeetings/branches/3.0.x/ivy.xml
openmeetings/branches/3.0.x/ivysettings.xml
openmeetings/branches/3.0.x/src/main/webapp/public/config.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
openmeetings/trunk/site/RTMPSAndHTTPS.html
openmeetings/trunk/site/dependencies.html
openmeetings/trunk/site/dependency-management.html
openmeetings/trunk/site/distribution-management.html
openmeetings/trunk/site/integration.html
openmeetings/trunk/site/issue-tracking.html
openmeetings/trunk/site/license.html
openmeetings/trunk/site/mail-lists.html
openmeetings/trunk/site/plugin-management.html
openmeetings/trunk/site/plugins.html
openmeetings/trunk/site/project-info.html
openmeetings/trunk/site/project-reports.html
openmeetings/trunk/site/project-summary.html
openmeetings/trunk/site/source-repository.html
openmeetings/trunk/site/surefire-report.html
openmeetings/trunk/site/team-list.html
Modified: openmeetings/branches/3.0.x/WebContent/red5/jee-container.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/red5/jee-container.xml?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/red5/jee-container.xml (original)
+++ openmeetings/branches/3.0.x/WebContent/red5/jee-container.xml Thu Jun 19 14:29:52 2014
@@ -12,136 +12,41 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:lang="http://www.springframework.org/schema/lang" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:lang="http://www.springframework.org/schema/lang"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd">
<!--
- The tomcat connectors may be blocking or non-blocking. Select between either option via the constructor-arg.
+ The tomcat connectors may be blocking or non-blocking. Select between either option via the protocol property.
Blocking I/O:
- <constructor-arg type="java.lang.String" value="org.apache.coyote.http11.Http11Protocol" />
+ <property name="protocol" value="org.apache.coyote.http11.Http11Protocol" />
Non-blocking I/O:
- <constructor-arg type="java.lang.String" value="org.apache.coyote.http11.Http11NioProtocol" />
+ <property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
-->
-
- <!-- Tomcat without SSL enabled -->
- <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" init-method="init" destroy-method="shutdown" depends-on="context.loader">
-
- <property name="webappFolder" value="${red5.root}/webapps"/>
-
- <property name="connector">
- <bean class="org.apache.catalina.connector.Connector">
- <constructor-arg type="java.lang.String" value="org.apache.coyote.http11.Http11NioProtocol"/>
- <property name="port" value="${http.port}"/>
- <property name="redirectPort" value="${https.port}"/>
- <property name="enableLookups" value="false"/>
- <property name="useIPVHosts" value="true"/>
- <property name="URIEncoding" value="${http.URIEncoding}"/>
- </bean>
- </property>
-
- <property name="address">
- <bean class="java.net.InetSocketAddress">
- <constructor-arg index="0" type="java.lang.String" value="${http.host}"/>
- <constructor-arg index="1" type="int" value="${http.port}"/>
- </bean>
- </property>
-
- <property name="baseHost">
- <bean class="org.apache.catalina.core.StandardHost">
- <property name="name" value="${http.host}"/>
- <property name="unpackWARs" value="true"/>
- <property name="autoDeploy" value="true"/>
- </bean>
- </property>
-
- <property name="valves">
- <list>
- <bean id="valve.access" class="org.apache.catalina.valves.AccessLogValve">
- <property name="directory" value="log" />
- <property name="prefix" value="${http.host}_access." />
- <property name="suffix" value=".log" />
- <property name="pattern" value="common" />
- <property name="resolveHosts" value="false" />
- <property name="rotatable" value="true" />
- </bean>
- </list>
- </property>
-
- </bean>
-
- <!-- Tomcat with SSL enabled -->
-<!--
- <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" init-method="init" destroy-method="shutdown" depends-on="context.loader">
+
+ <!-- Tomcat without SSL enabled -->
+ <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader" init-method="start" lazy-init="true">
<property name="webappFolder" value="${red5.root}/webapps" />
-
- <property name="connector">
- <bean class="org.apache.catalina.connector.Connector">
- <constructor-arg type="java.lang.String" value="org.apache.coyote.http11.Http11Protocol" />
- <property name="port"><value>${https.port}</value></property>
- <property name="redirectPort"><value>${http.port}</value></property>
- <property name="enableLookups"><value>false</value></property>
- <property name="useIPVHosts"><value>true</value></property>
- <property name="URIEncoding" value="${http.URIEncoding}" />
- </bean>
- </property>
-
- <property name="address">
- <bean class="java.net.InetSocketAddress">
- <constructor-arg index="0" type="java.lang.String" value="${http.host}" />
- <constructor-arg index="1" type="int" value="${https.port}" />
- </bean>
+
+ <property name="connectors">
+ <list>
+ <bean name="httpConnector" class="org.red5.server.tomcat.TomcatConnector">
+ <property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
+ <property name="address" value="${http.host}:${http.port}" />
+ <property name="redirectPort" value="${https.port}" />
+ </bean>
+ </list>
</property>
-
+
<property name="baseHost">
<bean class="org.apache.catalina.core.StandardHost">
<property name="name" value="${http.host}" />
- <property name="unpackWARs" value="true" />
- <property name="autoDeploy" value="true" />
</bean>
</property>
- <property name="connectionProperties">
- <map>
- <entry>
- <key><value>port</value></key>
- <value>${https.port}</value>
- </entry>
- <entry>
- <key><value>redirectPort</value></key>
- <value>${http.port}</value>
- </entry>
- <entry>
- <key><value>SSLEnabled</value></key>
- <value>true</value>
- </entry>
- <entry>
- <key><value>sslProtocol</value></key>
- <value>TLS</value>
- </entry>
- <entry>
- <key><value>clientAuth</value></key>
- <value>false</value>
- </entry>
- <entry>
- <key><value>keystoreFile</value></key>
- <value>conf/keystore</value>
- </entry>
- <entry>
- <key><value>keystorePass</value></key>
- <value>${rtmps.keystorepass}</value>
- </entry>
- <entry>
- <key><value>keystoreType</value></key>
- <value>JKS</value>
- </entry>
- <entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
- <entry key="useExecutor" value="true"/>
- <entry key="maxThreads" value="${http.max_threads}"/>
- <entry key="acceptorThreadCount" value="${http.acceptor_thread_count}"/>
- <entry key="processorCache" value="${http.processor_cache}"/>
- </map>
- </property>
-
<property name="valves">
<list>
<bean id="valve.access" class="org.apache.catalina.valves.AccessLogValve">
@@ -155,138 +60,57 @@
</list>
</property>
- </bean>
- -->
-
- <!-- RTMPT (dedicated server) -->
-<!--
- <bean id="rtmpt.server" class="org.red5.server.tomcat.rtmpt.RTMPTLoader" init-method="init" lazy-init="true">
-
- <property name="webappFolder" value="${red5.root}/webapps" />
-
- <property name="connector">
- <bean class="org.apache.catalina.connector.Connector">
- <constructor-arg type="java.lang.String" value="org.apache.coyote.http11.Http11NioProtocol" />
- <property name="port"><value>${rtmpt.port}</value></property>
- <property name="enableLookups"><value>false</value></property>
- <property name="URIEncoding" value="${http.URIEncoding}" />
- </bean>
- </property>
-
- <property name="address">
- <bean class="java.net.InetSocketAddress">
- <constructor-arg index="0" type="java.lang.String" value="${rtmpt.host}" />
- <constructor-arg index="1" type="int" value="${rtmpt.port}" />
- </bean>
- </property>
-
- <property name="host">
- <bean class="org.apache.catalina.core.StandardHost">
- <property name="name" value="${rtmpt.host}" />
- <property name="unpackWARs" value="false" />
- <property name="autoDeploy" value="false" />
- </bean>
- </property>
+ </bean>
+
+ <!-- Tomcat with SSL enabled -->
+<!--
+ <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader" init-method="start" lazy-init="true">
- <property name="connectionProperties">
- <map>
- <entry key="maxKeepAliveRequests" value="${rtmpt.max_keep_alive_requests}"/>
- <entry key="useExecutor" value="true"/>
- <entry key="maxThreads" value="${rtmpt.max_threads}"/>
- <entry key="acceptorThreadCount" value="${rtmpt.acceptor_thread_count}"/>
- <entry key="processorCache" value="${rtmpt.processor_cache}"/>
- </map>
+ <property name="webappFolder" value="${red5.root}/webapps" />
+
+ <property name="connectors">
+ <list>
+ <bean name="httpConnector" class="org.red5.server.tomcat.TomcatConnector">
+ <property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
+ <property name="address" value="${http.host}:${http.port}" />
+ <property name="redirectPort" value="${https.port}" />
+ </bean>
+ <bean name="httpsConnector" class="org.red5.server.tomcat.TomcatConnector">
+ <property name="secure" value="true" />
+ <property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
+ <property name="address" value="${http.host}:${https.port}" />
+ <property name="redirectPort" value="${http.port}" />
+ <property name="connectionProperties">
+ <map>
+ <entry key="port" value="${https.port}" />
+ <entry key="redirectPort" value="${http.port}" />
+ <entry key="SSLEnabled" value="true" />
+ <entry key="sslProtocol" value="TLS" />
+ <entry key="keystoreFile" value="${rtmps.keystorefile}" />
+ <entry key="keystorePass" value="${rtmps.keystorepass}" />
+ <entry key="keystoreType" value="JKS" />
+ <entry key="truststoreFile" value="${rtmps.truststorefile}" />
+ <entry key="truststorePass" value="${rtmps.truststorepass}" />
+ <entry key="clientAuth" value="false" />
+ <entry key="allowUnsafeLegacyRenegotiation" value="true" />
+ <entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
+ <entry key="useExecutor" value="true"/>
+ <entry key="maxThreads" value="${http.max_threads}"/>
+ <entry key="acceptorThreadCount" value="${http.acceptor_thread_count}"/>
+ <entry key="processorCache" value="${http.processor_cache}"/>
+ </map>
+ </property>
+ </bean>
+ </list>
</property>
-
- </bean>
--->
-
- <!-- RTMPS (dedicated server) -->
-<!--
- <bean id="rtmps.server" class="org.red5.server.tomcat.rtmps.RTMPSLoader" init-method="init" lazy-init="true">
-
- <property name="webappFolder" value="${red5.root}/webapps" />
-
- <property name="connector">
- <bean class="org.apache.catalina.connector.Connector">
- <constructor-arg type="java.lang.String" value="org.apache.coyote.http11.Http11NioProtocol" />
- <property name="port" value="${rtmps.port}" />
- <property name="redirectPort" value="${rtmp.port}" />
- <property name="URIEncoding" value="${http.URIEncoding}" />
- </bean>
- </property>
-
- <property name="address">
- <bean class="java.net.InetSocketAddress">
- <constructor-arg index="0" type="java.lang.String" value="${rtmps.host}" />
- <constructor-arg index="1" type="int" value="${rtmps.port}" />
- </bean>
+
+ <property name="baseHost">
+ <bean class="org.apache.catalina.core.StandardHost">
+ <property name="name" value="${http.host}" />
+ </bean>
</property>
-
- <property name="host">
- <bean class="org.apache.catalina.core.StandardHost">
- <property name="name" value="${rtmps.host}" />
- <property name="unpackWARs" value="false" />
- <property name="autoDeploy" value="false" />
- </bean>
- </property>
-
- <property name="connectionProperties">
- <map>
- <entry>
- <key><value>port</value></key>
- <value>${rtmps.port}</value>
- </entry>
- <entry>
- <key><value>redirectPort</value></key>
- <value>${rtmp.port}</value>
- </entry>
- <entry>
- <key><value>SSLEnabled</value></key>
- <value>true</value>
- </entry>
- <entry>
- <key><value>sslProtocol</value></key>
- <value>TLS</value>
- </entry>
- <entry>
- <key><value>clientAuth</value></key>
- <value>false</value>
- </entry>
- <entry>
- <key><value>keystoreFile</value></key>
- <value>conf/keystore</value>
- </entry>
- <entry>
- <key><value>keystorePass</value></key>
- <value>${rtmps.keystorepass}</value>
- </entry>
- <entry>
- <key><value>keystoreType</value></key>
- <value>JKS</value>
- </entry>
- <entry key="maxKeepAliveRequests" value="${rtmps.max_keep_alive_requests}"/>
- <entry key="useExecutor" value="true"/>
- <entry key="maxThreads" value="${rtmps.max_threads}"/>
- <entry key="acceptorThreadCount" value="${rtmps.acceptor_thread_count}"/>
- <entry key="processorCache" value="${rtmps.processor_cache}"/>
- </map>
- </property>
-
- <property name="valves">
- <list>
- <bean id="valve.access" class="org.apache.catalina.valves.AccessLogValve">
- <property name="directory" value="log" />
- <property name="prefix" value="${http.host}_access." />
- <property name="suffix" value=".log" />
- <property name="pattern" value="common" />
- <property name="resolveHosts" value="false" />
- <property name="rotatable" value="true" />
- </bean>
- </list>
- </property>
-
- </bean>
+
+ </bean>
-->
</beans>
Added: openmeetings/branches/3.0.x/WebContent/red5/red5-core.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/red5/red5-core.xml?rev=1603891&view=auto
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/red5/red5-core.xml (added)
+++ openmeetings/branches/3.0.x/WebContent/red5/red5-core.xml Thu Jun 19 14:29:52 2014
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:lang="http://www.springframework.org/schema/lang"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.1.xsd">
+
+ <!-- DO NOT FORMAT THIS FILE IN ECLIPSE -->
+
+ <bean id="customEditorConfigurer" class="org.springframework.beans.factory.config.CustomEditorConfigurer">
+ <property name="customEditors">
+ <map>
+ <entry key="java.net.SocketAddress" value="org.apache.mina.integration.beans.InetSocketAddressEditor" />
+ </map>
+ </property>
+ </bean>
+
+ <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location" value="classpath:/red5.properties" />
+ </bean>
+
+ <!-- RTMP -->
+ <bean id="rtmpScheduler" scope="prototype" class="org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler">
+ <property name="poolSize" value="${rtmp.scheduler.pool_size}" />
+ </bean>
+
+ <bean id="messageExecutor" scope="prototype" class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
+ <property name="corePoolSize" value="1" />
+ <property name="maxPoolSize" value="1" />
+ <property name="queueCapacity" value="${rtmp.executor.queue_capacity}" />
+ </bean>
+
+ <!-- RTMP connection manager -->
+ <bean id="rtmpConnManager" class="org.red5.server.net.rtmp.RTMPConnManager" />
+
+ <bean id="rtmpCodecFactory" class="org.red5.server.net.rtmp.codec.RTMPMinaCodecFactory"/>
+
+ <!-- RTMP Handler -->
+ <bean id="rtmpHandler" class="org.red5.server.net.rtmp.RTMPHandler">
+ <property name="server" ref="red5.server" />
+ <property name="statusObjectService" ref="statusObjectService" />
+ <!-- Enable this if you want to allow global scope connections
+ <property name="globalScopeConnectionAllowed" value="true" />
+ -->
+ </bean>
+
+ <!-- RTMP Mina IO Handler -->
+ <bean id="rtmpMinaIoHandler" class="org.red5.server.net.rtmp.RTMPMinaIoHandler">
+ <property name="handler" ref="rtmpHandler" />
+ <property name="codecFactory" ref="rtmpCodecFactory" />
+ </bean>
+
+ <!-- RTMP Mina Transport -->
+ <bean id="rtmpTransport" class="org.red5.server.net.rtmp.RTMPMinaTransport" init-method="start" destroy-method="stop">
+ <property name="ioHandler" ref="rtmpMinaIoHandler" />
+ <property name="addresses">
+ <list>
+ <value>${rtmp.host}:${rtmp.port}</value>
+ <!-- You can now add additional ports and ip addresses
+ <value>${rtmp.host}:1936</value>
+ -->
+ </list>
+ </property>
+ <property name="ioThreads" value="${rtmp.io_threads}" />
+ <property name="sendBufferSize" value="${rtmp.send_buffer_size}" />
+ <property name="receiveBufferSize" value="${rtmp.receive_buffer_size}" />
+ <property name="trafficClass" value="${rtmp.traffic_class}" />
+ <property name="backlog" value="${rtmp.backlog}" />
+ <property name="tcpNoDelay" value="${rtmp.tcp_nodelay}" />
+ <property name="keepAlive" value="${rtmp.tcp_keepalive}" />
+ <property name="thoughputCalcInterval" value="${rtmp.thoughput_calc_interval}" />
+ <property name="enableDefaultAcceptor" value="${rtmp.default_acceptor}" />
+ <!-- Pool settings are used when the default acceptor is disabled -->
+ <property name="initialPoolSize" value="${rtmp.initial_pool_size}" />
+ <property name="maxPoolSize" value="${rtmp.max_pool_size}" />
+ <property name="maxProcessorPoolSize" value="${rtmp.max_processor_pool_size}" />
+ <property name="executorKeepAliveTime" value="${rtmp.executor_keepalive_time}" />
+ <!-- This is the interval at which the sessions are polled for stats. If mina monitoring is not enabled, polling will not occur. -->
+ <property name="minaPollInterval" value="${jmx.mina.poll.interval}" />
+ <property name="enableMinaMonitor" value="${jmx.mina.monitor.enable}" />
+ <property name="enableMinaLogFilter" value="${mina.logfilter.enable}" />
+ </bean>
+
+ <!-- RTMP Mina Connection -->
+ <bean id="rtmpMinaConnection" scope="prototype" class="org.red5.server.net.rtmp.RTMPMinaConnection">
+ <!-- Executor for scheduled tasks -->
+ <property name="scheduler" ref="rtmpScheduler" />
+ <!-- Executor for incoming messages -->
+ <property name="executor" ref="messageExecutor" />
+ <!-- Ping clients every X ms. Set to 0 to disable ghost detection code. -->
+ <property name="pingInterval" value="${rtmp.ping_interval}" />
+ <!-- Disconnect client after X ms of not responding. -->
+ <property name="maxInactivity" value="${rtmp.max_inactivity}" />
+ <!-- Max. time in milliseconds to wait for a valid handshake. -->
+ <property name="maxHandshakeTimeout" value="${rtmp.max_handshake_time}" />
+ <!-- Default server bandwidth per connection -->
+ <property name="defaultServerBandwidth" value="${rtmp.default_server_bandwidth}" />
+ <!-- Default client bandwidth per connection -->
+ <property name="defaultClientBandwidth" value="${rtmp.default_client_bandwidth}" />
+ <!-- Client bandwidth limit type: 0 = hard, 1 = soft, 2 = dynamic -->
+ <property name="limitType" value="${rtmp.client_bandwidth_limit_type}" />
+ <!-- Bandwidth detection. If "false" the server will NOT initiate a check -->
+ <property name="bandwidthDetection" value="${rtmp.bandwidth_detection}" />
+ <!-- Maximum time allowed for a single RTMP packet to be processed -->
+ <property name="maxHandlingTimeout" value="${rtmp.max_handling_time}" />
+ </bean>
+
+ <!-- RTMPT -->
+
+ <!-- RTMPT Handler -->
+ <bean id="rtmptHandler" class="org.red5.server.net.rtmpt.RTMPTHandler" autowire="byType">
+ <property name="codecFactory" ref="rtmptCodecFactory" />
+ </bean>
+
+ <!-- Use injection to store RTMPT handler in servlet -->
+ <bean id="rtmptServlet" class="org.red5.server.net.rtmpt.RTMPTServlet">
+ <property name="manager" ref="rtmpConnManager" />
+ <property name="handler" ref="rtmptHandler" />
+ <!-- Increasing this value results in better stream performance, but also increases the latency -->
+ <property name="targetResponseSize" value="${rtmpt.target_reponse_size}" />
+ <!-- Response for /fcs/ident2 requests -->
+ <!--
+ <property name="ident2" value="127.0.0.1" />
+ -->
+ </bean>
+
+ <!-- RTMPT Connection -->
+ <bean id="rtmptConnection" scope="prototype" class="org.red5.server.net.rtmpt.RTMPTConnection">
+ <!-- Executor for scheduled tasks -->
+ <property name="scheduler" ref="rtmpScheduler" />
+ <!-- Executor for incoming messages -->
+ <property name="executor" ref="messageExecutor" />
+ <!-- Ping clients every X ms. Set to 0 to disable ghost detection code. -->
+ <property name="pingInterval" value="${rtmpt.ping_interval}" />
+ <!-- Disconnect client after X ms of not responding. -->
+ <property name="maxInactivity" value="${rtmpt.max_inactivity}" />
+ <!-- Max. time in milliseconds to wait for a valid handshake. -->
+ <property name="maxHandshakeTimeout" value="${rtmpt.max_handshake_time}" />
+ <!-- Maximum incoming messages to process at a time per client -->
+ <property name="maxInMessagesPerProcess" value="${rtmpt.max_in_msg_process}" />
+ <!-- Maximum amount of time in milliseconds to wait before allowing an offer to fail on incoming or outgoing queues -->
+ <property name="maxQueueOfferTime" value="${rtmpt.max_queue_offer_time}" />
+ <!-- Maximum offer attempts before failing on incoming or outgoing queues -->
+ <property name="maxQueueOfferAttempts" value="${rtmpt.max_queue_offer_attempts}" />
+ </bean>
+
+ <!-- RTMPS -->
+<!--
+ <bean id="rtmpsMinaIoHandler" class="org.red5.server.net.rtmps.RTMPSMinaIoHandler">
+ <property name="handler" ref="rtmpHandler" />
+ <property name="codecFactory" ref="rtmpCodecFactory" />
+ <property name="keystorePassword" value="${rtmps.keystorepass}" />
+ <property name="keystoreFile" value="${rtmps.keystorefile}" />
+ <property name="truststorePassword" value="${rtmps.truststorepass}" />
+ <property name="truststoreFile" value="${rtmps.truststorefile}" />
+ </bean>
+
+ <bean id="rtmpsTransport" class="org.red5.server.net.rtmp.RTMPMinaTransport" init-method="start" destroy-method="stop">
+ <property name="ioHandler" ref="rtmpsMinaIoHandler" />
+ <property name="addresses">
+ <list>
+ <value>${rtmps.host}:${rtmps.port}</value>
+ </list>
+ </property>
+ <property name="ioThreads" value="${rtmp.io_threads}" />
+ <property name="tcpNoDelay" value="${rtmp.tcp_nodelay}" />
+ </bean>
+-->
+
+ <!-- Enable when you need it. - - >
+ <bean id="rtmpProxyTransport" class="org.red5.server.net.rtmp.RTMPMinaTransport" init-method="start" destroy-method="stop">
+ <property name="ioHandler" ref="debugProxyIoHandler" />
+ <property name="address" value="${proxy.source_host}" />
+ <property name="port" value="${proxy.source_port}" />
+ <property name="ioThreads" value="${rtmp.io_threads}" />
+ <property name="tcpNoDelay" value="${rtmp.tcp_nodelay}" />
+ </bean>
+
+ <bean id="debugProxyIoHandler"
+ class="org.red5.server.net.proxy.DebugProxyHandler">
+ <property name="codecFactory" ref="rtmpCodecFactory" />
+ <property name="forward" value="${proxy.destination_host}:${proxy.destination_port}" />
+ <property name="dumpTo" value="./webapps/dump/" />
+ </bean>
+-->
+</beans>
Added: openmeetings/branches/3.0.x/WebContent/red5/red5.properties
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/red5/red5.properties?rev=1603891&view=auto
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/red5/red5.properties (added)
+++ openmeetings/branches/3.0.x/WebContent/red5/red5.properties Thu Jun 19 14:29:52 2014
@@ -0,0 +1,119 @@
+# Socket policy
+policy.host=0.0.0.0
+policy.port=843
+
+# HTTP
+http.host=0.0.0.0
+http.port=5080
+https.port=5443
+http.URIEncoding=UTF-8
+http.max_keep_alive_requests=-1
+http.max_threads=20
+http.acceptor_thread_count=10
+http.processor_cache=20
+
+# RTMP
+rtmp.host=0.0.0.0
+rtmp.port=1935
+rtmp.io_threads=16
+rtmp.send_buffer_size=65536
+rtmp.receive_buffer_size=65536
+rtmp.ping_interval=1000
+rtmp.max_inactivity=60000
+rtmp.max_handshake_time=5000
+rtmp.tcp_nodelay=true
+rtmp.tcp_keepalive=false
+rtmp.default_server_bandwidth=10000000
+rtmp.default_client_bandwidth=10000000
+rtmp.client_bandwidth_limit_type=2
+rtmp.bandwidth_detection=false
+rtmp.encoder_base_tolerance=5000
+rtmp.encoder_drop_live_future=false
+# traffic optimization hinting. to disable set traffic class set to -1
+# low delay + high throughput == 24 (0x18)
+rtmp.traffic_class=-1
+# requested maximum length of the queue of incoming connections
+rtmp.backlog=32
+# the interval (seconds) between each throughput calculation
+rtmp.thoughput_calc_interval=15
+# enable use of the default mina acceptor
+rtmp.default_acceptor=true
+# socket i/o pool sizes used when default acceptor is disabled
+rtmp.initial_pool_size=0
+rtmp.max_pool_size=2
+rtmp.max_processor_pool_size=16
+rtmp.executor_keepalive_time=60000
+mina.logfilter.enable=false
+# scheduler configs (per connection)
+rtmp.scheduler.pool_size=2
+# adjust this as needed if you get tasks rejected
+rtmp.executor.queue_capacity=32
+# maximum amount of time allotted to process a single rtmp message / packet in milliseconds
+rtmp.max_handling_time=500
+
+# RTMPS
+rtmps.host=0.0.0.0
+rtmps.port=8443
+rtmps.ping_interval=5000
+rtmps.max_inactivity=60000
+rtmps.max_keep_alive_requests=-1
+rtmps.max_threads=20
+rtmps.acceptor_thread_count=2
+rtmps.processor_cache=20
+# RTMPS Key and Trust store parameters
+rtmps.keystorepass=password
+rtmps.keystorefile=conf/keystore.jks
+rtmps.truststorepass=password
+rtmps.truststorefile=conf/truststore.jks
+
+# RTMPT
+rtmpt.host=0.0.0.0
+rtmpt.port=8088
+rtmpt.ping_interval=5000
+rtmpt.max_inactivity=60000
+rtmpt.max_handshake_time=5000
+rtmpt.max_keep_alive_requests=-1
+rtmpt.max_threads=20
+rtmpt.acceptor_thread_count=2
+rtmpt.processor_cache=20
+rtmpt.encoder_base_tolerance=5000
+rtmpt.encoder_drop_live_future=true
+# better setting for streaming media
+rtmpt.target_reponse_size=32768
+# best setting for small messages or shared objects
+#rtmpt.target_reponse_size=8192
+# max incoming messages to process at a time. the most that FP appears to send is 166
+rtmpt.max_in_msg_process=166
+# max time in millis that we will wait when offering data to the in or out queue
+rtmpt.max_queue_offer_time=125
+# max offer attempts
+rtmpt.max_queue_offer_attempts=4
+
+# Debug proxy (needs to be activated in red5-core.xml)
+proxy.source_host=127.0.0.1
+proxy.source_port=1936
+proxy.destination_host=127.0.0.1
+proxy.destination_port=1935
+
+# JMX
+jmx.rmi.host=localhost
+jmx.rmi.port=9999
+jmx.rmi.sport=9998
+jmx.rmi.port.remoteobjects=
+jmx.keystorepass=password
+jmx.mina.monitor.enable=false
+jmx.mina.poll.interval=1000
+jmx.registry.create=true
+jmx.reuse.existing.server=true
+
+# Server properties
+# max events to send in a single update
+so.max.events.per.update=64
+so.scheduler.pool_size=4
+keyframe.cache.entry.max=500
+war.deploy.server.check.interval=600000
+fileconsumer.delayed.write=true
+fileconsumer.queue.size=21
+subscriberstream.buffer.check.interval=5000
+subscriberstream.underrun.trigger=100
+broadcaststream.auto.record=false
Modified: openmeetings/branches/3.0.x/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.xml?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.xml (original)
+++ openmeetings/branches/3.0.x/build.xml Thu Jun 19 14:29:52 2014
@@ -1197,7 +1197,7 @@
<delete dir="${red5.lib}/webapps/vod" />
<copy file="${webcontent.base.dir}/red5/index.html" todir="${red5.lib}/webapps/root" overwrite="true" force="true" />
<copy todir="${red5.lib}" overwrite="true" force="true">
- <fileset dir="${webcontent.base.dir}/red5" includes="red5*,admin.*,network_test.sh" />
+ <fileset dir="${webcontent.base.dir}/red5" includes="red5*,admin.*,network_test.sh" excludes="red5-core.xml,red5.properties"/>
</copy>
<!-- FIXME need to be removed as soon as JAudioTagger (will be officially Dual Licensed) -->
<xslt in="${red5.lib}/conf/red5-common.xml" out="${red5.lib}/conf/red5-common1.xml" style="build-jaudiotagger.xsl" />
@@ -1206,14 +1206,25 @@
<fileset dir="${red5.server.lib}" includes="jaudiotagger*.jar" />
</delete>
<!-- FIXME need to be removed as soon as red5 1.0.3 will be released -->
+ <copy todir="${red5.lib}/conf" overwrite="true" force="true">
+ <fileset dir="${webcontent.base.dir}/red5" includes="jee-container.xml,red5-core.xml,red5.properties"/>
+ </copy>
<delete>
<fileset dir="${red5.server.lib}" includes="red5-io*.jar" />
</delete>
+ <delete>
+ <fileset dir="${red5.lib}/plugins" includes="tomcatplugin-*.jar" />
+ </delete>
<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
<param name="ivy.conf.name" value="red5-io" />
<param name="ivy.lib.location" value="${red5.server.lib}" />
<param name="ivy.transitive" value="false" />
</antcall>
+ <antcall target="-retrieve" inheritAll="true" inheritRefs="true">
+ <param name="ivy.conf.name" value="red5-tomcat" />
+ <param name="ivy.lib.location" value="${red5.lib}/plugins" />
+ <param name="ivy.transitive" value="false" />
+ </antcall>
<antcall target="-patch-red5-server-start-script"/>
</target>
Modified: openmeetings/branches/3.0.x/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Thu Jun 19 14:29:52 2014
@@ -40,6 +40,7 @@
<conf name="mvn" description="Maven Ant task to build Red5" />
<conf name="red5-client" description="Red5 Client/Server for screensharing" />
<conf name="red5-io" description="Red5 io library" />
+ <conf name="red5-tomcat" description="Red5 tomcat plugin" />
<conf name="jgit" description="JGit Ant task to retirieve Red5" />
</configurations>
<dependencies>
@@ -415,7 +416,12 @@
<dependency org="org.red5" name="red5-io" conf="red5-io->*" rev="1.0.4-SNAPSHOT" transitive="false" >
<include type="jar" />
</dependency>
-
+
+ <!-- red5-tomcat -->
+ <dependency org="org.red5" name="tomcatplugin" conf="red5-tomcat->*" rev="1.7" transitive="false" >
+ <include type="jar" />
+ </dependency>
+
<exclude org="javax.servlet" module="servlet-api" type="*" ext="*" conf="*" matcher="exact"/>
<exclude org="cglib" module="cglib-nodep" type="*" ext="*" conf="*" matcher="exact"/>
<exclude org="pull-parser" module="pull-parser" type="*" ext="*" conf="*" matcher="exact"/>
Modified: openmeetings/branches/3.0.x/ivysettings.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivysettings.xml?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivysettings.xml (original)
+++ openmeetings/branches/3.0.x/ivysettings.xml Thu Jun 19 14:29:52 2014
@@ -31,6 +31,7 @@
<url name="googlecode" m2compatible="true">
<artifact pattern="https://openlaszlo-openmeetings-integration.googlecode.com/svn/repository/[artifact](-[revision]).[ext]" />
<artifact pattern="https://openmeetings.googlecode.com/svn/repository/[artifact](-[revision]).[ext]" />
+ <artifact pattern="https://openmeetings.googlecode.com/svn/repository/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]" />
<artifact pattern="https://red5.googlecode.com/svn/repository/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]" />
</url>
<url name="smslib" m2compatible="true">
Modified: openmeetings/branches/3.0.x/src/main/webapp/public/config.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/public/config.xml?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/public/config.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/public/config.xml Thu Jun 19 14:29:52 2014
@@ -49,7 +49,7 @@ You can find all this configuration in y
-->
<rtmpport>1935</rtmpport>
-<rtmpsslport>443</rtmpsslport>
+<rtmpsslport>8443</rtmpsslport>
<!--
Wether it should try to connect to rtmps first or not
Valid values: yes / no
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml Thu Jun 19 14:29:52 2014
@@ -93,27 +93,26 @@ Enter key password for <red5>
</source>
</li>
- <li>Generate a CSR: keytool -certreq -keyalg RSA -alias red5 -file
- red5.csr -keystore red5/conf/keystore
+ <li>Generate a CSR: <source><![CDATA[keytool -certreq -keyalg RSA -alias red5 -file red5.csr -keystore red5/conf/keystore]]></source>
</li>
<li>Submit CSR to your CA of choice and receive a signed certificate
</li>
<li>Import your chosen CA's root certificate into the keystore (may
need to download it from their site - make sure to get the root CA and
- not the intermediate one): keytool -import -alias root -keystore
- red5/conf/keystore
- -trustcacerts -file root.crt (note: you may receive a warning that
- the certificate already exists in the system wide keystore - import
+ not the intermediate one):
+ <source><![CDATA[keytool -import -alias root -keystore red5/conf/keystore -trustcacerts -file root.crt]]></source>
+ (note: you may receive a warning that the certificate already exists in the system wide keystore - import
anyway)
</li>
<li>Import the intermediate certificate(s) you normally receive with
the certificate:
- keytool -import -alias intermed -keystore red5/conf/keystore -trustcacerts
- -file intermediate.crt
+ <source><![CDATA[keytool -import -alias intermed -keystore red5/conf/keystore -trustcacerts -file intermediate.crt]]></source>
</li>
- <li>Import the certificate you received: keytool -import -alias red5
- -keystore red5/conf/keystore -trustcacerts -file
- demo.openmeetings.de.crt
+ <li>Import the certificate you received:
+ <source><![CDATA[keytool -import -alias red5 -keystore red5/conf/keystore -trustcacerts -file demo.openmeetings.de.crt]]></source>
+ </li>
+ <li>Please NOTE according to this <a href="http://javarevisited.blogspot.com/2012/09/difference-between-truststore-vs-keyStore-Java-SSL.html">http://javarevisited.blogspot.com/2012/09/difference-between-truststore-vs-keyStore-Java-SSL.html</a>
+ guide you can split keystore and truststore
</li>
<li>
Create additional certificate as described above.
@@ -130,24 +129,20 @@ Enter key password for <red5>
Uncomment <tt><!-- RTMPS --></tt> section in <tt>red5/conf/red5-core.xml</tt>
</li>
- <li>
- Edit <tt>red5/conf/red5.properties</tt> and set
- <tt>rtmps.port=5443</tt>
- and
- <tt>rtmps.keystorepass=password</tt>
- (password = password you set on your new
- keystore)
+ <li> Default RTMPS port is 8443, you can change it by editing <tt>red5/conf/red5.properties</tt> and change the port here: <tt>rtmps.port=8443</tt><br/>
+ Please set <tt>rtmps.keystorepass=password</tt> and <tt>rtmps.truststorepass=password</tt>
+ (password = password you set on your new keystore(s))
</li>
<li>
- Edit red5/webapps/openmeetings/public/config.xml and set
- <tt><rtmpsslport>5443</rtmpsslport></tt>
- ,
- <tt><useSSL>yes</useSSL></tt>
- and
+ Edit <tt>red5/webapps/openmeetings/public/config.xml</tt> and set<br/>
+ <tt><rtmpsslport>8443</rtmpsslport></tt>,<br/>
+ <tt><useSSL>yes</useSSL></tt> and<br/>
<tt><proxyType>best</proxyType></tt>
</li>
-
+ <li>Please NOTE https port set in <tt>red5/conf/red5.properties</tt> should be in sync with the one set in
+ <tt>red5/webapps/openmeetings/public/config.xml</tt>
+ </li>
<li>Restart red5 and try to connect - your connection should now be
made via RTMPS (close port 1935 to be sure)
</li>
@@ -171,26 +166,28 @@ Enter key password for <red5>
UNComment <tt>Tomcat with SSL enabled</tt> section
</li>
<li>
- Edit red5/webapps/openmeetings/public/config.xml and set
+ Edit <tt>red5/webapps/openmeetings/public/config.xml</tt> and set
<tt><protocol>https</protocol></tt>
</li>
<li>
- Edit red5/webapps/openmeetings/public/config.xml and set
- <tt>red5httpport</tt> to <tt>https</tt> port
+ Edit <tt>red5/webapps/openmeetings/public/config.xml</tt> and set
+ <tt><red5httpport>5443</red5httpport></tt> port
</li>
- <li>In webapps/openmeetings/WEB-INF/conf/axis2.xml add (below the existing http transportReceiver (around line 225))
+ <li>In <tt>webapps/openmeetings/WEB-INF/conf/axis2.xml</tt> add (below the existing http transportReceiver (around line 225))
<source>
<![CDATA[
<transportReceiver name="https" class="org.apache.axis2.transport.http.AxisServletListener">
- <parameter name="port">443</parameter>
+ <parameter name="port">5443</parameter>
</transportReceiver>
]]>
</source>
</li>
- <li>Edit red5/conf/red5.properties and set <tt>https.port=443</tt> </li>
+ <li>Please NOTE https port set in <tt>red5/conf/red5.properties</tt> should be in sync with the one set
+ in <tt>red5/webapps/openmeetings/public/config.xml</tt> and <tt>webapps/openmeetings/WEB-INF/conf/axis2.xml</tt>
+ </li>
<li>
Restart red5 and try to connect to
- <a href="https://your.server" rel="nofollow">https://your.server</a>
+ <a href="https://your.server:5443" rel="nofollow">https://your.server:5443</a>
- you should be redirected to the OpenMeetings
app and all access should be via HTTPS or RTMPS (close port 5080 to
be sure).
@@ -210,4 +207,3 @@ Enter key password for <red5>
</body>
</document>
-
Modified: openmeetings/trunk/site/RTMPSAndHTTPS.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/RTMPSAndHTTPS.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/RTMPSAndHTTPS.html (original)
+++ openmeetings/trunk/site/RTMPSAndHTTPS.html Thu Jun 19 14:29:52 2014
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -8,7 +8,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="OpenMeetings Team" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project -
Using OpenMeetings with RTMPS and HTTPS</title>
@@ -47,7 +47,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
@@ -830,8 +830,9 @@ Enter key password for <red5>
</li>
-<li>Generate a CSR: keytool -certreq -keyalg RSA -alias red5 -file
- red5.csr -keystore red5/conf/keystore
+<li>Generate a CSR:
+<div class="source">
+<pre>keytool -certreq -keyalg RSA -alias red5 -file red5.csr -keystore red5/conf/keystore</pre></div>
</li>
<li>Submit CSR to your CA of choice and receive a signed certificate
@@ -839,22 +840,29 @@ Enter key password for <red5>
<li>Import your chosen CA's root certificate into the keystore (may
need to download it from their site - make sure to get the root CA and
- not the intermediate one): keytool -import -alias root -keystore
- red5/conf/keystore
- -trustcacerts -file root.crt (note: you may receive a warning that
- the certificate already exists in the system wide keystore - import
+ not the intermediate one):
+
+<div class="source">
+<pre>keytool -import -alias root -keystore red5/conf/keystore -trustcacerts -file root.crt</pre></div>
+ (note: you may receive a warning that the certificate already exists in the system wide keystore - import
anyway)
</li>
<li>Import the intermediate certificate(s) you normally receive with
the certificate:
- keytool -import -alias intermed -keystore red5/conf/keystore -trustcacerts
- -file intermediate.crt
+
+<div class="source">
+<pre>keytool -import -alias intermed -keystore red5/conf/keystore -trustcacerts -file intermediate.crt</pre></div>
+ </li>
+
+<li>Import the certificate you received:
+
+<div class="source">
+<pre>keytool -import -alias red5 -keystore red5/conf/keystore -trustcacerts -file demo.openmeetings.de.crt</pre></div>
</li>
-<li>Import the certificate you received: keytool -import -alias red5
- -keystore red5/conf/keystore -trustcacerts -file
- demo.openmeetings.de.crt
+<li>Please NOTE according to this <a class="externalLink" href="http://javarevisited.blogspot.com/2012/09/difference-between-truststore-vs-keyStore-Java-SSL.html">http://javarevisited.blogspot.com/2012/09/difference-between-truststore-vs-keyStore-Java-SSL.html</a>
+ guide you can split keystore and truststore
</li>
<li>
@@ -877,25 +885,22 @@ Enter key password for <red5>
</li>
-<li>
- Edit <tt>red5/conf/red5.properties</tt> and set
- <tt>rtmps.port=5443</tt>
- and
- <tt>rtmps.keystorepass=password</tt>
- (password = password you set on your new
- keystore)
+<li> Default RTMPS port is 8443, you can change it by editing <tt>red5/conf/red5.properties</tt> and change the port here: <tt>rtmps.port=8443</tt><br />
+ Please set <tt>rtmps.keystorepass=password</tt> and <tt>rtmps.truststorepass=password</tt>
+ (password = password you set on your new keystore(s))
</li>
<li>
- Edit red5/webapps/openmeetings/public/config.xml and set
- <tt><rtmpsslport>5443</rtmpsslport></tt>
- ,
- <tt><useSSL>yes</useSSL></tt>
- and
+ Edit <tt>red5/webapps/openmeetings/public/config.xml</tt> and set<br />
+ <tt><rtmpsslport>8443</rtmpsslport></tt>,<br />
+ <tt><useSSL>yes</useSSL></tt> and<br />
<tt><proxyType>best</proxyType></tt>
</li>
-
+
+<li>Please NOTE https port set in <tt>red5/conf/red5.properties</tt> should be in sync with the one set in
+ <tt>red5/webapps/openmeetings/public/config.xml</tt>
+ </li>
<li>Restart red5 and try to connect - your connection should now be
made via RTMPS (close port 1935 to be sure)
@@ -926,32 +931,34 @@ Enter key password for <red5>
</li>
<li>
- Edit red5/webapps/openmeetings/public/config.xml and set
+ Edit <tt>red5/webapps/openmeetings/public/config.xml</tt> and set
<tt><protocol>https</protocol></tt>
</li>
<li>
- Edit red5/webapps/openmeetings/public/config.xml and set
- <tt>red5httpport</tt> to <tt>https</tt> port
+ Edit <tt>red5/webapps/openmeetings/public/config.xml</tt> and set
+ <tt><red5httpport>5443</red5httpport></tt> port
</li>
-<li>In webapps/openmeetings/WEB-INF/conf/axis2.xml add (below the existing http transportReceiver (around line 225))
+<li>In <tt>webapps/openmeetings/WEB-INF/conf/axis2.xml</tt> add (below the existing http transportReceiver (around line 225))
<div class="source">
<pre>
<transportReceiver name="https" class="org.apache.axis2.transport.http.AxisServletListener">
- <parameter name="port">443</parameter>
+ <parameter name="port">5443</parameter>
</transportReceiver>
</pre></div>
</li>
-<li>Edit red5/conf/red5.properties and set <tt>https.port=443</tt> </li>
+<li>Please NOTE https port set in <tt>red5/conf/red5.properties</tt> should be in sync with the one set
+ in <tt>red5/webapps/openmeetings/public/config.xml</tt> and <tt>webapps/openmeetings/WEB-INF/conf/axis2.xml</tt>
+ </li>
<li>
Restart red5 and try to connect to
- <a class="externalLink" href="https://your.server" rel="nofollow">https://your.server</a>
+ <a class="externalLink" href="https://your.server:5443" rel="nofollow">https://your.server:5443</a>
- you should be redirected to the OpenMeetings
app and all access should be via HTTPS or RTMPS (close port 5080 to
be sure).
Modified: openmeetings/trunk/site/dependencies.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/dependencies.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/dependencies.html (original)
+++ openmeetings/trunk/site/dependencies.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - </title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
Modified: openmeetings/trunk/site/dependency-management.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/dependency-management.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/dependency-management.html (original)
+++ openmeetings/trunk/site/dependency-management.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - Project Dependency Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
Modified: openmeetings/trunk/site/distribution-management.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/distribution-management.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/distribution-management.html (original)
+++ openmeetings/trunk/site/distribution-management.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - Project Distribution Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
Modified: openmeetings/trunk/site/integration.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/integration.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/integration.html (original)
+++ openmeetings/trunk/site/integration.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - Continuous Integration</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
Modified: openmeetings/trunk/site/issue-tracking.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/issue-tracking.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/issue-tracking.html (original)
+++ openmeetings/trunk/site/issue-tracking.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - Issue Tracking</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
Modified: openmeetings/trunk/site/license.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/license.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/license.html (original)
+++ openmeetings/trunk/site/license.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - Project License</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
Modified: openmeetings/trunk/site/mail-lists.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/mail-lists.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/mail-lists.html (original)
+++ openmeetings/trunk/site/mail-lists.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - Project Mailing Lists</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
Modified: openmeetings/trunk/site/plugin-management.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/plugin-management.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/plugin-management.html (original)
+++ openmeetings/trunk/site/plugin-management.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - Project Plugin Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
Modified: openmeetings/trunk/site/plugins.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/plugins.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/plugins.html (original)
+++ openmeetings/trunk/site/plugins.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - Project Build Plugins</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
Modified: openmeetings/trunk/site/project-info.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/project-info.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/project-info.html (original)
+++ openmeetings/trunk/site/project-info.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - Project Information</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
Modified: openmeetings/trunk/site/project-reports.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/project-reports.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/project-reports.html (original)
+++ openmeetings/trunk/site/project-reports.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - Generated Reports</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
Modified: openmeetings/trunk/site/project-summary.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/project-summary.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/project-summary.html (original)
+++ openmeetings/trunk/site/project-summary.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - Project Summary</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
Modified: openmeetings/trunk/site/source-repository.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/source-repository.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/source-repository.html (original)
+++ openmeetings/trunk/site/source-repository.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - Source Repository</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
Modified: openmeetings/trunk/site/surefire-report.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/surefire-report.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/surefire-report.html (original)
+++ openmeetings/trunk/site/surefire-report.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - Surefire Report</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>
Modified: openmeetings/trunk/site/team-list.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/team-list.html?rev=1603891&r1=1603890&r2=1603891&view=diff
==============================================================================
--- openmeetings/trunk/site/team-list.html (original)
+++ openmeetings/trunk/site/team-list.html Thu Jun 19 14:29:52 2014
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-06-18
+ | Generated by Apache Maven Doxia at 2014-06-19
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140618" />
+ <meta name="Date-Revision-yyyymmdd" content="20140619" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project - Team list</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -45,7 +45,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2014-06-18
+ <li id="publishDate">Last Published: 2014-06-19
</li>