Author: sebawagner
Date: Tue Dec 11 23:38:53 2012
New Revision: 1420485
URL: http://svn.apache.org/viewvc?rev=1420485&view=rev
Log:
OPENMEETINGS-460 Prepare separation of HTTP and RTMP traffic: Add new
configuration value, half-finished committed, to produce a sample show case.
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1420485&r1=1420484&r2=1420485&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
Tue Dec 11 23:38:53 2012
@@ -22,13 +22,25 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="config.xsd">
-<!-- URL/IP to use for the Server
- if this value is empty it will try to connect to the
- domain-name the OpenMeetings-Client has been loading from
+<!-- URL/IP to use for the Server for RTMP and RTMPT traffic.
+ If this value is empty it will try to connect to the
+ domain-name the OpenMeetings-Client has been loading from
+
+ Can be either and IP or a domain name.
+ For example:
+ <rtmphostlocal>192.168.254.182</rtmphostlocal>
+ or
+ <rtmphostlocal>mysubdomain.streaming.to</rtmphostlocal>
-->
-<!--<rtmphostlocal>192.168.254.182</rtmphostlocal>-->
<rtmphostlocal></rtmphostlocal>
+<!-- URL/IP to use for the Server for HTTP and HTTPS traffic.
+ If this value is empty it will use the rtmphostlocal
+ variable (and in that way try to connect to the
+ domain-name the OpenMeetings-Client has been loading from)
+ -->
+<httphostlocal></httphostlocal>
+
<!--
Port to use for the Server
To this port the default server lookup is done
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd?rev=1420485&r1=1420484&r2=1420485&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd
Tue Dec 11 23:38:53 2012
@@ -23,6 +23,7 @@
<xs:complexType>
<xs:sequence>
<xs:element ref="rtmphostlocal"/>
+ <xs:element ref="httphostlocal"/>
<xs:element ref="rtmpport"/>
<xs:element ref="rtmpTunnelport"/>
<xs:element ref="rtmpsslport"/>
@@ -73,6 +74,30 @@
</xs:complexType>
</xs:element>
<xs:element name="rtmphostlocal">
+ <xs:annotation>
+ <xs:documentation>
+ URL/IP to use for the Server for RTMP and RTMPT traffic.
+ If this value is empty it will try to connect to the
+ domain-name the OpenMeetings-Client has been loading from
+
+ Can be either and IP or a domain name.
+ For example:
+ 192.168.254.182
+ or
+ mysubdomain.streaming.to
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType/>
+ </xs:element>
+ <xs:element name="httphostlocal">
+ <xs:annotation>
+ <xs:documentation>
+ URL/IP to use for the Server for HTTP and HTTPS traffic.
+ If this value is empty it will use the rtmphostlocal
+ variable (and in that way try to connect to the
+ domain-name the OpenMeetings-Client has been loading from)
+ </xs:documentation>
+ </xs:annotation>
<xs:complexType/>
</xs:element>
<xs:element name="rtmpport" type="xs:integer"/>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1420485&r1=1420484&r2=1420485&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
Tue Dec 11 23:38:53 2012
@@ -49,6 +49,14 @@ these properties will be overwritten by
domain-name it has been loading from
-->
<attribute name="rtmphostlocal" value="" type="string" />
+
+<!--
+ URL/IP to use for the Server for HTTP and HTTPS traffic.
+ If this value is empty it will use the rtmphostlocal
+ variable (and in that way try to connect to the
+ domain-name the OpenMeetings-Client has been loading from)
+ -->
+<attribute name="httphostlocal" value="" type="string" />
<!---
Port to use for the Server
