Menu
▾
▴
[Smartfrog-checkins] SF.net SVN: smartfrog: [4743] trunk/core/extras/avalanche/AvalancheCore
|
From: <tim...@us...> - 2007-07-19 16:47:54
|
Revision: 4743
http://svn.sourceforge.net/smartfrog/?rev=4743&view=rev
Author: tim_doering
Date: 2007-07-19 09:47:50 -0700 (Thu, 19 Jul 2007)
Log Message:
-----------
SFOS-293: One XMPPAdapter class for server/client in order to reduce redundancy. May possibily break the ignition process.
Modified Paths:
--------------
trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/client/monitor/xmpp/SFAvalancheEventService.java
trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/ServerSetup.java
trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/engines/sf/BootStrap.java
trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/monitor/handlers/HostUpdateRosterHandler.java
trunk/core/extras/avalanche/AvalancheCore/test/org/smartfrog/services/avalanche/test/system/avalanche/server/XMPPClientStub.java
Removed Paths:
-------------
trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/client/monitor/xmpp/XMPPAdapter.java
trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/monitor/xmpp/
Modified: trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/client/monitor/xmpp/SFAvalancheEventService.java
===================================================================
--- trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/client/monitor/xmpp/SFAvalancheEventService.java 2007-07-19 15:44:53 UTC (rev 4742)
+++ trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/client/monitor/xmpp/SFAvalancheEventService.java 2007-07-19 16:47:50 UTC (rev 4743)
@@ -15,11 +15,11 @@
import org.smartfrog.avalanche.shared.MonitoringConstants;
import org.smartfrog.avalanche.shared.MonitoringEvent;
import org.smartfrog.avalanche.shared.MonitoringEventDefaultImpl;
+import org.smartfrog.avalanche.shared.xmpp.XMPPAdapter;
import org.smartfrog.sfcore.common.SmartFrogException;
import org.smartfrog.sfcore.prim.Prim;
import org.smartfrog.sfcore.prim.PrimImpl;
import org.smartfrog.sfcore.prim.TerminationRecord;
-
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.rmi.RemoteException;
@@ -37,11 +37,11 @@
public class SFAvalancheEventService extends PrimImpl implements Prim {
private String xmppServer ;
- private int xmppServerPort = 5223;
+ private int xmppServerPort = XMPPAdapter.default_xmpp_port;
private String xmppPassword ;
private boolean useSSL = true;
private String xmppListenerUserId ;
- private XMPPAdapter adapter ;
+ private XMPPAdapter adapter ;
public SFAvalancheEventService() throws RemoteException {
super();
@@ -53,15 +53,15 @@
*/
public synchronized void sfDeploy() throws SmartFrogException, RemoteException {
super.sfDeploy();
-
- adapter = new XMPPAdapter(useSSL);
- // check system properties
+
+ // check system properties
xmppServer = System.getProperty("AVALANCHE_EVENT_SERVER");
String p = System.getProperty("AVALANCHE_EVENT_SERVER_PORT");
- if( null == xmppServer ){
+
+ if( null == xmppServer ){
throw new SmartFrogException("Avalanche server name not specified");
}
- adapter.setXmppServer(xmppServer);
+ adapter = new XMPPAdapter(xmppServer, useSSL);
if( null != p ){
xmppServerPort = Integer.parseInt(p);
@@ -87,10 +87,11 @@
try{
sfLog().info("Starting XMPP Client Adapter, server = " + xmppServer
+ " this host = " + adapter.getXmppUserName());
- adapter.init();
-
-
- // send an event to server allowing to subscribe for Roter notification.
+
+ adapter.init();
+ adapter.login();
+
+ // send an event to server allowing to subscribe for Roter notification.
MonitoringEvent event = new MonitoringEventDefaultImpl();
event.setHost(InetAddress.getLocalHost().getHostName());
event.setInstanceName("None");
Deleted: trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/client/monitor/xmpp/XMPPAdapter.java
===================================================================
--- trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/client/monitor/xmpp/XMPPAdapter.java 2007-07-19 15:44:53 UTC (rev 4742)
+++ trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/client/monitor/xmpp/XMPPAdapter.java 2007-07-19 16:47:50 UTC (rev 4743)
@@ -1,166 +0,0 @@
-/**
-(C) Copyright 1998-2007 Hewlett-Packard Development Company, LP
-
-This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-For more information: www.smartfrog.org
-*/
-package org.smartfrog.avalanche.client.monitor.xmpp;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jivesoftware.smack.Roster;
-import org.jivesoftware.smack.SSLXMPPConnection;
-import org.jivesoftware.smack.XMPPConnection;
-import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smack.packet.Message;
-import org.smartfrog.avalanche.shared.MonitoringEvent;
-import org.smartfrog.avalanche.shared.XMPPEventExtension;
-
-/**
- *
- * XMPPAdapter is used by client components for sending monitoring events
- * over XMPP. In case of smartfrog there is a smartfrog wrapper for this component
- * on all machines, which will be used by other smartfrog components.
- * All messages sent by this clients are addressed to User Id for listener in Avalanche
- * Server.
- * @author sanjaydahiya
- *
- */
-public class XMPPAdapter {
-
- public static final int default_xmpp_port = 5222;
- public static final int default_xmpp_port_ssl = 5223;
-
- private String xmppServer ;
- private int xmppServerPort ;
- private String xmppListenerName ;
-
- private String xmppUserName ;
- private String xmppPassword ;
-
- private boolean useSSL = true ;
- private static XMPPConnection connection ;
-
- private static Log log = LogFactory.getLog(XMPPAdapter.class);
-
- /**
- *
- * @param useSSL if SSL should be used for messages.
- */
- public XMPPAdapter(boolean useSSL) {
- this.useSSL = useSSL ;
- if( useSSL ){
- xmppServerPort = 5223 ;
- }else{
- xmppServerPort = 5222 ;
- }
- }
-
- public boolean isUseSSL() {
- return useSSL;
- }
-
- public String getXmppPassword() {
- return xmppPassword;
- }
-
- public void setXmppPassword(String xmppPassword) {
- this.xmppPassword = xmppPassword;
- }
-
- public String getXmppServer() {
- return xmppServer;
- }
-
- public void setXmppServer(String xmppServer) {
- this.xmppServer = xmppServer;
- }
-
- public int getXmppServerPort() {
- return xmppServerPort;
- }
-
- public void setXmppServerPort(int xmppServerPort) {
- this.xmppServerPort = xmppServerPort;
- }
-
- public String getXmppListenerName() {
- return xmppListenerName;
- }
-
- public void setXmppListenerName(String xmppListenerName) {
- this.xmppListenerName = xmppListenerName;
- }
-
- public String getXmppUserName() {
- return xmppUserName;
- }
-
- public void setXmppUserName(String xmppUserName) {
- this.xmppUserName = xmppUserName;
- }
-
- /**
- * Log in to server.
- * @throws XMPPException
- */
- public void init() throws XMPPException{
- if( null == connection ){
- if( useSSL ){
- connection = new SSLXMPPConnection(xmppServer, xmppServerPort);
- }else{
- connection = new XMPPConnection(xmppServer, xmppServerPort);
- }
- }
-
- connection.login(xmppUserName, xmppPassword);
- log.info("Logged into xmpp server");
- // Accept incoming roster subscription requests by default.
- connection.getRoster().setSubscriptionMode(Roster.SUBSCRIPTION_ACCEPT_ALL);
- }
-
- public void close() {
- if ( null != connection ){
- connection.close();
- connection = null ;
- }
- }
-
- /**
- * Sends xmpp event to server, from where listener should pick it. The message is addressed to listener
- * If message delivery fails, its logged and discarded. The failed events are not queued for later
- * delivery as the event may have no relevance later, also this event may lead to invocation of a number
- * of handlers on the server.
- * @param event
- * @throws XMPPException
- */
- public void sendEvent(MonitoringEvent event) throws XMPPException{
- try{
- if( connection == null ){
- init();
- }else {
- if ( ! connection.isConnected() ){
- connection = null ;
- init();
- }
- }
-
- Message msg = new Message(xmppListenerName + "@"+ xmppServer, Message.Type.HEADLINE);
- msg.setBody("AE");
- msg.addExtension(new XMPPEventExtension(event));
- connection.sendPacket(msg);
-
- }catch(XMPPException e){
- // Failed sending message. log this message and move on.
- log.error("Failed sending Event : " + event);
- // close connection if error, try reconnect on next message
- connection.close();
- connection = null ;
- }
- }
-}
Modified: trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/ServerSetup.java
===================================================================
--- trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/ServerSetup.java 2007-07-19 15:44:53 UTC (rev 4742)
+++ trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/ServerSetup.java 2007-07-19 16:47:50 UTC (rev 4743)
@@ -11,19 +11,14 @@
*/
package org.smartfrog.avalanche.server;
-import org.jivesoftware.smack.AccountManager;
import org.jivesoftware.smack.XMPPException;
-import org.smartfrog.avalanche.server.modules.ModuleCreationException;
import org.smartfrog.avalanche.server.monitor.handlers.ActiveProfileUpdateHandler;
import org.smartfrog.avalanche.server.monitor.handlers.HostUpdateHandler;
import org.smartfrog.avalanche.server.monitor.handlers.HostUpdateRosterHandler;
-import org.smartfrog.avalanche.server.monitor.xmpp.XMPPAdapter;
+import org.smartfrog.avalanche.shared.xmpp.XMPPAdapter;
import org.smartfrog.sfcore.logging.Log;
import org.smartfrog.sfcore.logging.LogFactory;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Wrapper class for Avalanche server initialization and shutdown. This can be used independently
* to embed Avalanche server in a program. @see startup() starts Avalanche server.
@@ -65,21 +60,23 @@
*
*/
public class ServerSetup {
+ private String xmppServer = "localhost";
+ private int xmppServerPort = 0;
- private String xmppServer ;
- private int xmppServerPort ;
- private String xmppServerAdminUser ;
+ private String xmppServerAdminUser ;
private String xmppServerAdminPassword ;
private String useSSLForXMPP ;
- private String avalancheHome ;
+
+ private String avalancheHome ;
private String eventListenerUser = "avl" ;
private String eventListenerPwd = "xlistener" ;
-
-
+
private static Log log = LogFactory.getLog(ServerSetup.class);
- static XMPPAdapter adminAdapter = new XMPPAdapter();
- static XMPPAdapter listenerAdapter = new XMPPAdapter();
+
+ // Create XMPP Adapters with SSL support
+ static XMPPAdapter adminAdapter = null;
+ static XMPPAdapter listenerAdapter = null;
AvalancheFactory factory = AvalancheFactory.getFactory(AvalancheFactory.BDB);
@@ -151,86 +148,86 @@
* should be set properly before calling this method.
* @throws Exception
*/
- public void startup() throws Exception {
- log.info("Initializing Avalanche ...");
- log.info("Using Avalanche Home : " + avalancheHome) ;
-
+ public void startup() throws Exception {
+ log.info("Initializing Avalanche ...");
+ log.info("Using Avalanche Home : " + avalancheHome);
+
//factory.init(avalancheHome, avalancheServerOS);
factory.init(avalancheHome);
-
- // set up Avalanche XMPP adapters, this assumes XMPP server is already up
- // running
- try{
- if( null != xmppServer){
- adminAdapter.setXmppServer(xmppServer);
- }
- adminAdapter.setXmppServerPort(xmppServerPort);
- if( null != useSSLForXMPP ){
- adminAdapter.setUseSSL((new Boolean(useSSLForXMPP)).booleanValue());
- }
-
- // default is use SSL over XMPP running on localhost with default port 5223
+
+ // set up Avalanche XMPP adapters, this assumes XMPP server is already up
+ // running
+ try {
+ // Creating Adapter to the server specified
+ adminAdapter = new XMPPAdapter(xmppServer, true);
+
+ // Setting the server port
+ if (xmppServerPort != 0)
+ adminAdapter.setXmppServerPort(xmppServerPort);
+
+ // Setting SSL mode
+ if (null != useSSLForXMPP)
+ adminAdapter.setUseSSL((new Boolean(useSSLForXMPP)).booleanValue());
+
+ // Setting username and password
+ adminAdapter.setXmppUserName(xmppServerAdminUser);
+ adminAdapter.setXmppPassword(xmppServerAdminPassword);
+
+ // Initialize the connection
adminAdapter.init();
-
- try{
- adminAdapter.getConnection().login(xmppServerAdminUser, xmppServerAdminPassword);
- log.info("Connected to XMPP server") ;
- AccountManager am = adminAdapter.getConnection().getAccountManager();
-
- // create a user for listener if it doesnt exist already.
- // TODO: create listener with a secure password.
- if(am.supportsAccountCreation() ){
- Map attrs = new HashMap();
- attrs.put("email", "admin@avalanche");
- attrs.put("name", "admin");
- attrs.put("registered", "false");
- am.createAccount(eventListenerUser, eventListenerPwd , attrs);
- log.info("Added Listener in XMPP server") ;
- }
- }catch(XMPPException e){
- log.error("XMPP error : " + e);
- }
-
- // create a new connection for listener
- if( null != xmppServer){
- listenerAdapter.setXmppServer(xmppServer);
+ try {
+ // Log in to the XMPP Server
+ adminAdapter.login();
+ // Create the listening user
+ adminAdapter.createUser(eventListenerUser, eventListenerPwd, "admin");
+ } catch (XMPPException e) {
+ log.error("Error while creating listening user. Exception: " + e);
}
- listenerAdapter.setXmppServerPort(xmppServerPort);
- if( null != useSSLForXMPP ){
- listenerAdapter.setUseSSL((new Boolean(useSSLForXMPP)).booleanValue());
- }
-
- // default is use SSL over XMPP running on localhost with default port 5223
- listenerAdapter.init();
- try{
- listenerAdapter.getConnection().login(eventListenerUser, eventListenerPwd);
- log.info("Connected to XMPP server ...") ;
-
- }catch(XMPPException e){
- log.error("XMPP error, Listener Login failed : " + e);
- }
-
- // handler chain for events coming from client nodes.
- listenerAdapter.addHandler(new ActiveProfileUpdateHandler(this));
- // register inbuilt event listeners
- listenerAdapter.registerListeners();
-
- // register Roster Handlers with the HostManager
- // this causes Avalanche to register/un register for events
- // of the hosts.
- HostUpdateHandler hostHandler = new HostUpdateRosterHandler(adminAdapter, listenerAdapter);
- HostManager hostManager = factory.getHostManager() ;
- hostManager.addHandler(hostHandler);
-
- // TODO : Start Smartfrog on server if its not already running using avalancheHome
-
- }catch(XMPPException e){
- log.fatal("Avalanche InitializAtion failed : ", e);
- }catch(ModuleCreationException e){
- log.fatal("Avalanche InitializAtion failed : ", e);
- }
- }
+ // create a new connection for listener
+ listenerAdapter = new XMPPAdapter(xmppServer, true);
+
+ // Setting the server port
+ if (xmppServerPort != 0)
+ listenerAdapter.setXmppServerPort(xmppServerPort);
+
+ // Setting SSL mode
+ if (null != useSSLForXMPP)
+ listenerAdapter.setUseSSL((new Boolean(useSSLForXMPP)).booleanValue());
+
+ // Setting username and password
+ listenerAdapter.setXmppUserName(eventListenerUser);
+ listenerAdapter.setXmppPassword(eventListenerPwd);
+
+ // Initialize the connection
+ listenerAdapter.init();
+ try {
+ // Log in to the XMPP server as listening user
+ listenerAdapter.login();
+ } catch (XMPPException e) {
+ // Log error
+ log.error("Error while logging onto XMPP server. Exception: " + e);
+ }
+
+ // handler chain for events coming from client nodes.
+ listenerAdapter.addHandler(new ActiveProfileUpdateHandler(this));
+ // register inbuilt event listeners
+ listenerAdapter.registerListeners();
+
+ // register Roster Handlers with the HostManager
+ // this causes Avalanche to register/un register for events
+ // of the hosts.
+ HostUpdateHandler hostHandler = new HostUpdateRosterHandler(adminAdapter, listenerAdapter);
+
+ HostManager hostManager = factory.getHostManager();
+ hostManager.addHandler(hostHandler);
+
+ // TODO : Start Smartfrog on server if its not already running using avalancheHome
+
+ } catch (XMPPException e) {
+ log.fatal("Avalanche InitializAtion failed : ", e);
+ }
+ }
public XMPPAdapter getAdminAdapter(){
return adminAdapter ;
@@ -239,27 +236,6 @@
public XMPPAdapter getListenerAdapter(){
return listenerAdapter ;
}
-
-
- public void addClientAdapter(String clientUser) {
- try {
- AccountManager am = adminAdapter.getConnection().getAccountManager();
-
- // create a user for client if it doesnt exist already.
- // TODO: create client with a secure password.
- if(am.supportsAccountCreation() ){
- Map attrs = new HashMap();
- attrs.put("name", clientUser);
- //TODO: currently uname and pwd are same for sending events
- // change it
- String clientPwd = clientUser;
- am.createAccount(clientUser, clientPwd , attrs);
- log.info("Added Client User in XMPP server for host...." + clientUser) ;
- }
- }catch(XMPPException e){
- log.error("XMPP error : " + e);
- }
- }
/**
* Shuts down Avalanche server.
Modified: trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/engines/sf/BootStrap.java
===================================================================
--- trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/engines/sf/BootStrap.java 2007-07-19 15:44:53 UTC (rev 4742)
+++ trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/engines/sf/BootStrap.java 2007-07-19 16:47:50 UTC (rev 4743)
@@ -107,7 +107,7 @@
HashMap map = new HashMap();
for( int i=0;i<hosts.length;i++){
// create client adapter in XMPP server
- setup.addClientAdapter(hosts[i]);
+ setup.getAdminAdapter().createUser(hosts[i], hosts[i], hosts[i]);
HostType h = hostManager.getHost(hosts[i]);
HostType.AccessModes am = h.getAccessModes();
Modified: trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/monitor/handlers/HostUpdateRosterHandler.java
===================================================================
--- trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/monitor/handlers/HostUpdateRosterHandler.java 2007-07-19 15:44:53 UTC (rev 4742)
+++ trunk/core/extras/avalanche/AvalancheCore/src/org/smartfrog/avalanche/server/monitor/handlers/HostUpdateRosterHandler.java 2007-07-19 16:47:50 UTC (rev 4743)
@@ -13,15 +13,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jivesoftware.smack.AccountManager;
import org.jivesoftware.smack.Roster;
import org.jivesoftware.smack.RosterEntry;
+import org.jivesoftware.smack.XMPPException;
import org.smartfrog.avalanche.core.host.HostType;
-import org.smartfrog.avalanche.server.monitor.xmpp.XMPPAdapter;
+import org.smartfrog.avalanche.shared.xmpp.XMPPAdapter;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Whenever a new Host is added to Avalanche server, this handler is called
* it creates a user in XMPP server for the new Host. Similarly it is also
@@ -35,79 +32,63 @@
private XMPPAdapter adminAdapter ;
private XMPPAdapter listenerAdapter ;
private static Log log = LogFactory.getLog(HostUpdateRosterHandler.class);
- private Roster roster ;
- public HostUpdateRosterHandler(XMPPAdapter adminAdapter, XMPPAdapter listenerAdapter){
- this.adminAdapter = adminAdapter;
- this.listenerAdapter = listenerAdapter ;
- roster = this.listenerAdapter.getRoster();
+ private Roster roster;
+
+ public HostUpdateRosterHandler(XMPPAdapter adminAdapter, XMPPAdapter listenerAdapter){
+ // Save XMPP adapters
+ this.adminAdapter = adminAdapter;
+ this.listenerAdapter = listenerAdapter;
+ // Save roster
+ roster = this.listenerAdapter.getRoster();
}
/**
- * Creates a user for the host, in case of failure it logs the error as fatal.
+ * Creates a user for the host, in case of failure it logs the error.
*/
public void hostAdded(HostType h) {
- // create a user for this host if it doesnt exist
- String hostAddress = null ;
- try{
- AccountManager am = adminAdapter.getConnection().getAccountManager();
-
-
- java.net.InetAddress inetAdd = java.net.InetAddress.getByName(h.getId());
- hostAddress = inetAdd.getHostName() ;
-
- log.debug("Using IP address for " + h.getId() + " -> " + hostAddress) ;
- // TODO: create user with a secure password.
- if(am.supportsAccountCreation() ){
- Map attrs = new HashMap();
- attrs.put("email", hostAddress+ "@avalanche");
- attrs.put("name", h.getId());
- attrs.put("registered", "false");
- am.createAccount(hostAddress, hostAddress , attrs);
- log.info("Create XMPP Account for Host : " +hostAddress) ;
- }
- }catch(Exception e){
- log.error("Error !! "+ e) ;
- }
-
- /* // Now registering for Roster in ActiveProfileUpdateHandler after we get a notification from the
- * // client that XMPP client in smartfrog is started.
- * // register roster
- // In a different try block as if account already exist last operation may fail
- // no harm in trying to register for roster.
- try{
- roster.createEntry(hostAddress+"@"+adminAdapter.getXmppServer() , hostAddress, null ) ;
- log.info("Created Roster Entry for : " + hostAddress);
- }catch(Exception e){
- log.fatal("Roster Add failed for host :" +hostAddress);
- }
- */
+ String hostAddress = null ;
+
+ try {
+ java.net.InetAddress inetAdd = java.net.InetAddress.getByName(h.getId());
+ hostAddress = inetAdd.getHostName() ;
+ } catch (Exception e) {
+ log.error("Host unknown. " + e);
+ }
+
+ // Create user
+ adminAdapter.createUser(hostAddress, hostAddress, h.getId());
+
+ try {
+ // Add roster entry
+ roster.createEntry(hostAddress + "@" + adminAdapter.getXmppServer(), hostAddress, null);
+ log.info("Successfully added roster for host \"" + hostAddress + "\".");
+ } catch (XMPPException xe) {
+ log.error("Could not add roster for host \"" + hostAddress + "\". Exception: " + xe);
+ }
}
/**
- * Creates a user for the host, in case of failure it logs the error as fatal.
+ * Deletes the username used by the host, in case of failure it logs the error.
*/
public void hostDeleted(String hostId) {
-
- // login as host and delete the account in XMPP server.
- XMPPAdapter hostAdapter = new XMPPAdapter();
- hostAdapter.setXmppServer(adminAdapter.getXmppServer());
- hostAdapter.setXmppServerPort(adminAdapter.getXmppServerPort());
- hostAdapter.setUseSSL(adminAdapter.isUseSSL());
-
- try{
- hostAdapter.init();
- java.net.InetAddress inetAdd = java.net.InetAddress.getByName(hostId);
- String hostAddress = inetAdd.getHostName() ;
-
-
- hostAdapter.getConnection().login(hostAddress, hostAddress);
-
- AccountManager am = hostAdapter.getConnection().getAccountManager();
- am.deleteAccount();
- RosterEntry re = roster.getEntry(hostId) ;
- roster.removeEntry(re);
-
- }catch(Exception e){
- log.error("Account deletion was not complete : " + e);
- }
- }
+ String hostAddress = null;
+
+ try {
+ java.net.InetAddress inetAdd = java.net.InetAddress.getByName(hostId);
+ hostAddress = inetAdd.getHostName();
+ } catch (Exception e) {
+ log.error("Host unknown. " + e);
+ }
+
+ // Delete user
+ adminAdapter.deleteUser(hostAddress, hostAddress);
+
+ try {
+ // Remove roster entry
+ RosterEntry re = roster.getEntry(hostId);
+ roster.removeEntry(re);
+ log.info("Successfully removed roster for host \"" + hostAddress + "\".");
+ } catch (Exception e) {
+ log.error("Error while removing roster for user \"" + hostId + "\". Exception:" + e);
+ }
+ }
}
Modified: trunk/core/extras/avalanche/AvalancheCore/test/org/smartfrog/services/avalanche/test/system/avalanche/server/XMPPClientStub.java
===================================================================
--- trunk/core/extras/avalanche/AvalancheCore/test/org/smartfrog/services/avalanche/test/system/avalanche/server/XMPPClientStub.java 2007-07-19 15:44:53 UTC (rev 4742)
+++ trunk/core/extras/avalanche/AvalancheCore/test/org/smartfrog/services/avalanche/test/system/avalanche/server/XMPPClientStub.java 2007-07-19 16:47:50 UTC (rev 4743)
@@ -11,14 +11,14 @@
*/
package tests.org.smartfrog.avalanche.server;
-import org.smartfrog.avalanche.client.monitor.xmpp.XMPPAdapter;
+import org.smartfrog.avalanche.shared.xmpp.XMPPAdapter;
import org.smartfrog.avalanche.shared.MonitoringConstants;
import org.smartfrog.avalanche.shared.MonitoringEvent;
import org.smartfrog.avalanche.shared.MonitoringEventDefaultImpl;
-
+// TODO: Test Settings _OBSOLETE_!
public class XMPPClientStub {
- XMPPAdapter adapter = new XMPPAdapter(true);
+ XMPPAdapter adapter = new XMPPAdapter(null, true);
String hostId = "192.168.1.102" ;
public void run() throws Exception{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|