Author: solomax
Date: Thu Feb 23 08:26:37 2012
New Revision: 1292698
URL: http://svn.apache.org/viewvc?rev=1292698&view=rev
Log:
Red5 lib was updated in ScreenSharing clients, all libs and build were updated
accordingly
Removed:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/EasySSLProtocolSocketFactory.java
Modified:
incubator/openmeetings/trunk/singlewebapp/.classpath
incubator/openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXGWrapperClient.java
incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/BlankArea.java
incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/ScreenShare.java
incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/ScreenShareRTMPT.java
incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/rtmp/ScreenClient.java
incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm
Modified: incubator/openmeetings/trunk/singlewebapp/.classpath
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/.classpath?rev=1292698&r1=1292697&r2=1292698&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/.classpath (original)
+++ incubator/openmeetings/trunk/singlewebapp/.classpath Thu Feb 23 08:26:37
2012
@@ -11,10 +11,11 @@
<classpathentry kind="src" path="src/test"/>
<classpathentry kind="src" path="src/userservice"/>
<classpathentry kind="src" path="WebContent/WEB-INF"/>
- <classpathentry
excluding="app/|client/|fileservice/|red5-screenshare/|roomservice/|screenviewer/|server/|templates/|test/|userservice/|src_tool/"
including="META-INF/" kind="src" path="src"/>
+ <classpathentry
excluding="app/|client/|fileservice/|red5-screenshare/|roomservice/|screenviewer/|server/|templates/|test/|userservice/|src_tool/|red5-screenshare/"
including="META-INF/" kind="src" path="src"/>
<classpathentry kind="src" path="src/dtdgenerator"/>
<classpathentry kind="src" path="src/docgenerator"/>
<classpathentry kind="src" path="src/calendarservice"/>
+ <classpathentry kind="src" path="src/red5-screenshare"/>
<classpathentry exported="true" kind="con"
path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry exported="true" kind="con"
path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry exported="true" kind="lib"
path="lib/velocity/velocity-1.6.2.jar">
@@ -497,11 +498,6 @@
<attribute
name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
- <classpathentry exported="true" kind="lib"
path="lib/axis2-1.6/commons-httpclient-3.1.jar">
- <attributes>
- <attribute
name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
<classpathentry exported="true" kind="lib"
path="lib/axis2-1.6/commons-io-1.4.jar">
<attributes>
<attribute
name="org.eclipse.jst.component.nondependency" value=""/>
@@ -537,11 +533,6 @@
<attribute
name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
- <classpathentry exported="true" kind="lib"
path="lib/axis2-1.6/httpcore-4.0.jar">
- <attributes>
- <attribute
name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
<classpathentry exported="true" kind="lib"
path="lib/axis2-1.6/jalopy-1.5rc3.jar">
<attributes>
<attribute
name="org.eclipse.jst.component.nondependency" value=""/>
Modified:
incubator/openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component?rev=1292698&r1=1292697&r2=1292698&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component
(original)
+++
incubator/openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component
Thu Feb 23 08:26:37 2012
@@ -1,24 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="ROOT">
- <wb-resource deploy-path="/" source-path="/WebContent"/>
- <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/userservice"/>
- <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/roomservice"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/app"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/client"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test"/>
- <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/fileservice"/>
- <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/screenviewer"/>
- <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/templates"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/red5-screenshare"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/server"/>
- <wb-resource deploy-path="/WEB-INF/classes"
source-path="/WebContent/WEB-INF"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
- <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/dtdgenerator"/>
- <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/docgenerator"/>
- <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/calendarservice"/>
- <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/src_tool"/>
- <property name="java-output-path"/>
- <property name="context-root" value="/"/>
- </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="ROOT">
+ <wb-resource deploy-path="/" source-path="/WebContent"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/userservice"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/roomservice"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/app"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/client"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/fileservice"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/screenviewer"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/templates"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/red5-screenshare"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/server"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/WebContent/WEB-INF"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/dtdgenerator"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/docgenerator"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/calendarservice"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/src_tool"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="/src/red5-screenshare"/>
+ <property name="java-output-path"/>
+ <property name="context-root" value="/"/>
+ </wb-module>
+</project-modules>
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1292698&r1=1292697&r2=1292698&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Thu Feb 23 08:26:37 2012
@@ -133,12 +133,6 @@
<fileset dir="${jdk.tools}" includes="*.jar" />
</path>
- <!-- screenshare classpath -->
- <path id="screenshare.classpath">
- <fileset dir="${screenshare.lib}" includes="*.jar" />
- <fileset dir="${red5.server.dir}/dist/lib"
includes="commons-codec*.jar" />
- </path>
-
<!-- build artefacts -->
<target name="dist-bin" description="pack binary distribution"
depends="dist">
<tstamp>
@@ -200,6 +194,13 @@
<copy todir="${screenshare.out.dir}" filtering="true">
<fileset dir="${screenshare.lib}" />
<fileset dir="${red5.server.dir}/dist/lib"
includes="commons-codec*.jar" />
+ <fileset dir="${red5.server.dir}/dist/lib"
includes="httpclient*.jar" />
+ <fileset dir="${red5.server.dir}/dist/lib"
includes="httpcore*.jar" />
+ <fileset dir="${red5.server.dir}/dist"
includes="red5.jar" />
+ <fileset dir="${spring.lib}"
includes="org.springframework.context-*.jar" />
+ <fileset dir="${slf4j.lib}" includes="logback*.jar" />
+ <fileset dir="${mina.lib}" includes="mina-core*.jar" />
+ <fileset dir="${slf4j.lib}" includes="slf4j-api*.jar" />
</copy>
<copy todir="${red5.root}" filtering="true">
<fileset dir="${red5.server.dir}/dist">
@@ -429,7 +430,7 @@
<format property="TODAY" pattern="d-MMMM-yyyy"
locale="en" />
</tstamp>
<manifestclasspath property="jar2.classpath"
jarfile="${project.distname}.jar">
- <classpath refid="screenshare.classpath" />
+ <classpath refid="compile.classpath" />
</manifestclasspath>
<!-- Screen Share -->
<jar destfile="${screenshare.out.dir}/red5-screenshare.jar">
@@ -574,7 +575,7 @@
<echo message="Compile screen share to ${screen.out.dir}" />
<!-- compile screen share -->
<javac debug="on" debuglevel="lines,vars,source"
srcdir="${screen.src.dir}" destdir="${screen.out.dir}">
- <classpath refid="screenshare.classpath" />
+ <classpath refid="compile.classpath" />
</javac>
</target>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java?rev=1292698&r1=1292697&r2=1292698&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
Thu Feb 23 08:26:37 2012
@@ -22,16 +22,29 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.Date;
+import javax.net.ssl.SSLContext;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpVersion;
-import org.apache.commons.httpclient.methods.ByteArrayRequestEntity;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.RequestEntity;
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpVersion;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.scheme.PlainSocketFactory;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.scheme.SchemeRegistry;
+import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.apache.http.entity.AbstractHttpEntity;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpParams;
+import org.apache.http.params.HttpProtocolParams;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.util.EntityUtils;
import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.persistence.beans.basic.Configuration;
@@ -371,8 +384,8 @@ public class OpenXGHttpClient {
String strURL = openxg_wrapper_url.getConf_value();
// Prepare HTTP post
- PostMethod post = new PostMethod(strURL);
- post.addRequestHeader("User-Agent", "OpenSIPg XML_RPC
Client");
+ HttpPost post = new HttpPost(strURL);
+ post.addHeader("User-Agent", "OpenSIPg XML_RPC Client");
// Get the XML-String representative
String stringToPost =
OpenXGCustomXMLMarshall.getInstance()
@@ -413,43 +426,40 @@ public class OpenXGHttpClient {
String strURL = openxg_wrapper_url.getConf_value();
// Prepare HTTP post
- PostMethod post = new PostMethod(strURL);
- post.addRequestHeader("User-Agent", "OpenSIPg XML_RPC
Client");
+ HttpPost post = new HttpPost(strURL);
+ post.addHeader("User-Agent", "OpenSIPg XML_RPC Client");
// log.debug(stringToPost);
- RequestEntity entity = new ByteArrayRequestEntity(
+ AbstractHttpEntity entity = new ByteArrayEntity(
stringToPost.getBytes(Charset.forName("ISO-8859-1")));
// Prepare HTTP post
-
- post.getParams().setContentCharset("ISO-8859-1");
- post.getParams().setVersion(HttpVersion.HTTP_1_0);
+ HttpParams params = post.getParams();
+ HttpProtocolParams.setContentCharset(params, "utf-8");
+ HttpProtocolParams.setVersion(params,
HttpVersion.HTTP_1_1);
+ post.setParams(params);
// Request content will be retrieved directly
// from the input stream
- post.setRequestEntity(entity);
-
- Protocol easyhttps = new Protocol("https",
- (ProtocolSocketFactory) new
EasySSLProtocolSocketFactory(),
- 443);
- Protocol.registerProtocol("https", easyhttps);
+ post.setEntity(entity);
// Get HTTP client
- HttpClient httpclient = new HttpClient();
+ HttpClient httpclient = getHttpClient();
// Execute request
- int result = httpclient.executeMethod(post);
-
+ HttpResponse response = httpclient.execute(post);
+ int resCode = response.getStatusLine().getStatusCode();
+
// Display status code
- log.debug("Response status code: " + result);
+ log.debug("Response status code: " + response);
- if (result == 200) {
+ if (resCode == 200) {
+ HttpEntity ent = response.getEntity();
+ String responseBody = (ent != null) ?
EntityUtils.toString(ent) : "";
+ log.debug("parseReturnBody " + responseBody);
- log.debug("parseReturnBody " +
post.getResponseBodyAsString());
-
- OpenXGReturnObject oIG =
this.parseOpenXGReturnBody(post
- .getResponseBodyAsStream());
+ OpenXGReturnObject oIG =
this.parseOpenXGReturnBody(ent.getContent());
log.debug("oIG 1 " + oIG.getStatus_code());
log.debug("oIG 2 " + oIG.getStatus_string());
@@ -576,4 +586,23 @@ public class OpenXGHttpClient {
return null;
}
+ public HttpClient getHttpClient() {
+ try {
+ SSLSocketFactory sf = new
SSLSocketFactory(SSLContext.getInstance("TLS"),
SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+
+ HttpParams params = new BasicHttpParams();
+ HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
+ HttpProtocolParams.setContentCharset(params, HTTP.UTF_8);
+
+ SchemeRegistry registry = new SchemeRegistry();
+ registry.register(new Scheme("http", 80,
PlainSocketFactory.getSocketFactory()));
+ registry.register(new Scheme("https", 443, sf));
+
+ ClientConnectionManager ccm = new
ThreadSafeClientConnManager(registry);
+
+ return new DefaultHttpClient(ccm, params);
+ } catch (Exception e) {
+ return new DefaultHttpClient();
+ }
+ }
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXGWrapperClient.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXGWrapperClient.java?rev=1292698&r1=1292697&r2=1292698&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXGWrapperClient.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXGWrapperClient.java
Thu Feb 23 08:26:37 2012
@@ -18,8 +18,12 @@
*/
package org.openmeetings.app.sip.xmlrpc.test;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.utils.crypt.MD5;
import org.red5.logging.Red5LoggerFactory;
@@ -76,20 +80,20 @@ public class OpenXGWrapperClient {
String strURL =
"http://127.0.0.1:5080/rpc_client/rpc_gateway_wrapper.php";;
// Prepare HTTP post
- PostMethod post = new PostMethod(strURL);
+ HttpPost post = new HttpPost(strURL);
- post.setParameter("userid", userid);
+ post.getParams().setParameter("userid", userid);
- post.setParameter("domain", domain);
- post.setParameter("first_name", first_name);
- post.setParameter("middle_i", middle_i);
- post.setParameter("last_name", last_name);
- post.setParameter("password", password);
- post.setParameter("community_code", community_code);
- post.setParameter("language_code", language_code);
- post.setParameter("email", email);
- post.setParameter("adminid", adminid);
- post.setParameter("action", "OpenSIPg.UserCreate");
+ post.getParams().setParameter("domain", domain);
+ post.getParams().setParameter("first_name", first_name);
+ post.getParams().setParameter("middle_i", middle_i);
+ post.getParams().setParameter("last_name", last_name);
+ post.getParams().setParameter("password", password);
+ post.getParams().setParameter("community_code", community_code);
+ post.getParams().setParameter("language_code", language_code);
+ post.getParams().setParameter("email", email);
+ post.getParams().setParameter("adminid", adminid);
+ post.getParams().setParameter("action", "OpenSIPg.UserCreate");
String digest = this.digest_calculate(new Object[]{client_id,
userid, domain,
first_name, middle_i, last_name,
@@ -97,18 +101,20 @@ public class OpenXGWrapperClient {
language_code, email, adminid,
client_secret});
- post.setParameter("digest", digest);
+ post.getParams().setParameter("digest", digest);
// Get HTTP client
- HttpClient httpclient = new HttpClient();
+ HttpClient httpclient = new DefaultHttpClient();
// Execute request
- int result = httpclient.executeMethod(post);
+ HttpResponse response = httpclient.execute(post);
// Display status code
- System.out.println("Response status code: " + result);
+ System.out.println("Response status code: " +
response.getStatusLine().getStatusCode());
// Display response
System.out.println("Response body: ");
- System.out.println(post.getResponseBodyAsString());
-
+ HttpEntity entity = response.getEntity();
+ if (entity != null) {
+ System.out.println(EntityUtils.toString(entity));
+ }
} catch (Exception err) {
log.error("[testConnection]",err);
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/BlankArea.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/BlankArea.java?rev=1292698&r1=1292697&r2=1292698&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/BlankArea.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/BlankArea.java
Thu Feb 23 08:26:37 2012
@@ -23,7 +23,8 @@ import java.awt.Dimension;
import java.awt.Color;
public class BlankArea extends JLabel {
- Dimension minSize = new Dimension(100, 50);
+ private static final long serialVersionUID = 305723962144665147L;
+ Dimension minSize = new Dimension(100, 50);
public BlankArea(Color color) {
setBackground(color);
