Author: a_horuzhenko
Date: Fri May 17 12:32:06 2013
New Revision: 1483769
URL: http://svn.apache.org/r1483769
Log:
Last revision has been changed according to Maxim's recomendations.
Removed:
openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/ClientLogger.java
Modified:
openmeetings/branches/2.1/.classpath
openmeetings/branches/2.1/WebContent/WEB-INF/web.xml
openmeetings/branches/2.1/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/2.1/WebContent/src/base/mainMethods.lzx
openmeetings/branches/2.1/WebContent/src/main.lzx
openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
Modified: openmeetings/branches/2.1/.classpath
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/.classpath?rev=1483769&r1=1483768&r2=1483769&view=diff
==============================================================================
--- openmeetings/branches/2.1/.classpath (original)
+++ openmeetings/branches/2.1/.classpath Fri May 17 12:32:06 2013
@@ -1,4 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed 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.
+ -->
<classpath>
<classpathentry kind="src" path="WebContent/WEB-INF"/>
<classpathentry kind="src" path="src"/>
@@ -16,102 +29,5 @@
<classpathentry kind="lib"
path="build/red5/client/dist/red5-client.jar"
sourcepath="build/red5/client/src"/>
<classpathentry kind="lib" path="build/lib/java_16_tools.jar"/>
<classpathentry kind="lib" path="WebContent/screensharing"/>
- <classpathentry kind="lib" path="build/lib/om/activation-jar-1.1.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/apache-mime4j-core-jar-0.7.2.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/asterisk-java-jar-1.0.0.CI-20130102.214528-1134.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/axiom-api-bundle-1.2.14.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/axiom-dom-bundle-1.2.14.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/axiom-impl-bundle-1.2.14.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/axis2-jar-1.7.0-SNAPSHOT.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/axis2-jaxws-jar-1.7.0-SNAPSHOT.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/axis2-kernel-jar-1.7.0-SNAPSHOT.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/axis2-metadata-jar-1.7.0-SNAPSHOT.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/axis2-saaj-jar-1.7.0-SNAPSHOT.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/axis2-transport-http-bundle-1.7.0-SNAPSHOT.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/axis2-transport-local-bundle-1.7.0-SNAPSHOT.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/backport-util-concurrent-jar-3.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-anim-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/batik-awt-util-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/batik-bridge-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-codec-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-css-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-dom-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-ext-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/batik-extension-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/batik-gui-util-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-gvt-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/batik-parser-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/batik-rasterizer-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/batik-script-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/batik-slideshow-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/batik-squiggle-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/batik-svg-dom-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/batik-svggen-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-svgpp-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-swing-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/batik-transcoder-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/batik-ttf2svg-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-util-jar-1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/om/batik-xml-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/commons-dbcp-jar-1.4.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/commons-digester-jar-2.1.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/commons-httpclient-jar-3.1.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/commons-lang-jar-2.6.jar"/>
- <classpathentry kind="lib" path="build/lib/om/commons-net-jar-3.1.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/commons-transaction-jar-1.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/derby-jar-10.8.2.2.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/derbyclient-jar-10.8.2.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/dom4j-jar-1.6.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/fop-jar-1.0.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/geronimo-activation_1.1_spec-bundle-1.1.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/geronimo-annotation_1.0_spec-jar-1.1.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/geronimo-javamail_1.4_spec-bundle-1.7.1.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/geronimo-jaxws_2.2_spec-bundle-1.0.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/geronimo-jta_1.1_spec-jar-1.1.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/geronimo-saaj_1.3_spec-jar-1.0.1.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/geronimo-stax-api_1.0_spec-bundle-1.0.1.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/geronimo-ws-metadata_2.0_spec-jar-1.1.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/ical4j-bundle-1.0.3.jar"/>
- <classpathentry kind="lib" path="build/lib/om/jaxb-api-jar-2.2.4.jar"/>
- <classpathentry kind="lib" path="build/lib/om/jaxb-impl-jar-2.2.4.jar"/>
- <classpathentry kind="lib" path="build/lib/om/jaxb-xjc-jar-2.2.4.jar"/>
- <classpathentry kind="lib" path="build/lib/om/jaxen-jar-1.1.4.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/jaxws-tools-jar-2.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/om/jsmpp-jar-2.1.0.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/jsr311-api-jar-1.1.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/mail-jar-1.4.4.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/mex-mar-1.7.0-SNAPSHOT.mar"/>
- <classpathentry kind="lib"
path="build/lib/om/neethi-bundle-3.0.3-SNAPSHOT.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/openjpa-bundle-2.2.1.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/postgresql-jar-9.1-901.jdbc4.jar"/>
- <classpathentry kind="lib" path="build/lib/om/serp-jar-1.13.1.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/simple-xml-jar-2.6.9.jar"/>
- <classpathentry kind="lib" path="build/lib/om/smslib-jar-3.5.3.jar"/>
- <classpathentry kind="lib" path="build/lib/om/stax-api-jar-1.0-2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/stax2-api-jar-3.1.1.jar"/>
- <classpathentry kind="lib" path="build/lib/om/velocity-jar-1.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/velocity-tools-jar-2.0.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/wicket-auth-roles-jar-6.6.0.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/wicket-core-jar-6.6.0.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/wicket-datetime-jar-6.6.0.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/wicket-extensions-jar-6.6.0.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/wicket-ioc-jar-6.6.0.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/wicket-native-websocket-core-jar-0.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/wicket-native-websocket-tomcat-jar-0.7.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/wicket-request-jar-6.6.0.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/wicket-util-jar-6.6.0.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/woden-core-bundle-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/woodstox-core-asl-jar-4.1.4.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/ws-commons-util-jar-1.0.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/wsdl4j-jar-1.6.2.jar"/>
- <classpathentry kind="lib" path="build/lib/om/xalan-jar-2.7.0.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/xml-apis-ext-jar-1.3.04.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/xml-resolver-jar-1.2.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/xmlgraphics-commons-jar-1.4.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/xmlrpc-client-jar-3.1.3.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/xmlrpc-common-jar-3.1.3.jar"/>
- <classpathentry kind="lib"
path="build/lib/om/XmlSchema-bundle-1.4.8-SNAPSHOT.jar"/>
- <classpathentry kind="lib" path="build/lib/om/xpp3-jar-1.1.4c.jar"/>
- <classpathentry kind="lib" path="build/lib/om/xstream-jar-1.4.2.jar"/>
<classpathentry kind="output" path="build/classes/eclipse"/>
-</classpath>
+</classpath>
\ No newline at end of file
Modified: openmeetings/branches/2.1/WebContent/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/WEB-INF/web.xml?rev=1483769&r1=1483768&r2=1483769&view=diff
==============================================================================
--- openmeetings/branches/2.1/WebContent/WEB-INF/web.xml (original)
+++ openmeetings/branches/2.1/WebContent/WEB-INF/web.xml Fri May 17 12:32:06
2013
@@ -115,10 +115,6 @@
<servlet-name>ActivateUser</servlet-name>
<servlet-class>org.apache.openmeetings.servlet.outputhandler.ActivateUser</servlet-class>
</servlet>
- <servlet>
- <servlet-name>ClientLogger</servlet-name>
-
<servlet-class>org.apache.openmeetings.servlet.outputhandler.ClientLogger</servlet-class>
- </servlet>
<!-- Axis2 Settings -->
<servlet>
<servlet-name>AxisServlet</servlet-name>
@@ -174,10 +170,6 @@
<servlet-name>ActivateUser</servlet-name>
<url-pattern>/activateUser</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>ClientLogger</servlet-name>
- <url-pattern>/ClientLogger</url-pattern>
- </servlet-mapping>
<!-- Axis2 -->
<servlet-mapping>
<servlet-name>AxisServlet</servlet-name>
Modified:
openmeetings/branches/2.1/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1483769&r1=1483768&r2=1483769&view=diff
==============================================================================
---
openmeetings/branches/2.1/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/branches/2.1/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Fri May 17 12:32:06 2013
@@ -204,7 +204,7 @@
<handler name="onerror" >
<![CDATA[
- Debug.remoteWrite("error " + this.status + " " + this.src + " " +
this.lastCalled + " " + this.showKickMessage);
+ canvas.remoteLogWrite("error " + this.status + " " + this.src + "
" + this.lastCalled + " " + this.showKickMessage);
if (this.showFullMessage) {
new lz.labelerrorPopup(canvas,{errorlabelid:99});
this.showFullMessage = false;
Modified: openmeetings/branches/2.1/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/base/mainMethods.lzx?rev=1483769&r1=1483768&r2=1483769&view=diff
==============================================================================
--- openmeetings/branches/2.1/WebContent/src/base/mainMethods.lzx (original)
+++ openmeetings/branches/2.1/WebContent/src/base/mainMethods.lzx Fri May 17
12:32:06 2013
@@ -114,6 +114,15 @@
]]>
</method>
+ <method name="remoteLogWrite" args="message">
+ if ($debug) Debug.write(message);
+ var remoteLog = new lz.dataset();
+ remoteLog.setQueryType("POST");
+ remoteLog.setAttribute("src", canvas.getUrl() + "/remotelog.upload");
+ remoteLog.setQueryParam("message", message);
+ remoteLog.doRequest();
+ </method>
+
<method name="getHttpHost">
<![CDATA[
if (canvas.httphostlocal != null && canvas.httphostlocal.length > 0) {
Modified: openmeetings/branches/2.1/WebContent/src/main.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/main.lzx?rev=1483769&r1=1483768&r2=1483769&view=diff
==============================================================================
--- openmeetings/branches/2.1/WebContent/src/main.lzx (original)
+++ openmeetings/branches/2.1/WebContent/src/main.lzx Fri May 17 12:32:06 2013
@@ -47,8 +47,6 @@
<silverstyle name="itemStyle" textcolor="0xFFFFFF" />
<whitestyle name="menuStyle" textcolor="0x000000" />
-
-<dataset name="remoteLog" type="http" />
<!-- main colors: 264269 -->
<handler name="oninit">
@@ -59,14 +57,6 @@
cmenu.hideBuiltInItems();
if($debug) Debug.write("main.lzx/oninit:",this);
canvas.lc = new LocalConnection();
-
- //init remote debug messages
- Debug.remoteWrite = function(message) {
- if ($debug) Debug.write(message);
- remoteLog.setAttribute("src", canvas.getUrl() + "ClientLogger");
- remoteLog.setQueryParam("message", message);
- remoteLog.doRequest();
- };
</handler>
Modified:
openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java?rev=1483769&r1=1483768&r2=1483769&view=diff
==============================================================================
---
openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
(original)
+++
openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
Fri May 17 12:32:06 2013
@@ -136,6 +136,14 @@ public class UploadController extends Ab
}
}
+ @RequestMapping(value = "/remotelog.upload", method = RequestMethod.POST)
+ public void handleRemoteLog(HttpServletRequest request,
HttpServletResponse response) throws ServletException {
+ String message = request.getParameter("message");
+ if (message != null) {
+ log.debug("[CLIENT MESSAGE] " + message);
+ }
+ }
+
@RequestMapping(value = "/upload.upload", method = RequestMethod.POST)
public void handleFormUpload(HttpServletRequest request,
HttpServletResponse response) throws ServletException {
try {
