Author: solomax
Date: Thu Jul 4 07:08:40 2013
New Revision: 1499667
URL: http://svn.apache.org/r1499667
Log:
[OPENMEETINGS-693] redundant RTMPT dedicated server is removed in favor of
RTMPT servlet
Removed:
openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml
openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/docs/PortSettings.html
openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html
openmeetings/trunk/singlewebapp/xdocs/PortSettings.xml
openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml?rev=1499667&r1=1499666&r2=1499667&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml
Thu Jul 4 07:08:40 2013
@@ -49,13 +49,6 @@ You can find all this configuration in y
-->
<rtmpport>1935</rtmpport>
-<!--
-Port to use for the Server
-To this port the fallback is done once the default rtmport failed
-this should workaround 99% of all firewalls
- -->
-<rtmpTunnelport>8088</rtmpTunnelport>
-
<rtmpsslport>443</rtmpsslport>
<!--
Wether it should try to connect to rtmps first or not
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd?rev=1499667&r1=1499666&r2=1499667&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd
Thu Jul 4 07:08:40 2013
@@ -25,7 +25,6 @@
<xs:element ref="rtmphostlocal"/>
<xs:element ref="httphostlocal"/>
<xs:element ref="rtmpport"/>
- <xs:element ref="rtmpTunnelport"/>
<xs:element ref="rtmpsslport"/>
<xs:element ref="useSSL"/>
<xs:element ref="red5httpport"/>
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1499667&r1=1499666&r2=1499667&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Thu Jul 4 07:08:40 2013
@@ -127,9 +127,9 @@
}
if (this.useRTMPT) {
if (canvas.isSlaveHosted) {
- return canvas.slaveRtmpTunnelport;
+ return canvas.red5httpport; //TODO probably slave
equivalent need to be added (or maybe this is not used)
}
- return canvas.rtmpTunnelport;
+ return canvas.red5httpport;
}
if (canvas.isSlaveHosted) {
return canvas.slaveRtmpport;
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1499667&r1=1499666&r2=1499667&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx Thu
Jul 4 07:08:40 2013
@@ -68,13 +68,6 @@ these properties will be overwritten by
<!---
Port to use for the Server
- To this port the fallback is done once the default rtmport failed
- this should workaround 99% of all firewalls
- -->
-<attribute name="rtmpTunnelport" value="8088" type="string" />
-
-<!---
- Port to use for the Server
This port is used to connect to the HTTP-Servlet
of the Red5-Servlet
-->
@@ -114,8 +107,6 @@ Attributes needed for clustering -->
<attribute name="slaveRtmphostlocal" value="" type="string" />
<!-- rtmpport from slave's public/config.xml -->
<attribute name="slaveRtmpport" value="5080" type="string" />
-<!-- rtmpTunnelport from slave's public/config.xml -->
-<attribute name="slaveRtmpTunnelport" value="8088" type="string" />
<!-- rtmpsslport from slave's public/config.xml -->
<attribute name="slaveRtmpsslport" value="443" type="string" />
<!-- from slave's public/config.xml -->
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1499667&r1=1499666&r2=1499667&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Thu Jul
4 07:08:40 2013
@@ -212,7 +212,6 @@
//Set Config-values by public/config.xml, see comments on
public/config.xml
this.setAttribute('rtmphostlocal',canvas.myConfigSet.getPointer().xpathQuery('config/rtmphostlocal/text()'));
this.setAttribute('rtmpport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpport/text()')));
-
this.setAttribute('rtmpTunnelport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpTunnelport/text()')));
this.setAttribute('rtmpsslport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpsslport/text()')));
var userSSLString =
canvas.myConfigSet.getPointer().xpathQuery('config/useSSL/text()');
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx?rev=1499667&r1=1499666&r2=1499667&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
Thu Jul 4 07:08:40 2013
@@ -99,11 +99,10 @@ RTMP-host, RTMP/RTMPT-port for the sessi
<method name="parseResultsToSlaveClusterConfig">
canvas.slaveRtmpport =
Number(this.myConfigSet.getPointer().xpathQuery('config/rtmpport/text()'));
- canvas.slaveRtmpTunnelport =
Number(this.myConfigSet.getPointer().xpathQuery('config/rtmpTunnelport/text()'));
canvas.slaveRtmpsslport =
Number(this.myConfigSet.getPointer().xpathQuery('config/rtmpsslport/text()'));
canvas.slaveWebAppRootKey =
this.myConfigSet.getPointer().xpathQuery('config/webAppRootKey/text()');
- if ($debug) Debug.write("parseResults:
",canvas.slaveRtmphostlocal,canvas.slaveRtmpport,canvas.slaveRtmpTunnelport,canvas.slaveRtmpsslport,canvas.slaveWebAppRootKey);
+ if ($debug) Debug.write("parseResults:
",canvas.slaveRtmphostlocal,canvas.slaveRtmpport,canvas.slaveRtmpsslport,canvas.slaveWebAppRootKey);
//Hosted on slave
canvas.isSlaveHosted = true;
Modified: openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1499667&r1=1499666&r2=1499667&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Thu Jul 4 07:08:40 2013
@@ -964,14 +964,11 @@
<include name="**/*"/>
</fileset>
</move>
-
- <delete file="${red5.lib}/lib/servlet-api-2.5.jar" />
+
+ <delete file="${red5.lib}/lib/servlet-api-2.5.jar" />
<delete dir="${red5.lib}/webapps/installer" />
<delete dir="${red5.lib}/webapps/live" />
<delete dir="${red5.lib}/webapps/vod" />
- <copy todir="${red5.lib}/conf" overwrite="true" force="true">
- <fileset dir="${webcontent.src.dir}/red5"
includes="jee-container*.xml" />
- </copy>
<copy file="${webcontent.src.dir}/red5/index.html"
todir="${red5.lib}/webapps/root" overwrite="true" force="true" />
<copy todir="${red5.lib}" overwrite="true" force="true">
<fileset dir="${webcontent.src.dir}/red5"
includes="admin.*,network_test.sh" />
Modified: openmeetings/trunk/singlewebapp/docs/PortSettings.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/PortSettings.html?rev=1499667&r1=1499666&r2=1499667&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/PortSettings.html (original)
+++ openmeetings/trunk/singlewebapp/docs/PortSettings.html Thu Jul 4 07:08:40
2013
@@ -728,20 +728,6 @@ limitations under the License.
rtmpport
</td>
</tr>
- <tr>
- <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
- RTMPT
- </td>
- <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
- 8088
- </td>
- <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
- rtmpt.host
- </td>
- <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
- rtmpTunnelport
- </td>
- </tr>
</table>
</blockquote>
</td></tr>
Modified: openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html?rev=1499667&r1=1499666&r2=1499667&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html (original)
+++ openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html Thu Jul 4 07:08:40
2013
@@ -818,7 +818,6 @@ limitations under the License.
<li>
Edit
<tt>red5/conf/jee-container.xml</tt> file:<br />
Comment <tt>Tomcat without SSL
enabled</tt> section<br />
- Comment <tt>RTMPT (dedicated
server)</tt> section<br />
UNComment <tt>Tomcat with SSL
enabled</tt> section
</li>
<li>
Modified: openmeetings/trunk/singlewebapp/xdocs/PortSettings.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/PortSettings.xml?rev=1499667&r1=1499666&r2=1499667&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/PortSettings.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/PortSettings.xml Thu Jul 4 07:08:40
2013
@@ -73,12 +73,6 @@
<td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> rtmp.port </td>
<td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> rtmpport </td>
</tr>
- <tr>
- <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> RTMPT </td>
- <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> 8088 </td>
- <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> rtmpt.host </td>
- <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> rtmpTunnelport </td>
- </tr>
</table>
</section>
Modified: openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml?rev=1499667&r1=1499666&r2=1499667&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml Thu Jul 4 07:08:40
2013
@@ -165,7 +165,6 @@
<li>
Edit
<tt>red5/conf/jee-container.xml</tt> file:<br/>
Comment <tt>Tomcat without SSL
enabled</tt> section<br/>
- Comment <tt>RTMPT (dedicated
server)</tt> section<br/>
UNComment <tt>Tomcat with SSL
enabled</tt> section
</li>
<li>
