Author: ggrekhov
Date: Mon Jul 9 03:51:04 2012
New Revision: 1358901
URL: http://svn.apache.org/viewvc?rev=1358901&view=rev
Log:
Jitsi: full url of OM server
Modified:
incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigManager.java
incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigPanel.java
incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginSoapClient.java
Modified:
incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigManager.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigManager.java?rev=1358901&r1=1358900&r2=1358901&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigManager.java
(original)
+++
incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigManager.java
Mon Jul 9 03:51:04 2012
@@ -23,6 +23,8 @@ import org.osgi.framework.ServiceReferen
public class OpenmeetingsConfigManager {
private String server;
+ private String protoPrefix;
+ private String omUriContext;
private String login;
private String password;
private String stringForHash = "user:";
@@ -100,8 +102,7 @@ public class OpenmeetingsConfigManager {
}
public String getCreationUrl() throws Exception{
-
- final String url = "http://"+ getServer() +
"/client/username="+getLogin()+"&password="+getPassword()+
+ final String url = getProtoPrefix() + getServer() +
"/client/username="+getLogin()+"&password="+getPassword()+
"&hash=" + getHash();
System.out.println( "CREATION URL = " + url );
return url;
@@ -114,9 +115,10 @@ public class OpenmeetingsConfigManager {
}
public String getInvitationUrl( String displayedName ) throws Exception{
-
+ String protoPrefix = getProtoPrefix();
String server = getServer();
- soapClient.setServer( server );
+ String uriContext = getOmUriContext();
+ soapClient.setServerUrl(protoPrefix + server + uriContext);
String invitationHash = null;
@@ -195,17 +197,48 @@ public class OpenmeetingsConfigManager {
return configurationService;
}
- public void setSever( String server ){
- this.server = server;
+ public void setServer(String server){
+ this.server = server;
getConfigurationService().setProperty(
"plugin.openmeetings.SERVER", server);
-
}
public String getServer() {
String value = (String)getConfigurationService().getProperty(
"plugin.openmeetings.SERVER" );
+ if (null == value) {
+ value = "";
+ }
server = value;
return server;
}
+ public void setProtoPrefix(String protoPrefix){
+ this.protoPrefix = protoPrefix;
+
getConfigurationService().setProperty("plugin.openmeetings.PROTOCOL_PREFIX",
protoPrefix);
+ }
+ public String getProtoPrefix() {
+ String value =
(String)getConfigurationService().getProperty("plugin.openmeetings.PROTOCOL_PREFIX");
+ if (null == value) {
+ value = "";
+ }
+ protoPrefix = value;
+ return protoPrefix;
+ }
+
+ public void setOmUriContext(String omUriContext){
+ this.omUriContext = omUriContext;
+
getConfigurationService().setProperty("plugin.openmeetings.OM_URI_CONTEXT",
omUriContext);
+ }
+ public String getOmUriContext() {
+ String value =
(String)getConfigurationService().getProperty("plugin.openmeetings.OM_URI_CONTEXT");
+ if (null == value) {
+ value = "";
+ }
+ if (!value.endsWith("/")) {
+ value += "/";
+ }
+ omUriContext = value;
+ return omUriContext;
+ }
+
public void setLogin( String login ){
this.login = login;
getConfigurationService().setProperty(
"plugin.openmeetings.LOGIN", login);
Modified:
incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigPanel.java?rev=1358901&r1=1358900&r2=1358901&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigPanel.java
(original)
+++
incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsConfigPanel.java
Mon Jul 9 03:51:04 2012
@@ -71,8 +71,12 @@ public class OpenmeetingsConfigPanel
passwordPanel.add( lblPassword );
passwordPanel.add( tePassword );
-
- teServer.setText( OpenmeetingsConfigManager.getInstance().getServer()
);
+ OpenmeetingsConfigManager cfg =
OpenmeetingsConfigManager.getInstance();
+ String serverUri = cfg.getServer();
+ if (!serverUri.isEmpty()) {
+ serverUri = cfg.getProtoPrefix() + serverUri +
cfg.getOmUriContext();
+ }
+ teServer.setText(serverUri);
teLogin.setText( OpenmeetingsConfigManager.getInstance().getLogin() );
tePassword.setText(
OpenmeetingsConfigManager.getInstance().getPassword() );
@@ -136,11 +140,30 @@ public class OpenmeetingsConfigPanel
* @param e <tt>ActionEvent</tt>.
*/
public void actionPerformed(ActionEvent e)
- {
- OpenmeetingsConfigManager.getInstance().setSever(
teServer.getText() );
- OpenmeetingsConfigManager.getInstance().setLogin(
teLogin.getText() );
+ {
+ String protoPrefix = "http://";;
+ String serverUri = teServer.getText();
+ String uriContext = "/";
+ if (serverUri.startsWith("http://";)) {
+ protoPrefix = "http://";;
+ serverUri = serverUri.substring(protoPrefix.length());
+ } else if (serverUri.startsWith("https://";)) {
+ protoPrefix = "https://";;
+ serverUri = serverUri.substring(protoPrefix.length());
+ }
+ int slashPos = serverUri.indexOf('/');
+ if (slashPos >= 0) {
+ uriContext = serverUri.substring(slashPos);
+ serverUri = serverUri.substring(0, slashPos);
+ }
+
+ OpenmeetingsConfigManager cfg =
OpenmeetingsConfigManager.getInstance();
+ cfg.setServer(serverUri);
+ cfg.setProtoPrefix(protoPrefix);
+ cfg.setOmUriContext(uriContext);
+ cfg.setLogin( teLogin.getText() );
try {
-
OpenmeetingsConfigManager.getInstance().setPassword( new String(
tePassword.getPassword() ) );
+ cfg.setPassword(new
String(tePassword.getPassword()));
} catch (Exception e1) {
e1.printStackTrace();
}
Modified:
incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginSoapClient.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginSoapClient.java?rev=1358901&r1=1358900&r2=1358901&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginSoapClient.java
(original)
+++
incubator/openmeetings/trunk/plugins/jitsi/main/java/net/java/sip/communicator/plugin/openmeetings/OpenmeetingsPluginSoapClient.java
Mon Jul 9 03:51:04 2012
@@ -266,21 +266,21 @@ public class OpenmeetingsPluginSoapClien
- public void setServer( String serverUrl_ ){
- serverUrl = serverUrl_;
+ public void setServerUrl(String serverUrl_){
+ serverUrl = serverUrl_;
}
-
- private String getServer(){
+
+ private String getServerUrl(){
return serverUrl;
}
-
- private String getUserServiceUrl(){
- String url = "http://"; + getServer() +
"/openmeetings/services/UserService?wsdl";
+
+ private String getUserServiceUrl(){
+ String url = getServerUrl() + "services/UserService?wsdl";
System.out.println( "URL = " + url);
return url;
}
- private String getJabberServiceUrl(){
- String url = "http://"; + getServer() +
"/openmeetings/services/JabberService?wsdl";
+ private String getJabberServiceUrl(){
+ String url = getServerUrl() + "services/JabberService?wsdl";
System.out.println( "URL = " + url);
return url;
}
