Commit 8aecdf80 authored by Gabriel Guardincerri's avatar Gabriel Guardincerri Committed by gguardin

Fixed problems with the CS configuration webservices

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9947 b35dd754-fafc-0310-a699-88a17e54d16e
parent d4c62d84
...@@ -17,8 +17,6 @@ import org.apache.commons.httpclient.HttpMethod; ...@@ -17,8 +17,6 @@ import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.UsernamePasswordCredentials; import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.auth.AuthScope; import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.methods.*; import org.apache.commons.httpclient.methods.*;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element; import org.dom4j.Element;
import org.dom4j.Node; import org.dom4j.Node;
import org.dom4j.io.XMPPPacketReader; import org.dom4j.io.XMPPPacketReader;
...@@ -27,7 +25,6 @@ import org.jivesoftware.openfire.XMPPServerInfo; ...@@ -27,7 +25,6 @@ import org.jivesoftware.openfire.XMPPServerInfo;
import org.jivesoftware.openfire.auth.AuthFactory; import org.jivesoftware.openfire.auth.AuthFactory;
import org.jivesoftware.openfire.auth.UnauthorizedException; import org.jivesoftware.openfire.auth.UnauthorizedException;
import static org.jivesoftware.openfire.clearspace.ClearspaceManager.HttpType.GET; import static org.jivesoftware.openfire.clearspace.ClearspaceManager.HttpType.GET;
import static org.jivesoftware.openfire.clearspace.ClearspaceManager.HttpType.POST;
import static org.jivesoftware.openfire.clearspace.WSUtils.getReturn; import static org.jivesoftware.openfire.clearspace.WSUtils.getReturn;
import org.jivesoftware.openfire.component.ExternalComponentConfiguration; import org.jivesoftware.openfire.component.ExternalComponentConfiguration;
import org.jivesoftware.openfire.component.ExternalComponentManager; import org.jivesoftware.openfire.component.ExternalComponentManager;
...@@ -434,8 +431,8 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM ...@@ -434,8 +431,8 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
List<String> bindInterfaces = getServerInterfaces(); List<String> bindInterfaces = getServerInterfaces();
String path = IM_URL_PREFIX + "configureComponent/" + serverInfo.getXMPPDomain() + String path = IM_URL_PREFIX + "configureComponent/" + serverInfo.getXMPPDomain() +
"/" + WSUtils.marshallList(bindInterfaces) + "/" + "/" + WSUtils.marshallList(bindInterfaces) +
String.valueOf(ExternalComponentManager.getServicePort()); "/" + String.valueOf(ExternalComponentManager.getServicePort());
executeRequest(GET, path); executeRequest(GET, path);
...@@ -498,16 +495,20 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM ...@@ -498,16 +495,20 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
private void updateClearspaceSharedSecret(String newSecret) { private void updateClearspaceSharedSecret(String newSecret) {
try { try {
String path = IM_URL_PREFIX + "updateSharedSecret"; String path = IM_URL_PREFIX + "updateSharedSecret/" + newSecret;
executeRequest(GET, path);
//TODO use the post method
/*
// Creates the XML with the data // Creates the XML with the data
Document groupDoc = DocumentHelper.createDocument(); Document groupDoc = DocumentHelper.createDocument();
Element rootE = groupDoc.addElement("updateSharedSecret"); Element rootE = groupDoc.addElement("updateSharedSecret");
rootE.addElement("newSecret").setText(newSecret rootE.addElement("newSecret").setText(newSecret
); );
executeRequest(POST, path, groupDoc.asXML()); executeRequest(POST, path, groupDoc.asXML());
*/
} catch (UnauthorizedException ue) { } catch (UnauthorizedException ue) {
// TODO what should happen here? should continue? // TODO what should happen here? should continue?
} catch (Exception e) { } catch (Exception e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment