Author: solomax
Date: Fri Dec 7 07:42:12 2012
New Revision: 1418204
URL: http://svn.apache.org/viewvc?rev=1418204&view=rev
Log:
OPENMEETINGS-482 is fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/networktesting.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/PortAvailabilityTest.lzx
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/networktesting.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/networktesting.lzx?rev=1418204&r1=1418203&r2=1418204&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/networktesting.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/networktesting.lzx
Fri Dec 7 07:42:12 2012
@@ -18,10 +18,26 @@
under the License.
-->
-<canvas debug="false" width="100%" height="100%" title="NetworkTesting">
+<canvas width="100%" height="100%" title="NetworkTesting">
+ <switch>
+ <when property="$debug">
+ <method name="doDebugInit">
+ canvas.setAttribute('debug', true);
+ </method>
+ <debug fontsize="11"
oninit="Debug.showInternalProperties = true" width="40%" y="50%" x="60%"
height="50%" />
+ </when>
+ <otherwise>
+ <method name="doDebugInit">
+ </method>
+ </otherwise>
+ </switch>
+
<include href="testsView.lzx" />
-
+ <handler name="oninit"><![CDATA[
+ doDebugInit();
+ ]]></handler>
+
<!--
These attributes are rewritten by values from
"networktesting-config.xml"
-->
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/PortAvailabilityTest.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/PortAvailabilityTest.lzx?rev=1418204&r1=1418203&r2=1418204&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/PortAvailabilityTest.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/PortAvailabilityTest.lzx
Fri Dec 7 07:42:12 2012
@@ -48,13 +48,20 @@
<method name="forcedStop">
this.log("stopped");
- // TODO: disconnect @rtmp
+ disconnect();
</method>
+ <method name="disconnect">
+ rtmp._nc.close();
+ rtmp.setAttribute('status', 'disconnected');
+ rtmp.setAttribute('stage', 0);
+ </method>
+
<handler name="onconnect" reference="rtmp">
- if (running) {
- this.log("port is available\n");
- this.setPassed();
+ if (running) {
+ this.log("port is available\n");
+ this.setPassed();
+ disconnect();
}
</handler>
@@ -67,9 +74,12 @@
<handler name="onstatus" args="e" reference="rtmp">
if (running) {
- if ("timed out" == e) {
- this.setFailed();
- }
+ switch(e) {
+ case "timed out":
+ case "connection failed":
+ this.setFailed();
+ break;
+ }
if($debug) Debug.write(testName + ": RTMP connect status - ", e);
}
</handler>
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1418204&r1=1418203&r2=1418204&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Fri Dec 7 07:42:12 2012
@@ -187,7 +187,7 @@
<chmod dir="${dist.webapps.dir}/WEB-INF/lib" perm="755"
includes="**/*.sh" />
</target>
- <target name="dist" description="binary distribution of OpenMeetings"
depends="clean, jar, compile.laszlo.main, compile.laszlo.main.as3, enhance,
-copy-libraries, signWebStartJars" />
+ <target name="dist" description="binary distribution of OpenMeetings"
depends="clean, jar, client.only, enhance, -copy-libraries, signWebStartJars" />
<!-- compiles the sources without openlaszlo client -->
<target name="dist-test" description="binary distribution of
OpenMeetings" depends="clean, -dist-test-no-clean, signWebStartJars" />
@@ -196,7 +196,7 @@
<target name="-dist-test-no-clean" description="binary distribution of
OpenMeetings" depends="jar, -copy-libraries" />
<!-- compiles the sources only with laszlo debug client -->
- <target name="dist-debug" description="binary distribution of
OpenMeetings" depends="clean, jar, compile.laszlo.main.debug,
compile.laszlo.main.debug.as3, -copy-libraries, signWebStartJars" />
+ <target name="dist-debug" description="binary distribution of
OpenMeetings" depends="clean, jar, client.debug.only, -copy-libraries,
signWebStartJars" />
<target name="-cleanup-jrebel" unless="jrebel.enabled">
<delete>
@@ -455,9 +455,9 @@
</signjar>
</target>
- <target name="client.only"
depends="compile.laszlo.main.as3,compile.laszlo.main" />
+ <target name="client.only"
depends="compile.laszlo.main.as3,compile.laszlo.main,compile.laszlo.networktesting"
/>
- <target name="client.debug.only"
depends="compile.laszlo.main.debug.as3,compile.laszlo.main.debug" />
+ <target name="client.debug.only"
depends="compile.laszlo.main.debug.as3,compile.laszlo.main.debug,compile.laszlo.networktesting.debug"
/>
<target name="-compile.flash" description="compile flash application">
<!-- commented for now
@@ -481,10 +481,7 @@
</java>
</target>
- <target name="compile.laszlo.networktesting">
- <copy todir="${dist.webapps.dir}">
- <fileset dir="${webcontent.src.dir}/openmeetings"
includes="*" />
- </copy>
+ <target name="compile.laszlo.networktesting"
depends="compile.laszlo.networktesting.debug">
<antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
<param name="flash.src.dir"
value="${laszlo.as3.src.dir}/networkTesting" />
<param name="flash.runtime" value="swf10" />
@@ -494,6 +491,16 @@
</antcall>
</target>
+ <target name="compile.laszlo.networktesting.debug">
+ <antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
+ <param name="flash.src.dir"
value="${laszlo.as3.src.dir}/networkTesting" />
+ <param name="flash.runtime" value="swf10" />
+ <param name="flash.main.file"
value="networktesting.lzx" />
+ <param name="flash.out.file"
value="networktestingdebug.swf10.swf" />
+ <param name="flash.debug" value="--debug" />
+ </antcall>
+ </target>
+
<target name="compile.laszlo.main.as3"
depends="compile.laszlo.main.debug.as3">
<antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
<param name="flash.src.dir"
value="${laszlo.as3.src.dir}" />
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1418204&r1=1418203&r2=1418204&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Fri Dec 7 07:42:12 2012
@@ -157,7 +157,7 @@ public class ScopeApplicationAdapter ext
boolean isAVClient = false;
if (params.length == 1) {
- isAVClient =
Boolean.parseBoolean(params[0].toString());
+ isAVClient = Boolean.valueOf("" + params[0]);
}
log.debug("### Client connected to OpenMeetings,
register Client StreamId: "
