Author: solomax
Date: Fri Apr 27 08:03:05 2012
New Revision: 1331285
URL: http://svn.apache.org/viewvc?rev=1331285&view=rev
Log:
The method for Hib URL constructing is created
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.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=1331285&r1=1331284&r2=1331285&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
Fri Apr 27 08:03:05 2012
@@ -56,7 +56,7 @@ The support for Windows is experimental
<!--
Port to use for the Server
-This port is used to connec to the http-servlet
+This port is used to connect to the http-servlet
of the red5-servlet
-->
<red5httpport>5080</red5httpport>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1331285&r1=1331284&r2=1331285&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Fri Apr 27 08:03:05 2012
@@ -46,7 +46,7 @@
</class>
<class name="hibRtmpConnection" extends="rtmpConnection" debug="false"
- src="$once{
this.protocollName+'://'+canvas.rtmphostlocal+':'+this.protocollPort+'/'+canvas.webAppRootKey+'/'+this.userScope
}" >
+ src="$once{ this.getUrl() }" >
<attribute name="protocollName" type="string" value="rtmp" />
<attribute name="protocollPort" type="string" value="$once{
canvas.rtmpport }" />
@@ -105,7 +105,10 @@
<attribute name="showKickMessage" value="false" type="boolean"/>
<attribute name="showFullMessage" value="false" type="boolean"/>
-
+ <method name="getUrl">
+ return
this.protocollName+'://'+canvas.rtmphostlocal+':'+this.protocollPort+'/'+canvas.webAppRootKey+'/'+this.userScope;
+ </method>
+
<!--
The onconnect Method is triggered several times:
- When you enter a room the NetConnection will close and
reconnect to the Scope of the Room
@@ -169,7 +172,7 @@
} else {
this.setAttribute('protocollName','rtmpt');
this.setAttribute('protocollPort',canvas.rtmpTunnelport);
- var src =
this.protocollName+'://'+canvas.rtmphostlocal+':'+this.protocollPort+'/'+canvas.webAppRootKey+'/'+this.userScope;
+ var src = getUrl();
this.setAttribute('src',src);
//Debug.write("new src ",this.src);
if (this.counterror<3){
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1331285&r1=1331284&r2=1331285&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
Fri Apr 27 08:03:05 2012
@@ -362,7 +362,7 @@
this.setBaseColors();
//Debug.write("rtmphostlocal,rtmphost:
",canvas.rtmphostlocal,canvas.rtmphost);
- var src =
hib.protocollName+'://'+canvas.rtmphostlocal+':'+hib.protocollPort+'/'+canvas.webAppRootKey+'/'+hib.userScope;
+ var src = hib.getUrl();
canvas.thishib.setAttribute('src',src);
canvas.thishib.loaderVar = new lz.autoLoader(canvas);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1331285&r1=1331284&r2=1331285&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
Fri Apr 27 08:03:05 2012
@@ -119,7 +119,7 @@
// Reconnect User to default Scope
canvas.thishib.userScope = "hibernate";
- var src =
hib.protocollName+'://'+canvas.rtmphostlocal+':'+hib.protocollPort+'/'+canvas.webAppRootKey+'/'+hib.userScope;
+ var src = hib.getUrl();
canvas.thishib.setAttribute('src',src);
canvas.thishib.disconnect();
canvas._mainbgcontentNavi.setAttribute('height',canvas.naviHeight);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx?rev=1331285&r1=1331284&r2=1331285&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
Fri Apr 27 08:03:05 2012
@@ -110,7 +110,7 @@
// Reconnect User to default Scope
canvas.thishib.userScope = "hibernate";
- var src =
hib.protocollName+'://'+canvas.rtmphostlocal+':'+hib.protocollPort+'/'+canvas.webAppRootKey+'/'+hib.userScope;
+ var src = hib.getUrl();
canvas.thishib.setAttribute('src',src);
canvas.thishib.disconnect();
canvas._mainbgcontentNavi.setAttribute('height',canvas.naviHeight);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1331285&r1=1331284&r2=1331285&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Fri Apr 27 08:03:05 2012
@@ -112,7 +112,7 @@
// Reconnect User to default Scope
canvas.thishib.userScope = "hibernate";
- var src =
hib.protocollName+'://'+canvas.rtmphostlocal+':'+hib.protocollPort+'/'+canvas.webAppRootKey+'/'+hib.userScope;
+ var src = hib.getUrl();
canvas.thishib.setAttribute('src',src);
canvas.thishib.disconnect();
canvas._mainbgcontentNavi.setAttribute('height',canvas.naviHeight);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx?rev=1331285&r1=1331284&r2=1331285&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
Fri Apr 27 08:03:05 2012
@@ -41,7 +41,7 @@
// Reconnect User to its Room Id
canvas.thishib.userScope = canvas.thishib.currentroomid;
- var src =
hib.protocollName+'://'+canvas.rtmphostlocal+':'+hib.protocollPort+'/'+canvas.webAppRootKey+'/'+hib.userScope;
+ var src = hib.getUrl();
if( $debug ) Debug.write("videoContainer: canvas.thishib:
",canvas.thishib.src,canvas.thishib);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx?rev=1331285&r1=1331284&r2=1331285&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
Fri Apr 27 08:03:05 2012
@@ -35,7 +35,7 @@
// Reconnect User to its Room Id
canvas.thishib.userScope = canvas.thishib.currentroomid;
- var src =
hib.protocollName+'://'+canvas.rtmphostlocal+':'+hib.protocollPort+'/'+canvas.webAppRootKey+'/'+hib.userScope;
+ var src = hib.getUrl();
if( $debug ) Debug.write("videoContainer: canvas.thishib:
",canvas.thishib.src,canvas.thishib);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx?rev=1331285&r1=1331284&r2=1331285&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
Fri Apr 27 08:03:05 2012
@@ -51,7 +51,7 @@
// Reconnect User to its Room Id
canvas.thishib.userScope = canvas.thishib.currentroomid;
- var src =
hib.protocollName+'://'+canvas.rtmphostlocal+':'+hib.protocollPort+'/'+canvas.webAppRootKey+'/'+hib.userScope;
+ var src = hib.getUrl();
if( $debug ) Debug.write("videoContainer: canvas.thishib:
",canvas.thishib.src,canvas.thishib);
