Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Tue Aug 23 09:18:53 2016 @@ -1888,4 +1888,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml Tue Aug 23 09:18:53 2016 @@ -1922,4 +1922,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Tue Aug 23 09:18:53 2016 @@ -1910,4 +1910,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml Tue Aug 23 09:18:53 2016 @@ -1922,4 +1922,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml Tue Aug 23 09:18:53 2016 @@ -1922,4 +1922,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml Tue Aug 23 09:18:53 2016 @@ -1922,4 +1922,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml Tue Aug 23 09:18:53 2016 @@ -1924,4 +1924,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml Tue Aug 23 09:18:53 2016 @@ -1922,4 +1922,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml Tue Aug 23 09:18:53 2016 @@ -1922,4 +1922,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml Tue Aug 23 09:18:53 2016 @@ -1922,4 +1922,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Tue Aug 23 09:18:53 2016 @@ -1922,4 +1922,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Tue Aug 23 09:18:53 2016 @@ -1928,4 +1928,33 @@ <entry key="appointment.tab.advanced">ÐополниÑелÑнÑе</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Tue Aug 23 09:18:53 2016 @@ -1922,4 +1922,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Tue Aug 23 09:18:53 2016 @@ -1922,4 +1922,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Tue Aug 23 09:18:53 2016 @@ -1922,4 +1922,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Tue Aug 23 09:18:53 2016 @@ -1922,4 +1922,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Tue Aug 23 09:18:53 2016 @@ -1922,4 +1922,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Tue Aug 23 09:18:53 2016 @@ -1892,4 +1892,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Tue Aug 23 09:18:53 2016 @@ -1922,4 +1922,33 @@ <entry key="appointment.tab.advanced">Advanced</entry> <entry key="button.label.share">Share</entry> <entry key="invalid.hash">Invalid hash</entry> + <entry key="network.test.ms">ms</entry> + <entry key="network.test.mb">Mb</entry> + <entry key="network.test.sec">sec</entry> + <entry key="network.test.click.play">Click a play button to run a test</entry> + <entry key="network.test.copy.log">Copy the log to the clipboard</entry> + <entry key="network.test.report">report</entry> + <entry key="network.test.report.start">start test...</entry> + <entry key="network.test.report.error">Error</entry> + <entry key="network.test.report.con.err">connection error</entry> + <entry key="network.test.ping">Ping</entry> + <entry key="network.test.ping.avg">Average ping time</entry> + <entry key="network.test.ping.rcv">Packets received</entry> + <entry key="network.test.ping.lost">Packets lost</entry> + <entry key="network.test.ping.load">load time</entry> + <entry key="network.test.port">Port</entry> + <entry key="network.test.port.avail">port is available</entry> + <entry key="network.test.port.stopped">stopped</entry> + <entry key="network.test.jitter">Jitter</entry> + <entry key="network.test.jitter.avg">Average time</entry> + <entry key="network.test.jitter.min">Min time</entry> + <entry key="network.test.jitter.max">Max time</entry> + <entry key="network.test.dwn">Download speed</entry> + <entry key="network.test.dwn.bytes">Bytes downloaded</entry> + <entry key="network.test.dwn.time">Download time</entry> + <entry key="network.test.dwn.speed">Download speed</entry> + <entry key="network.test.upl">Upload speed</entry> + <entry key="network.test.upl.bytes">Bytes uploaded</entry> + <entry key="network.test.upl.time">Upload time</entry> + <entry key="network.test.upl.speed">Upload speed</entry> </properties> Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java Tue Aug 23 09:18:53 2016 @@ -242,16 +242,37 @@ public class SwfPanel extends BasePanel public String getInitFunction(PageParameters pp) { String initStr = null; - String swf = getFlashFile(pp); + StringValue type = pp.get(SWF); + String swf = getFlashFile(type); if (!Strings.isEmpty(swf)) { - initStr = String.format("var labels = %s; initSwf(%s);", getStringLabels(448, 449, 450, 451, 758, 447, 52, 53, 1429, 1430, 775, 452, 767, 764, 765, 918, 54, 761, 762, 144) + String lbls = null; + if (SWF_TYPE_NETWORK.equals(type.toString())) { + lbls = getStringLabels( + "network.test.ms", "network.test.mb", "network.test.sec" + , "network.test.click.play", "network.test.copy.log" + , "network.test.report", "network.test.report.start", "network.test.report.error" + , "network.test.report.con.err" + , "network.test.ping", "network.test.ping.avg", "network.test.ping.rcv" + , "network.test.ping.lost", "network.test.ping.load" + , "network.test.port", "network.test.port.avail", "network.test.port.stopped" + , "network.test.jitter", "network.test.jitter.avg", "network.test.jitter.min" + , "network.test.jitter.max" + , "network.test.dwn", "network.test.dwn.bytes", "network.test.dwn.time" + , "network.test.dwn.speed" + , "network.test.upl", "network.test.upl.bytes", "network.test.upl.time" + , "network.test.upl.speed" + ); + } else if (SWF_TYPE_SETTINGS.equals(type.toString())) { + lbls = getStringLabels("448", "449", "450", "451", "758", "447", "52", "53", "1429", "1430" + , "775", "452", "767", "764", "765", "918", "54", "761", "762", "144"); + } + initStr = String.format("var labels = %s; initSwf(%s);", lbls , new JSONObject().put("src", swf + new PageParametersEncoder().encodePageParameters(pp)).toString()); } return initStr; } - private String getFlashFile(PageParameters pp) { - StringValue type = pp.get(SWF); + private String getFlashFile(StringValue type) { String fmt = "main%s.swf11.swf"; if (SWF_TYPE_NETWORK.equals(type.toString())) { fmt = "networktesting%s.swf10.swf"; @@ -259,9 +280,9 @@ public class SwfPanel extends BasePanel return String.format(fmt, DEVELOPMENT == getApplication().getConfigurationType() ? "debug" : ""); } - public static String getStringLabels(long... ids) { + public static String getStringLabels(String... ids) { JSONArray arr = new JSONArray(); - for (long id : ids) { + for (String id : ids) { arr.put(new JSONObject().put("id", id).put("value", Application.getString(id))); } return arr.toString(); Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/networktesting.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/networktesting.lzx?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/networktesting.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/networktesting.lzx Tue Aug 23 09:18:53 2016 @@ -9,7 +9,7 @@ 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 @@ -21,12 +21,12 @@ <canvas width="100%" height="100%" title="NetworkTesting"> <switch> - <when property="$as3"> - <passthrough> - import flash.external.ExternalInterface; - </passthrough> - </when> - </switch> + <when property="$as3"> + <passthrough> + import flash.external.ExternalInterface; + </passthrough> + </when> + </switch> <switch> <when property="$debug"> <method name="doDebugInit"> @@ -38,28 +38,39 @@ <method name="doDebugInit"> </method> </otherwise> - </switch> - - <include href="testsView.lzx" /> - <include href="../base/remote/restCall.lzx" /> - - <handler name="oninit"><![CDATA[ - flash.external.ExternalInterface.call("loadingComplete"); + </switch> + + <include href="testsView.lzx" /> + <include href="../base/remote/restCall.lzx" /> + + <handler name="oninit"><![CDATA[ + flash.external.ExternalInterface.call("loadingComplete"); + var lbls = ExternalInterface.call("getStringLabels"); + canvas.lbls = new Array(lbls.length); + for (var i = 0; i < lbls.length; ++i) { + canvas.lbls[lbls[i].id] = lbls[i].value; + } doDebugInit(); ]]></handler> + + <method name="lbl" args="key"> + var s = canvas.lbls['network.test.' + key]; + if ($debug) Debug.info("LBL ", key, s, canvas.lbls); + return !!s ? s : "Missing[" + key + "]"; + </method> + + <!-- + These attributes are rewritten by values from "public/config.xml" + --> + <attribute name="rtmpProtocol" type="string" value="rtmp" /> + <attribute name="rtmpHost" type="string" value="" /> + <attribute name="rtmpPort" type="number" value="1935" /> - <!-- - These attributes are rewritten by values from "public/config.xml" - --> - <attribute name="rtmpProtocol" type="string" value="rtmp" /> - <attribute name="rtmpHost" type="string" value="" /> - <attribute name="rtmpPort" type="number" value="1935" /> - - <attribute name="httpProtocol" type="string" value="http" /> - <attribute name="httpHost" type="string" value="" /> - <attribute name="httpPort" type="number" value="5080" /> - <attribute name="uriContext" type="string" value="/openmeetings" /> - <attribute name="rtmpUriPath" type="string" value="/openmeetings/hibernate" /> + <attribute name="httpProtocol" type="string" value="http" /> + <attribute name="httpHost" type="string" value="" /> + <attribute name="httpPort" type="number" value="5080" /> + <attribute name="uriContext" type="string" value="/openmeetings" /> + <attribute name="rtmpUriPath" type="string" value="/openmeetings/hibernate" /> <method name="getBrowserHost"> var host:String = ExternalInterface.call("window.location.host.toString()"); @@ -105,32 +116,32 @@ canvas.setAttribute("rtmpUriPath", canvas.uriContext + "hibernate"); </method> - <method name="showTests"> - var tests = new lz.TestsView(canvas, {name:"testsView"}); - tests.testAll(); - </method> - - <dataset type="http" name="settings" request="false" proxied="false"> - <handler name="oninit"> - this.setAttribute("src", "config.xml"); - this.doRequest(); - </handler> - <handler name="ondata"> - if ($debug) Debug.write("Settings are retrieved"); - canvas.getSettings(); - canvas.showTests(); - </handler> - <handler name="onerror" args="e"> - if ($debug) Debug.write("Settings error [" + this.src + "]", e); - </handler> - <handler name="ontimeout" args="e"> - if ($debug) Debug.write("Settings timeout error", e); - </handler> - </dataset> + <method name="showTests"> + var tests = new lz.TestsView(canvas, {name:"testsView"}); + tests.testAll(); + </method> + + <dataset type="http" name="settings" request="false" proxied="false"> + <handler name="oninit"> + this.setAttribute("src", "config.xml"); + this.doRequest(); + </handler> + <handler name="ondata"> + if ($debug) Debug.write("Settings are retrieved"); + canvas.getSettings(); + canvas.showTests(); + </handler> + <handler name="onerror" args="e"> + if ($debug) Debug.write("Settings error [" + this.src + "]", e); + </handler> + <handler name="ontimeout" args="e"> + if ($debug) Debug.write("Settings timeout error", e); + </handler> + </dataset> - <attribute name="busy" type="boolean" value="false"/> - <attribute name="log" type="string" value="" /> + <attribute name="busy" type="boolean" value="false"/> + <attribute name="log" type="string" value="" /> - <attribute name="testsView" value="null"/> + <attribute name="testsView" value="null"/> </canvas> Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/BaseURLLoadTest.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/BaseURLLoadTest.lzx?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/BaseURLLoadTest.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/BaseURLLoadTest.lzx Tue Aug 23 09:18:53 2016 @@ -22,124 +22,124 @@ <class name="BaseURLLoadTest" extends="NetworkTest"> - <switch> - <when property="$as3"> - <passthrough> - import flash.events.*; - import flash.net.*; - import flash.utils.*; - </passthrough> - </when> - </switch> - - <attribute name="testsCount" type="number" value="0" /> - <attribute name="testTypeParameter" type="string" value="null" /> - <attribute name="verbose" type="boolean" value="true" /> - - <attribute name="startTime" type="number" value="0" /> - <attribute name="wholeTime" type="number" value="0" /> - <attribute name="maxTime" type="number" value="0" /> - <attribute name="minTime" type="number" value="999999" /> - <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="initLoader"> - hostUrl = getBaseUrl() + "services/networktest?type=" + testTypeParameter; - request = new URLRequest(hostUrl); - - 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(); - } - finishedTestsCount = 0; - successfulTestsCount = 0; - wholeTime = 0; - maxTime = 0; - minTime = 999999; - - 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(); - var pingTime = endTime - startTime; - wholeTime += pingTime; - if (pingTime > maxTime) { - maxTime = pingTime; - } - if (pingTime < minTime) { - minTime = pingTime; - } - - if (verbose) { - this.log("load time = " + pingTime + " ms"); - } - - finishedTestsCount++; - successfulTestsCount++; - if (finishedTestsCount < testsCount && running) { - startTime = getTimer(); - loader.load(request); - } else { - this.report(); - } - ]]> - </method> - - <method name="onError" args="e"> - <![CDATA[ - if (verbose) { - this.log("Error - " + e); - } - - finishedTestsCount++; - if (finishedTestsCount < testsCount && running) { - startTime = getTimer(); - loader.load(request); - } else { - this.report(); - } - ]]> - </method> - - <method name="report"> - var report = "report:"; - if (successfulTestsCount > 0) { - report += "\n" + this.generateReport(); - } else { - report += " connection error"; - } - this.log(report); - - if (successfulTestsCount > 0) { - this.setPassed(); - } else { - this.setFailed(); - } - </method> + <switch> + <when property="$as3"> + <passthrough> + import flash.events.*; + import flash.net.*; + import flash.utils.*; + </passthrough> + </when> + </switch> + + <attribute name="testsCount" type="number" value="0" /> + <attribute name="testTypeParameter" type="string" value="null" /> + <attribute name="verbose" type="boolean" value="true" /> + + <attribute name="startTime" type="number" value="0" /> + <attribute name="wholeTime" type="number" value="0" /> + <attribute name="maxTime" type="number" value="0" /> + <attribute name="minTime" type="number" value="999999" /> + <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="initLoader"> + hostUrl = getBaseUrl() + "services/networktest?type=" + testTypeParameter; + request = new URLRequest(hostUrl); + + 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(); + } + finishedTestsCount = 0; + successfulTestsCount = 0; + wholeTime = 0; + maxTime = 0; + minTime = 999999; + + this.log(lbl('report.start') + " " + 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(); + var pingTime = endTime - startTime; + wholeTime += pingTime; + if (pingTime > maxTime) { + maxTime = pingTime; + } + if (pingTime < minTime) { + minTime = pingTime; + } + + if (verbose) { + this.log(lbl('ping.load') + " = " + pingTime + " " + lbl('ms')); + } + + finishedTestsCount++; + successfulTestsCount++; + if (finishedTestsCount < testsCount && running) { + startTime = getTimer(); + loader.load(request); + } else { + this.report(); + } + ]]> + </method> + + <method name="onError" args="e"> + <![CDATA[ + if (verbose) { + this.log("Error - " + e); + } + + finishedTestsCount++; + if (finishedTestsCount < testsCount && running) { + startTime = getTimer(); + loader.load(request); + } else { + this.report(); + } + ]]> + </method> + + <method name="report"> + var report = lbl('report') + ":"; + if (successfulTestsCount > 0) { + report += "\n" + this.generateReport(); + } else { + report += " " + lbl('report.con.err'); + } + this.log(report); + + if (successfulTestsCount > 0) { + this.setPassed(); + } else { + this.setFailed(); + } + </method> - <method name="generateReport" /> + <method name="generateReport" /> </class> Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/DownloadSpeedTest.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/DownloadSpeedTest.lzx?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/DownloadSpeedTest.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/DownloadSpeedTest.lzx Tue Aug 23 09:18:53 2016 @@ -22,28 +22,28 @@ <class name="DownloadSpeedTest" extends="BaseURLLoadTest"> - <handler name="oninit"> - this.setAttribute("testsCount", 1); - this.setAttribute("testName", "Download speed"); - this.setAttribute("testTypeParameter", "download"); - this.setAttribute("verbose", false); - this.setAttribute("resultText", true); - </handler> - - <method name="generateReport"> - var mBytes = loader.bytesTotal/(1024*1024); - var timeSec = wholeTime/1000; - var speed = mBytes/timeSec; - - var report = "Bytes downloaded: " + mBytes + " Mb\n"; - report += "Download time: " + timeSec + " s\n"; - report += "Download speed: " + speed + " Mb/s\n"; + <handler name="oninit"> + this.setAttribute("testsCount", 1); + this.setAttribute("testName", lbl('dwn')); + this.setAttribute("testTypeParameter", "download"); + this.setAttribute("verbose", false); + this.setAttribute("resultText", true); + </handler> + + <method name="generateReport"> + var mBytes = loader.bytesTotal/(1024*1024); + var timeSec = wholeTime/1000; + var speed = mBytes/timeSec; + + var report = lbl('dwn.bytes') + ": " + mBytes + " " + lbl('mb') + "\n"; + report += lbl('dwn.time') + ": " + timeSec + " " + lbl('sec') + "\n"; + report += lbl('dwn.speed') + ": " + speed + " " + lbl('mb') + "/" + lbl('sec') + "\n"; - resultLabel.setAttribute("text", ""); - resultLabel.addFormat("%.2f\n%s", speed, "Mb/s"); + resultLabel.setAttribute("text", ""); + resultLabel.addFormat("%.2f\n%s", speed, lbl('mb') + "/" + lbl('sec')); - return report; - </method> + return report; + </method> </class> Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/JitterTest.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/JitterTest.lzx?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/JitterTest.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/JitterTest.lzx Tue Aug 23 09:18:53 2016 @@ -22,35 +22,35 @@ <class name="JitterTest" extends="BaseURLLoadTest"> - <handler name="oninit"> - this.setAttribute("testsCount", 100); - this.setAttribute("testName", "Jitter"); - this.setAttribute("testTypeParameter", "jitter"); - this.setAttribute("verbose", false); - this.setAttribute("resultText", true); - </handler> - - <method name="generateReport"> - <![CDATA[ - var averageTime = wholeTime / successfulTestsCount; - var jitterMax = maxTime - averageTime; - var jitterMin = minTime - averageTime; - var report = "Average time: " + averageTime + " ms\n"; - report += "Min time: " + minTime + " ms\n"; - report += "Max time: " + maxTime + " ms\n"; - report += "Jitter: " + jitterMax + " ms and " + jitterMin + " ms \n"; - - var max = -jitterMin; - if (jitterMax > max) { - max = jitterMax; - } - - resultLabel.setAttribute("text", ""); - resultLabel.addFormat("%.0d\n%s", max, "ms"); - - return report; - ]]> - </method> + <handler name="oninit"> + this.setAttribute("testsCount", 100); + this.setAttribute("testName", lbl('jitter')); + this.setAttribute("testTypeParameter", "jitter"); + this.setAttribute("verbose", false); + this.setAttribute("resultText", true); + </handler> + + <method name="generateReport"> + <![CDATA[ + var averageTime = wholeTime / successfulTestsCount; + var jitterMax = maxTime - averageTime; + var jitterMin = minTime - averageTime; + var report = lbl('jitter.avg') + ": " + averageTime + " " + lbl('ms') + "\n"; + report += lbl('jitter.min') + ": " + minTime + " " + lbl('ms') + "\n"; + report += lbl('jitter.max') + ": " + maxTime + " " + lbl('ms') + "\n"; + report += lbl('jitter') + ": " + jitterMax + " " + lbl('ms') + "; " + jitterMin + " " + lbl('ms') + " \n"; + + var max = -jitterMin; + if (jitterMax > max) { + max = jitterMax; + } + + resultLabel.setAttribute("text", ""); + resultLabel.addFormat("%.0d\n%s", max, lbl('ms')); + + return report; + ]]> + </method> </class> Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/NetworkTest.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/NetworkTest.lzx?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/NetworkTest.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/NetworkTest.lzx Tue Aug 23 09:18:53 2016 @@ -22,109 +22,106 @@ <class name="NetworkTest" extends="view"> - <attribute name="testName" type="string" value="null" /> - <attribute name="protocol" 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" /> - <attribute name="allTests" type="boolean" value="false" /> - <attribute name="resultText" type="boolean" value="false" /> - - <method name="start" /> - <method name="forcedStop" /> - - <method name="startAllTestsMode"> - allTests = true; - this.setRunning(); - </method> - - <view name="picture"> - <view name="rsc" resource="notrun" width="113" height="113" /> - </view> - <text name="nameLabel" - text="${parent.testName}" - x="${(parent.picture.rsc.width - this.width)/2}" - y="$once{parent.picture.rsc.height}" - /> - <text name="resultLabel" - visible="false" - fgcolor="white" - align="center" - fontsize="16" - /> - - <handler name="onclick"> - if (running) { - this.setStopped(); - } else { - allTests = false; - this.setRunning(); - } - </handler> - - <method name="handleAllTestsMode"> - if (allTests) { - canvas.testsView.testAll(); - } - </method> - - <method name="setPassed"> - if (running) { - running=false; - if (resultText) { - picture.rsc.setAttribute("resource", "passed_result"); - var x = (picture.rsc.width - resultLabel.width)/2; - var y = (picture.rsc.height - resultLabel.height)/2; - resultLabel.setAttribute("x", x); - resultLabel.setAttribute("y", y); - resultLabel.setAttribute("visible", true); - } else { - picture.rsc.setAttribute("resource", "passed"); - } - canvas.setAttribute("busy", false); - this.handleAllTestsMode(); - } - </method> - - <method name="setFailed"> - if (running) { - running=false; - picture.rsc.setAttribute("resource", "failed"); - canvas.setAttribute("busy", false); - this.handleAllTestsMode(); - } - </method> - - <method name="setRunning"> - if (canvas.busy) { - return; - } - canvas.setAttribute("busy", true); - this.start(); - running=true; - resultLabel.setAttribute("visible", false); - picture.rsc.setAttribute("resource", "running"); - picture.rsc.play(); - </method> - - <method name="setStopped"> - this.forcedStop(); - running=false; - picture.rsc.setAttribute("resource", "notrun"); - canvas.setAttribute("busy", false); - this.handleAllTestsMode(); - </method> - - <method name="log" args="message"> - var str = testName + ": " + message + "\n"; - canvas.log += str; - if ($debug) Debug.write(str); - </method> - - <method name="getBaseUrl"> - var hostUrl = protocol + "://" + host + ":" + port + canvas.uriContext; - return hostUrl + (hostUrl.slice(-1) == '/' ? '' : '/'); - </method> + <attribute name="testName" type="string" value="null" /> + <attribute name="protocol" 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" /> + <attribute name="allTests" type="boolean" value="false" /> + <attribute name="resultText" type="boolean" value="false" /> + + <method name="start" /> + <method name="forcedStop" /> + + <method name="startAllTestsMode"> + allTests = true; + this.setRunning(); + </method> + + <view name="picture"> + <view name="rsc" resource="notrun" width="113" height="113" /> + </view> + <text name="nameLabel" text="${parent.testName}" x="${(parent.picture.rsc.width - this.width)/2}" + y="$once{parent.picture.rsc.height}" + /> + <text name="resultLabel" visible="false" fgcolor="white" align="center" fontsize="16" /> + + <handler name="onclick"> + if (running) { + this.setStopped(); + } else { + allTests = false; + this.setRunning(); + } + </handler> + + <method name="handleAllTestsMode"> + if (allTests) { + canvas.testsView.testAll(); + } + </method> + + <method name="setPassed"> + if (running) { + running=false; + if (resultText) { + picture.rsc.setAttribute("resource", "passed_result"); + var x = (picture.rsc.width - resultLabel.width)/2; + var y = (picture.rsc.height - resultLabel.height)/2; + resultLabel.setAttribute("x", x); + resultLabel.setAttribute("y", y); + resultLabel.setAttribute("visible", true); + } else { + picture.rsc.setAttribute("resource", "passed"); + } + canvas.setAttribute("busy", false); + this.handleAllTestsMode(); + } + </method> + + <method name="setFailed"> + if (running) { + running=false; + picture.rsc.setAttribute("resource", "failed"); + canvas.setAttribute("busy", false); + this.handleAllTestsMode(); + } + </method> + + <method name="setRunning"> + if (canvas.busy) { + return; + } + canvas.setAttribute("busy", true); + this.start(); + running=true; + resultLabel.setAttribute("visible", false); + picture.rsc.setAttribute("resource", "running"); + picture.rsc.play(); + </method> + + <method name="setStopped"> + this.forcedStop(); + running=false; + picture.rsc.setAttribute("resource", "notrun"); + canvas.setAttribute("busy", false); + this.handleAllTestsMode(); + </method> + + <method name="log" args="message"> + var str = testName + ": " + message + "\n"; + canvas.log += str; + if ($debug) Debug.write(str); + </method> + + <method name="getBaseUrl"> + var hostUrl = protocol + "://" + host + ":" + port + canvas.uriContext; + return hostUrl + (hostUrl.slice(-1) == '/' ? '' : '/'); + </method> + + <method name="lbl" args="key"> + return canvas.lbl(key); + </method> </class> Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/PingTest.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/PingTest.lzx?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/PingTest.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/PingTest.lzx Tue Aug 23 09:18:53 2016 @@ -22,21 +22,21 @@ <class name="PingTest" extends="BaseURLLoadTest"> - <handler name="oninit"> - this.setAttribute("testsCount", 10); - this.setAttribute("testName", "Ping"); - this.setAttribute("testTypeParameter", "ping"); - </handler> - - <method name="generateReport"> - var averageTime = wholeTime / successfulTestsCount; - var packetsLost = testsCount - successfulTestsCount; - var report = "Average ping time: " + averageTime + " ms\n"; - report += "Packets received: " + successfulTestsCount + "\n"; - report += "Packets lost: " + packetsLost + "\n"; + <handler name="oninit"> + this.setAttribute("testsCount", 10); + this.setAttribute("testName", lbl('ping')); + this.setAttribute("testTypeParameter", "ping"); + </handler> + + <method name="generateReport"> + var averageTime = wholeTime / successfulTestsCount; + var packetsLost = testsCount - successfulTestsCount; + var report = lbl('ping.avg') + ": " + averageTime + " " + lbl('ms') + "\n"; + report += lbl('ping.rcv') + ": " + successfulTestsCount + "\n"; + report += lbl('ping.lost') + ": " + packetsLost + "\n"; - return report; - </method> + return report; + </method> </class> Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/PortAvailabilityTest.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/PortAvailabilityTest.lzx?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/PortAvailabilityTest.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/PortAvailabilityTest.lzx Tue Aug 23 09:18:53 2016 @@ -22,68 +22,68 @@ <class name="PortAvailabilityTest" extends="NetworkTest"> - <switch> - <when property="$as3"> - <passthrough> - import flash.events.*; - import flash.net.*; - import flash.system.*; - </passthrough> - </when> - </switch> - - <rtmpConnection name="rtmp" debug="true" /> - - <handler name="oninit"> - this.setAttribute("testName", "Port"); - </handler> - - <method name="start"> - var hostUrl = protocol + "://" + host + ":" + port + canvas.rtmpUriPath; - rtmp.setAttribute("src", hostUrl); - this.log(": start test... " + hostUrl); + <switch> + <when property="$as3"> + <passthrough> + import flash.events.*; + import flash.net.*; + import flash.system.*; + </passthrough> + </when> + </switch> + + <rtmpConnection name="rtmp" debug="true" /> + + <handler name="oninit"> + this.setAttribute("testName", lbl('port')); + </handler> + + <method name="start"> + var hostUrl = protocol + "://" + host + ":" + port + canvas.rtmpUriPath; + rtmp.setAttribute("src", hostUrl); + this.log(": " + lbl('report.start') + " " + hostUrl); canvas.publicSID = "networktest"; - rtmp.connect(); - </method> + rtmp.connect(); + </method> - <method name="forcedStop"> - this.log("stopped"); + <method name="forcedStop"> + this.log(lbl('port.stopped')); disconnect(); - </method> + </method> <method name="disconnect"> - rtmp._nc.close(); - rtmp.setAttribute('status', 'disconnected'); - rtmp.setAttribute('stage', 0); + rtmp._nc.close(); + rtmp.setAttribute('status', 'disconnected'); + rtmp.setAttribute('stage', 0); </method> - <handler name="onconnect" reference="rtmp"> + <handler name="onconnect" reference="rtmp"> if (running) { - this.log("port is available\n"); + this.log(lbl('port.avail') + "\n"); this.setPassed(); disconnect(); - } - </handler> + } + </handler> - <handler name="onerror" args="e" reference="rtmp"> - if (running) { - this.log("connection error - " + e + "\n"); - this.setFailed(); - } - </handler> - - <handler name="onstatus" args="e" reference="rtmp"> - if (running) { - switch(e) { - case "timed out": - case "connection failed": - this.setFailed(); - break; - } - if($debug) Debug.write(testName + ": RTMP connect status - ", e); - } - </handler> + <handler name="onerror" args="e" reference="rtmp"> + if (running) { + this.log(lbl('report.con.err') + " - " + e + "\n"); + this.setFailed(); + } + </handler> + + <handler name="onstatus" args="e" reference="rtmp"> + if (running) { + switch(e) { + case "timed out": + case "connection failed": + this.setFailed(); + break; + } + if($debug) Debug.write(testName + ": RTMP connect status - ", e); + } + </handler> </class> Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/UploadSpeedTest.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/UploadSpeedTest.lzx?rev=1757332&r1=1757331&r2=1757332&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/UploadSpeedTest.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/networkTesting/tests/UploadSpeedTest.lzx Tue Aug 23 09:18:53 2016 @@ -22,31 +22,31 @@ <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="vars" value="null" /> - <attribute name="request" value="null" /> - <attribute name="loader" value="null" /> - - <handler name="oninit"> - this.setAttribute("testName", "Upload speed"); - this.setAttribute("resultText", true); - </handler> + <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="vars" value="null" /> + <attribute name="request" value="null" /> + <attribute name="loader" value="null" /> + + <handler name="oninit"> + this.setAttribute("testName", lbl('upl')); + this.setAttribute("resultText", true); + </handler> - <method name="initLoader"> - hostUrl = getBaseUrl() + "services/networktest"; + <method name="initLoader"> + hostUrl = getBaseUrl() + "services/networktest"; loader = new RestCall({ url: hostUrl , method: URLRequestMethod.POST @@ -57,67 +57,67 @@ }); vars = UploadPostHelper.getPostData('aaa', getData()); if ($debug) Debug.write("initLoader:: ");//, vars - loaderInited = true; - </method> + loaderInited = true; + </method> - <method name="start"> + <method name="start"> if ($debug) Debug.write("start:: ", request); - if (!loaderInited) { - this.initLoader(); - } + if (!loaderInited) { + this.initLoader(); + } if ($debug) Debug.write("going to start:: ", loader); - this.log("start test... " + hostUrl); - startTime = getTimer(); + this.log(lbl('report.start') + " " + hostUrl); + startTime = getTimer(); request = loader.load(vars); if ($debug) Debug.write("load:: ", request); - </method> + </method> - <method name="forcedStop"> - loader.close(); - this.log("stopped"); - </method> + <method name="forcedStop"> + loader.close(); + this.log("stopped"); + </method> - <method name="onComplete" args="e"> + <method name="onComplete" args="e"> if ($debug) Debug.write("onComplete:: ", 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"; - - resultLabel.setAttribute("text", ""); - resultLabel.addFormat("%.2f\n%s", speed, "Mb/s"); - this.log(report); - this.setPassed(); - } - </method> + 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 += lbl('upl.bytes') + ": " + mBytes + " " + lbl('mb') + "\n"; + report += lbl('upl.time') + ": " + loadTimeSec + " " + lbl('sec') + "\n"; + report += lbl('upl.speed') + ": " + speed + " " + lbl('mb') + "/" + lbl('sec') + "\n"; + + resultLabel.setAttribute("text", ""); + resultLabel.addFormat("%.2f\n%s", speed, lbl('mb') + "/" + lbl('sec')); + this.log(report); + this.setPassed(); + } + </method> - <method name="onError" args="e"> + <method name="onError" args="e"> if ($debug) Debug.write("onError:: ", e); - if (running) { - this.log("error - " + e); - this.setFailed(); - } - </method> - - <!-- returns a 1 Mb string--> - <method name="getData"> - <![CDATA[ - var result:ByteArray = new ByteArray(); - for (var i = 0; i < 64 * 16384; ++i) { - result.writeByte(i % 256); - } - result.position = 0; - return result; - ]]> - </method> + if (running) { + this.log(lbl('report.error') + " - " + e); + this.setFailed(); + } + </method> + + <!-- returns a 1 Mb string--> + <method name="getData"> + <![CDATA[ + var result:ByteArray = new ByteArray(); + for (var i = 0; i < 64 * 16384; ++i) { + result.writeByte(i % 256); + } + result.position = 0; + return result; + ]]> + </method> </class>
