Author: ggrekhov
Date: Mon Jun 18 18:15:52 2012
New Revision: 1351442
URL: http://svn.apache.org/viewvc?rev=1351442&view=rev
Log:
NetworkTesting: upload speed; 1st gui version; log; exclusive mode
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/UploadSpeedTest.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/failed.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/notrun.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/passed.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/running.gif
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/testingTools/
- copied from r1347613,
incubator/openmeetings/trunk/singlewebapp/WebContent/testingToolsFiles/
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/testingToolsFiles/
Modified:
incubator/openmeetings/trunk/singlewebapp/.classpath
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/networktesting.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/BaseURLLoadTest.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/DownloadSpeedTest.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/JitterTest.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/NetworkTest.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/PingTest.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/PortAvailabilityTest.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/library.lzx
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java
Modified: incubator/openmeetings/trunk/singlewebapp/.classpath
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/.classpath?rev=1351442&r1=1351441&r2=1351442&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/.classpath (original)
+++ incubator/openmeetings/trunk/singlewebapp/.classpath Mon Jun 18 18:15:52
2012
@@ -16,7 +16,7 @@
<classpathentry kind="src" path="WebContent/WEB-INF"/>
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="con"
path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry exported="true" kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
+ <classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
<attributes>
<attribute
name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
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=1351442&r1=1351441&r2=1351442&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/networktesting.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/networktesting.lzx
Mon Jun 18 18:15:52 2012
@@ -22,20 +22,38 @@
<include href="tests/" />
+ <attribute name="busy" type="boolean" value="false"/>
<attribute name="host" type="string" value="localhost" />
<attribute name="rtmpPort" type="number" value="1935" />
<attribute name="httpPort" type="number" value="5080" />
+ <attribute name="offset" type="number" value="20" />
+ <attribute name="log" type="string" value="" />
- <PingTest name="pingTest" host="${parent.host}" port="${parent.httpPort}"
/>
- <PortAvailabilityTest name="portTest" host="${parent.host}"
port="${parent.rtmpPort}" />
- <JitterTest name="jitterTest" host="${parent.host}"
port="${parent.httpPort}" />
- <DownloadSpeedTest name="downloadTest" host="${parent.host}"
port="${parent.httpPort}" />
+ <PingTest
+ name="pingTest" host="${parent.host}" port="${parent.httpPort}"
+ x="${parent.offset}"
+ y="${parent.offset}"
+ />
+ <PortAvailabilityTest
+ name="portTest" host="${parent.host}" port="${parent.rtmpPort}"
+ x="${parent.pingTest.x + parent.pingTest.width + parent.offset}"
+ y="${parent.offset}"
+ />
+ <JitterTest
+ name="jitterTest" host="${parent.host}" port="${parent.httpPort}"
+ x="${parent.portTest.x + parent.portTest.width + parent.offset}"
+ y="${parent.offset}"
+ />
+ <DownloadSpeedTest
+ name="downloadTest" host="${parent.host}" port="${parent.httpPort}"
+ x="${parent.jitterTest.x + parent.jitterTest.width + parent.offset}"
+ y="${parent.offset}"
+ />
- <handler name="oninit">
- canvas.pingTest.start();
- canvas.jitterTest.start();
- canvas.portTest.start();
- canvas.downloadTest.start();
- </handler>
+ <UploadSpeedTest
+ name="uploadTest" host="${parent.host}" port="${parent.httpPort}"
+ x="${parent.downloadTest.x + parent.downloadTest.width +
parent.offset}"
+ y="${parent.offset}"
+ />
</canvas>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/BaseURLLoadTest.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/BaseURLLoadTest.lzx?rev=1351442&r1=1351441&r2=1351442&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/BaseURLLoadTest.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/BaseURLLoadTest.lzx
Mon Jun 18 18:15:52 2012
@@ -43,12 +43,13 @@
<attribute name="finishedTestsCount" type="number" value="0" />
<attribute name="successfulTestsCount" type="number" value="0" />
+ <attribute name="hostUrl" type="string" value="" />
+ <attribute name="loaderInited" type="boolean" value="false" />
<attribute name="request" value="null" />
<attribute name="loader" value="null" />
-
- <method name="start">
- var hostUrl = "http://"; + host + ":" + port +
"/openmeetings/testingToolsFiles/" + loadFileName;
+ <method name="initLoader">
+ hostUrl = "http://"; + host + ":" + port +
"/openmeetings/testingTools/" + loadFileName;
request = new URLRequest(hostUrl);
loader = new URLLoader();
@@ -56,17 +57,29 @@
loader.addEventListener(IOErrorEvent.IO_ERROR, this.onError);
loader.addEventListener(SecurityErrorEvent.SECURITY_ERROR,
this.onError);
+ loaderInited = true;
+ </method>
+
+ <method name="start">
+ if (!loaderInited) {
+ this.initLoader();
+ }
finishedTestsCount = 0;
successfulTestsCount = 0;
wholeTime = 0;
maxTime = 0;
minTime = 999999;
- if($debug) Debug.write(testName +": start test... ", hostUrl);
+ this.log("start test... " + hostUrl);
startTime = getTimer();
loader.load(request);
</method>
+ <method name="forcedStop">
+ loader.close();
+ this.log("stopped");
+ </method>
+
<method name="onComplete" args="e">
<![CDATA[
var endTime = getTimer();
@@ -80,12 +93,12 @@
}
if (verbose) {
- if($debug) Debug.write(testName +": load time = ", pingTime, "
ms");
+ this.log("load time = " + pingTime + " ms");
}
finishedTestsCount++;
successfulTestsCount++;
- if (finishedTestsCount < testsCount) {
+ if (finishedTestsCount < testsCount && running) {
startTime = getTimer();
loader.load(request);
} else {
@@ -97,11 +110,11 @@
<method name="onError" args="e">
<![CDATA[
if (verbose) {
- if($debug) Debug.write(testName + ": Error - ", e);
+ this.log("Error - " + e);
}
finishedTestsCount++;
- if (finishedTestsCount < testsCount) {
+ if (finishedTestsCount < testsCount && running) {
startTime = getTimer();
loader.load(request);
} else {
@@ -111,14 +124,16 @@
</method>
<method name="report">
- var report = testName + " report:";
+ var report = "report:";
if (successfulTestsCount > 0) {
+ this.setPassed();
report += "\n" + this.generateReport();
} else {
+ this.setFailed();
report += " connection error";
}
- if($debug) Debug.write(report);
+ this.log(report);
</method>
<method name="generateReport" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/DownloadSpeedTest.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/DownloadSpeedTest.lzx?rev=1351442&r1=1351441&r2=1351442&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/DownloadSpeedTest.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/DownloadSpeedTest.lzx
Mon Jun 18 18:15:52 2012
@@ -24,7 +24,7 @@
<handler name="oninit">
this.setAttribute("testsCount", 1);
- this.setAttribute("testName", "Download speed test");
+ this.setAttribute("testName", "Download speed");
this.setAttribute("loadFileName", "downloadTest");
this.setAttribute("verbose", false);
</handler>
@@ -34,7 +34,7 @@
var timeSec = wholeTime/1000;
var speed = mBytes/timeSec;
- var report = "Bytes loaded: " + mBytes + " Mb\n";
+ var report = "Bytes downloaded: " + mBytes + " Mb\n";
report += "Download time: " + timeSec + " s\n";
report += "Download speed: " + speed + " Mb/s\n";
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/JitterTest.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/JitterTest.lzx?rev=1351442&r1=1351441&r2=1351442&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/JitterTest.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/JitterTest.lzx
Mon Jun 18 18:15:52 2012
@@ -24,7 +24,7 @@
<handler name="oninit">
this.setAttribute("testsCount", 100);
- this.setAttribute("testName", "Jitter test");
+ this.setAttribute("testName", "Jitter");
this.setAttribute("loadFileName", "jitterTest");
this.setAttribute("verbose", false);
</handler>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/NetworkTest.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/NetworkTest.lzx?rev=1351442&r1=1351441&r2=1351442&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/NetworkTest.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/NetworkTest.lzx
Mon Jun 18 18:15:52 2012
@@ -25,8 +25,66 @@
<attribute name="testName" type="string" value="null" />
<attribute name="host" type="string" value="null" />
<attribute name="port" type="number" value="null" />
+ <attribute name="running" type="boolean" value="false" />
<method name="start" />
+ <method name="forcedStop" />
+
+ <view name="picture" width="113" height="113">
+ <image name="rsc" resource="notrun"/>
+ </view>
+ <text name="nameLabel"
+ text="${parent.testName}"
+ x="${(parent.picture.width - this.width)/2}"
+ y="$once{parent.picture.height}"
+ />
+
+ <handler name="onclick">
+ if (running) {
+ this.setStopped();
+ } else {
+ this.setRunning();
+ }
+ </handler>
+
+ <method name="setPassed">
+ if (running) {
+ running=false;
+ picture.rsc.setAttribute("resource", "passed");
+ canvas.setAttribute("busy", false);
+ }
+ </method>
+
+ <method name="setFailed">
+ if (running) {
+ running=false;
+ picture.rsc.setAttribute("resource", "failed");
+ canvas.setAttribute("busy", false);
+ }
+ </method>
+
+ <method name="setRunning">
+ if (canvas.busy) {
+ return;
+ }
+ canvas.setAttribute("busy", true);
+ this.start();
+ running=true;
+ picture.rsc.setAttribute("resource", "running");
+ </method>
+
+ <method name="setStopped">
+ this.forcedStop();
+ running=false;
+ picture.rsc.setAttribute("resource", "notrun");
+ canvas.setAttribute("busy", false);
+ </method>
+
+ <method name="log" args="message">
+ var str = testName + ": " + message + "\n";
+ canvas.log += str;
+ if ($debug) Debug.write(str);
+ </method>
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/PingTest.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/PingTest.lzx?rev=1351442&r1=1351441&r2=1351442&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/PingTest.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/PingTest.lzx
Mon Jun 18 18:15:52 2012
@@ -24,7 +24,7 @@
<handler name="oninit">
this.setAttribute("testsCount", 10);
- this.setAttribute("testName", "Ping test");
+ this.setAttribute("testName", "Ping");
this.setAttribute("loadFileName", "pingTest");
</handler>
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=1351442&r1=1351441&r2=1351442&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/PortAvailabilityTest.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/PortAvailabilityTest.lzx
Mon Jun 18 18:15:52 2012
@@ -32,29 +32,45 @@
</when>
</switch>
- <rtmpconnection name="rtmp" autoconnect="false" />
+ <rtmpconnection name="rtmp" autoconnect="false" debug="true" />
<handler name="oninit">
- this.setAttribute("testName", "Port test");
+ this.setAttribute("testName", "Port");
</handler>
<method name="start">
+ rtmp.init();
rtmp.setAttribute("src",
"rtmp://"+host+":"+port+"/openmeetings/hibernate");
- if($debug) Debug.write(testName + ": start test... ", rtmp.src);
+ this.log(": start test... " + rtmp.src);
rtmp.connect();
</method>
+ <method name="forcedStop">
+ this.log("stopped");
+ </method>
+
<handler name="onconnect" reference="rtmp">
- if($debug) Debug.write(testName + ": port is available");
+ if (running) {
+ this.setPassed();
+ this.log("port is available");
+ }
</handler>
<handler name="onerror" args="e" reference="rtmp">
- if($debug) Debug.write(testName + ": connection error - ", e);
+ if (running) {
+ this.setFailed();
+ this.log("connection error - " + e);
+ }
</handler>
<handler name="onstatus" args="e" reference="rtmp">
- if($debug) Debug.write(testName + ": RTMP connect status - ", e);
+ if (running) {
+ if ("timed out" == e) {
+ this.setFailed();
+ }
+ if($debug) Debug.write(testName + ": RTMP connect status - ", e);
+ }
</handler>
</class>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/UploadSpeedTest.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/UploadSpeedTest.lzx?rev=1351442&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/UploadSpeedTest.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/UploadSpeedTest.lzx
Mon Jun 18 18:15:52 2012
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+
+-->
+<library>
+
+<class name="UploadSpeedTest" extends="NetworkTest">
+
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.events.*;
+ import flash.net.*;
+ import flash.utils.*;
+ </passthrough>
+ </when>
+ </switch>
+
+ <attribute name="startTime" type="number" value="0" />
+
+ <attribute name="hostUrl" type="string" value="" />
+ <attribute name="loaderInited" type="boolean" value="false" />
+ <attribute name="request" value="null" />
+ <attribute name="loader" value="null" />
+
+ <handler name="oninit">
+ this.setAttribute("testName", "Upload speed");
+ </handler>
+
+ <method name="initLoader">
+ hostUrl = "http://"; + host + ":" + port +
"/openmeetings/networktest.upload";
+ request = new URLRequest(hostUrl);
+ request.method = URLRequestMethod.POST;
+ request.data = getDataString();
+
+ loader = new URLLoader();
+ loader.addEventListener(Event.COMPLETE, this.onComplete);
+ loader.addEventListener(IOErrorEvent.IO_ERROR, this.onError);
+ loader.addEventListener(SecurityErrorEvent.SECURITY_ERROR,
this.onError);
+
+ loaderInited = true;
+ </method>
+
+ <method name="start">
+ if (!loaderInited) {
+ this.initLoader();
+ }
+
+ this.log("start test... " + hostUrl);
+ startTime = getTimer();
+ loader.load(request);
+ </method>
+
+ <method name="forcedStop">
+ loader.close();
+ this.log("stopped");
+ </method>
+
+ <method name="onComplete" args="e">
+ if (running) {
+ var endTime = getTimer();
+ var loadTime = endTime - startTime;
+ var loadTimeSec = loadTime/1000;
+ var mBytes = request.data.length/(1024*1024);
+ var speed = mBytes / loadTimeSec;
+
+ var report = "report:\n";
+ report += "Bytes uploaded: " + mBytes + " Mb\n";
+ report += "Upload time: " + loadTimeSec + " s\n";
+ report += "Upload speed: " + speed + " Mb/s\n";
+
+ this.log(report);
+ this.setPassed();
+ }
+ </method>
+
+ <method name="onError" args="e">
+ if (running) {
+ this.setFailed();
+ this.log("error - " + e);
+ }
+ </method>
+
+ <!-- returns a 1 Mb string-->
+ <method name="getDataString">
+ <![CDATA[
+ var result = "";
+ var str64 =
"0000000000000000000000000000000000000000000000000000000000000000";
+ for (var i=0; i<16384; i++) {
+ result += str64;
+ }
+ return result;
+ ]]>
+ </method>
+
+</class>
+
+</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/library.lzx?rev=1351442&r1=1351441&r2=1351442&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/library.lzx
Mon Jun 18 18:15:52 2012
@@ -20,11 +20,17 @@
-->
<library>
+ <resource name="failed" src="resources/failed.png" />
+ <resource name="notrun" src="resources/notrun.png" />
+ <resource name="passed" src="resources/passed.png" />
+ <resource name="running" src="resources/running.gif" />
+
<include href="BaseURLLoadTest.lzx" />
<include href="DownloadSpeedTest.lzx" />
<include href="JitterTest.lzx" />
<include href="NetworkTest.lzx" />
<include href="PingTest.lzx" />
<include href="PortAvailabilityTest.lzx" />
+ <include href="UploadSpeedTest.lzx" />
</library>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/failed.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/failed.png?rev=1351442&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/failed.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/notrun.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/notrun.png?rev=1351442&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/notrun.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/passed.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/passed.png?rev=1351442&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/passed.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/running.gif
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/running.gif?rev=1351442&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/resources/running.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1351442&r1=1351441&r2=1351442&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Mon Jun 18 18:15:52 2012
@@ -424,8 +424,8 @@
</target>
<target name="compile.laszlo.networktesting">
- <copy todir="${dist.webapps.dir}/testingToolsFiles">
- <fileset dir="${webcontent.src.dir}/testingToolsFiles"
includes="*" />
+ <copy todir="${dist.webapps.dir}/testingTools">
+ <fileset dir="${webcontent.src.dir}/testingTools"
includes="*" />
</copy>
<java classname="org.openlaszlo.compiler.Main" fork="true"
newenvironment="true" failonerror="true"
dir="${laszlo.as3.src.dir}/networkTesting" classpathref="laszlo.lib">
<jvmarg value="-DLPS_HOME=${laszlo.home}" />
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java?rev=1351442&r1=1351441&r2=1351442&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java
Mon Jun 18 18:15:52 2012
@@ -19,8 +19,11 @@
package org.openmeetings.servlet.outputhandler;
import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -30,8 +33,8 @@ import java.io.IOException;
@Controller
public class NetworkTestingController {
- @RequestMapping(value = "/NetworkTesting", method = RequestMethod.POST)
- public void service(HttpServletRequest request, HttpServletResponse
httpServletResponse)
+ @RequestMapping(value = "/networktest.upload", method = RequestMethod.POST)
+ public void service(HttpServletRequest request, HttpServletResponse
httpServletResponse, HttpSession session)
throws ServletException, IOException {
}
