You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by aa...@apache.org on 2012/07/11 11:53:38 UTC
svn commit: r1360091 - in /incubator/openmeetings/trunk/plugins/jitsi: ./
main/src/net/java/sip/communicator/plugin/openmeetings/
Author: aaf
Date: Wed Jul 11 09:53:37 2012
New Revision: 1360091
URL: http://svn.apache.org/viewvc?rev=1360091&view=rev
Log:
Added my own build file, improved logging, fixed selection of jabber service protocol when many exist
Added:
incubator/openmeetings/trunk/plugins/jitsi/build.cmd
Modified:
incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigManager.java
incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginMenuItem.java
incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginSoapClient.java
incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/openmeetingsplugin.manifest.mf
Added: incubator/openmeetings/trunk/plugins/jitsi/build.cmd
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/jitsi/build.cmd?rev=1360091&view=auto
==============================================================================
--- incubator/openmeetings/trunk/plugins/jitsi/build.cmd (added)
+++ incubator/openmeetings/trunk/plugins/jitsi/build.cmd Wed Jul 11 09:53:37 2012
@@ -0,0 +1,6 @@
+set JAVA_HOME=C:\Program Files\Java\jdk1.7.0_01
+set SC_BUNDLES=%ProgramFiles(x86)%\Jitsi\sc-bundles
+"%JAVA_HOME%"\bin\javac -classpath "%SC_BUNDLES%\defaultresources.jar;%SC_BUNDLES%\protocol-jabber.jar;%SC_BUNDLES%\sipaccregwizz.jar;%ProgramFiles(x86)%\Jitsi\lib\jdic-all.jar;%ProgramFiles(x86)%\Jitsi\lib\felix.jar;%SC_BUNDLES%\netaddr.jar;%SC_BUNDLES%\configuration.jar;%SC_BUNDLES%\swing-ui.jar;%SC_BUNDLES%\msnaccregwizz.jar;%SC_BUNDLES%\util.jar;%SC_BUNDLES%\protocol.jar;%SC_BUNDLES%\ui-service.jar;%SC_BUNDLES%\resourcemanager.jar;%SC_BUNDLES%\contactlist.jar;%SC_BUNDLES%\otr.jar" -d . -target 1.6 -source 1.6 C:\Windows.old\jitsi\main\src\net\java\sip\communicator\plugin\openmeetings\*.java
+
+"%JAVA_HOME%"\bin\jar -0vcfm openmeetings.jar C:\Windows.old\jitsi\main\src\net\java\sip\communicator\plugin\openmeetings\openmeetingsplugin.manifest.mf net
+rem copy openmeetings.jar "%SC_BUNDLES%"\
\ No newline at end of file
Modified: incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigManager.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigManager.java?rev=1360091&r1=1360090&r2=1360091&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigManager.java (original)
+++ incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigManager.java Wed Jul 11 09:53:37 2012
@@ -13,15 +13,16 @@ import java.security.*;
import javax.xml.soap.SOAPException;
-import net.java.sip.communicator.impl.protocol.zeroconf.MessageZeroconfImpl;
+//import net.java.sip.communicator.impl.protocol.zeroconf.MessageZeroconfImpl;
import net.java.sip.communicator.service.configuration.ConfigurationService;
+import net.java.sip.communicator.util.Logger;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
public class OpenmeetingsConfigManager {
-
+ Logger logger = Logger.getLogger(OpenmeetingsPluginActivator.class);
private String server;
private String protoPrefix;
private String omUriContext;
@@ -114,7 +115,7 @@ public class OpenmeetingsConfigManager {
return url;
}
- public String getInvitationUrl( String displayedName ) throws Exception{
+ public String getInvitationUrl(String displayedName) throws Exception {
String protoPrefix = getProtoPrefix();
String server = getServer();
String uriContext = getOmUriContext();
@@ -123,18 +124,17 @@ public class OpenmeetingsConfigManager {
String invitationHash = null;
try {
- invitationHash = soapClient.getInvitationHash( getLogin(), getPassword(),displayedName );
+ invitationHash = soapClient.getInvitationHash(getLogin(), getPassword(), displayedName);
} catch (Exception e) {
- System.out.println( e.getMessage());
+ logger.error(e);
}
-
- if( invitationHash.equals(null) )
- return null;
-
- String invitationUrl = createInvitationUrl( invitationHash );
-
+
+ if (invitationHash == null) return null;
+
+ String invitationUrl = createInvitationUrl(invitationHash);
return invitationUrl;
}
+
public String sendUrl() throws Exception {
String url = getCreationUrl();
@@ -244,7 +244,7 @@ public class OpenmeetingsConfigManager {
getConfigurationService().setProperty( "plugin.openmeetings.LOGIN", login);
}
public String getLogin() {
- String value = (String)getConfigurationService().getProperty( "plugin.openmeetings.LOGIN" );
+ String value = (String)getConfigurationService().getProperty("plugin.openmeetings.LOGIN");
login = value;
return login;
}
Modified: incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginMenuItem.java?rev=1360091&r1=1360090&r2=1360091&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginMenuItem.java (original)
+++ incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginMenuItem.java Wed Jul 11 09:53:37 2012
@@ -19,11 +19,12 @@ import javax.swing.*;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import org.osgi.framework.InvalidSyntaxException;
import net.java.sip.communicator.service.contactlist.*;
import net.java.sip.communicator.service.gui.*;
import net.java.sip.communicator.service.gui.Container;
-
+import net.java.sip.communicator.util.*;
public class OpenmeetingsPluginMenuItem
extends AbstractPluginComponent
@@ -52,16 +53,43 @@ public class OpenmeetingsPluginMenuItem
*/
public void actionPerformed(ActionEvent e)
{
-
+ Logger logger = Logger.getLogger(OpenmeetingsPluginActivator.class);
+
+ ServiceReference cRef[];
+ try {
+ cRef = bc.getServiceReferences(ProtocolProviderService.class.getName(), null);
+ } catch (InvalidSyntaxException e1) {
+ logger.error(e1.getMessage());
+ return;
+ }
+ ProtocolProviderService jabberProvider = null;
+
+ for (int i = 0; i < cRef.length; i++) {
+ ProtocolProviderService provider = (ProtocolProviderService) bc.getService(cRef[i]);
+ logger.info("found " + provider.getClass().getName());
+ if (provider.getClass().getName().indexOf("Jabber") >= 0) {
+ jabberProvider = provider;
+ break;
+ }
+ }
+ if (jabberProvider == null) {
+ logger.error("cannot find jabber service");
+ return;
+ }
+
String invitationUrl = null;
+
+// System.getProperties().put("http.proxyHost", "10.10.2.254");
+// System.getProperties().put("http.proxyPort", "3128");
+ logger.info("getting invitation for " + OpenmeetingsConfigManager.getInstance().getLogin());
try {
- invitationUrl = OpenmeetingsConfigManager.getInstance().getInvitationUrl(
- OpenmeetingsConfigManager.getInstance().getLogin() );
+ invitationUrl = OpenmeetingsConfigManager.getInstance().getInvitationUrl(
+ OpenmeetingsConfigManager.getInstance().getLogin());
} catch (Exception e1) {
- System.out.println( e1.getMessage() );
+ logger.info(e1.getMessage());
}
- if( invitationUrl.equals(null)){
- System.out.println("Can't get invitation URL");
+ if (invitationUrl == null) {
+ logger.info("Can't get invitation URL");
return;
}
@@ -70,26 +98,24 @@ public class OpenmeetingsPluginMenuItem
Contact to = metaContact.getDefaultContact();
String invitationUrlForSend = null;
try {
- invitationUrlForSend = OpenmeetingsConfigManager.getInstance().getInvitationUrl( to.getDisplayName() );
+ invitationUrlForSend = OpenmeetingsConfigManager.getInstance().getInvitationUrl(to.getDisplayName());
} catch (Exception e1) {
- System.out.println( e1.getMessage() );
+ logger.info(e1.getMessage());
}
if( invitationUrl.equals(null)){
- System.out.println("Can't get invitation URL For send");
+ logger.info("Can't get invitation URL For send");
return;
}
-
- ServiceReference cRef = bc.getServiceReference( ProtocolProviderService.class.getName() );
- ProtocolProviderService jabberProvider =
- (ProtocolProviderService)bc.getService(cRef);
-
+// System.getProperties().remove("http.proxyHost");
+// System.getProperties().remove("http.proxyPort");
+
OperationSetBasicInstantMessaging basicInstMsgImpl =
(OperationSetBasicInstantMessaging)jabberProvider.getOperationSet(OperationSetBasicInstantMessaging.class);
String message = "I am inviting you to the conference. Please, click the link " + invitationUrlForSend;
- Message msg = basicInstMsgImpl.createMessage( message);
- basicInstMsgImpl.sendInstantMessage( to , msg);
-
+
+ Message msg = basicInstMsgImpl.createMessage(message);
+ basicInstMsgImpl.sendInstantMessage(to , msg);
}
private boolean conferenceCreated(String response) {
@@ -112,7 +138,6 @@ public class OpenmeetingsPluginMenuItem
}
if ( url.length() == 0 ) {
-
System.out.println( "Usage: OpenURI [URI [URI ... ]]" );
System.exit( 0 );
}
@@ -129,8 +154,7 @@ public class OpenmeetingsPluginMenuItem
java.net.URI uri = new java.net.URI( url );
desktop.browse( uri );
}
- catch ( Exception e ) {
-
+ catch (Exception e) {
System.err.println( e.getMessage() );
}
Modified: incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginSoapClient.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginSoapClient.java?rev=1360091&r1=1360090&r2=1360091&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginSoapClient.java (original)
+++ incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginSoapClient.java Wed Jul 11 09:53:37 2012
@@ -1,6 +1,6 @@
package net.java.sip.communicator.plugin.openmeetings;
-
+import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Iterator;
@@ -30,9 +30,13 @@ import javax.xml.transform.stream.Stream
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import net.java.sip.communicator.util.Logger;
+
public class OpenmeetingsPluginSoapClient {
String serverUrl;
+ Logger logger = Logger.getLogger(OpenmeetingsPluginActivator.class);
+
private static final String NAMESPACE_PREFIX = "openmeetings";
@@ -47,18 +51,18 @@ public class OpenmeetingsPluginSoapClien
soapMessage.saveChanges();
-// System.out.println("\n Soap request:\n");
-// soapMessage.writeTo(System.out);
-// System.out.println();
+ logger.info("\n Soap request to " + getUserServiceUrl() + "\n");
+ logMessage(soapMessage);
final SOAPConnection soapConnection = getSoapConnection();
final SOAPMessage soapMessageReply = soapConnection.call(soapMessage, getUserServiceUrl());
-// System.out.println("\n Soap response:\n");
+ logger.info("\n Soap response:\n");
// soapMessageReply.writeTo(System.out);
// System.out.println();
+
//final String textContent = soapMessageReply.getSOAPBody().getChildElement();
-
- //System.out.println( "SID = " + textContent);
+ //logger.info( "SID = " + textContent);
+
soapConnection.close();
SOAPBody responseBody = soapMessageReply.getSOAPBody();
@@ -74,8 +78,19 @@ public class OpenmeetingsPluginSoapClien
return sid;
}
+
+ public void logMessage(SOAPMessage msg) {
+ try {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ msg.writeTo(out);
+ logger.info(new String(out.toByteArray()) + "\n\n");
+ } catch (Exception e) {
+ logger.error(e);
+ }
+ }
+
- private String login( final String sid, final String username, final String password) throws SOAPException, IOException {
+ private String login(final String sid, final String username, final String password) throws SOAPException, IOException {
final SOAPMessage soapMessage = getSoapMessage();
final SOAPBody soapBody = soapMessage.getSOAPBody();
final SOAPElement loginElement = soapBody.addChildElement("loginUser", NAMESPACE_PREFIX);
@@ -108,25 +123,27 @@ public class OpenmeetingsPluginSoapClien
return textContent;
}
- public String getInvitationHash( final String username, final String password, final String displayedName ) throws Exception {
+ public String getInvitationHash(final String username, final String password, final String displayedName) throws Exception {
final SOAPMessage soapMessage = getSoapMessage();
final SOAPBody soapBody = soapMessage.getSOAPBody();
final SOAPElement requestElement = soapBody.addChildElement("getInvitationHash", NAMESPACE_PREFIX);
- String sid = getSID( username, password );
+ logger.info(username + ":" + password + ":" + displayedName);
+
+ String sid = getSID(username, password);
String error_id = null;
try {
- error_id = login( sid, username, password);
+ error_id = login(sid, username, password);
} catch (Exception e) {
- System.out.println( e.getMessage() );
+ logger.info(e.getMessage());
}
if( !error_id.equals( "1" ) ){
- System.out.println("User cant login!");
+ logger.info("User cant login!");
return null;
}
- String room_id = getAvailableRooms( sid );
+ String room_id = getAvailableRooms(sid);
requestElement.addChildElement("SID", NAMESPACE_PREFIX).addTextNode(sid);
requestElement.addChildElement("username", NAMESPACE_PREFIX).addTextNode( displayedName );
@@ -134,20 +151,20 @@ public class OpenmeetingsPluginSoapClien
soapMessage.saveChanges();
-// System.out.println("\nGET INVITATION REQUEST:\n");
+ logger.info("\nGET INVITATION REQUEST:\n");
// soapMessage.writeTo(System.out);
// System.out.println();
final SOAPConnection soapConnection = getSoapConnection();
final SOAPMessage soapMessageReply = soapConnection.call(soapMessage, getJabberServiceUrl());
-// System.out.println("\nGET INVITATION RESPONSE:\n");
+ logger.info("\nGET INVITATION RESPONSE:\n");
// soapMessageReply.writeTo(System.out);
// System.out.println();
final String textContent = soapMessageReply.getSOAPBody().getFirstChild().getTextContent();
-// System.out.println( "INVITATION RESPONSE = " + textContent);
+ logger.info( "INVITATION RESPONSE = " + textContent);
soapConnection.close();
return textContent;
Modified: incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/openmeetingsplugin.manifest.mf
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/openmeetingsplugin.manifest.mf?rev=1360091&r1=1360090&r2=1360091&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/openmeetingsplugin.manifest.mf (original)
+++ incubator/openmeetings/trunk/plugins/jitsi/main/src/net/java/sip/communicator/plugin/openmeetings/openmeetingsplugin.manifest.mf Wed Jul 11 09:53:37 2012
@@ -34,4 +34,4 @@ Import-Package: org.osgi.framework,
net.java.sip.communicator.service.configuration,
javax.crypto,
javax.crypto.spec,
- sun.misc
\ No newline at end of file
+ sun.misc