Added XMPPSORobotApplication

13 files changed, 194 insertions, 158 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF
index 3a303ce15..b793875c7 100644
--- a/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF
@@ -10,4 +10,6 @@ Bundle-ClassPath: clients.jar
 Eclipse-AutoStart: true
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ecf,
- org.eclipse.ecf.presence
+ org.eclipse.ecf.presence,
+ org.eclipse.ecf.provider.xmpp
+ 
diff --git a/examples/bundles/org.eclipse.ecf.example.clients/plugin.xml b/examples/bundles/org.eclipse.ecf.example.clients/plugin.xml
index 415b1119f..7e0f87227 100644
--- a/examples/bundles/org.eclipse.ecf.example.clients/plugin.xml
+++ b/examples/bundles/org.eclipse.ecf.example.clients/plugin.xml
@@ -14,7 +14,7 @@
          name="Example SO Robot"
          point="org.eclipse.core.runtime.applications">
       <application>
-         <run class="org.eclipse.ecf.example.clients.SORobotApplication"/>
+         <run class="org.eclipse.ecf.example.clients.XMPPSORobotApplication"/>
       </application>
    </extension>
 
diff --git a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/SORobotApplication.java b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/SORobotApplication.java
deleted file mode 100644
index 393da6f24..000000000
--- a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/SORobotApplication.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.eclipse.ecf.example.clients;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.ecf.core.ISharedObjectContainer;
-import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.core.identity.IDFactory;
-import org.eclipse.ecf.core.util.ECFException;
-import org.eclipse.ecf.presence.IMessageListener;
-import org.eclipse.ecf.presence.chat.IChatMessageSender;
-import org.eclipse.ecf.presence.chat.IChatRoomContainer;
-
-public class SORobotApplication implements IPlatformRunnable, IMessageReceiver,
-IMessageListener {
-
-	private IChatMessageSender sender;
-	private boolean running = false;
-	private String userName;
-	
-	public synchronized Object run(Object args) throws Exception {
-		if (args instanceof Object[]) {
-			Object[] arguments = (Object[]) args;
-			while (arguments.length > 0 && arguments[0] instanceof String
-					&& ((String) arguments[0]).startsWith("-")) {
-				System.arraycopy(arguments, 1,
-						arguments = new Object[arguments.length - 1], 0,
-						arguments.length);
-			}
-			if (arguments.length == 4) {
-				if (arguments[0] instanceof String
-						&& arguments[1] instanceof String
-						&& arguments[2] instanceof String
-						&& arguments[3] instanceof String) {
-					userName = (String) arguments[0];
-					String hostName = (String) arguments[1];
-					String password = (String) arguments[2];
-					String roomName = (String) arguments[3];
-					runRobot(hostName, password, roomName);
-					return new Integer(0);
-				}
-			}
-		}
-		System.out
-				.println("Usage: pass in four arguments (username, hostname, password, roomname)");
-		return new Integer(-1);
-	}
-
-	private void runRobot(String hostName, String password, String roomName)
-			throws ECFException, Exception, InterruptedException {
-		// Create client and connect to host
-		XMPPChatClient client = new XMPPChatClient(this);
-		client.connect(userName + "@" + hostName, password);
-		// Create room of given name
-		IChatRoomContainer room = client.createChatRoom(roomName);
-		// Get ISharedObjectContainer adapter and add TrivialSharedObject to container
-		addSharedObject((ISharedObjectContainer) room.getAdapter(ISharedObjectContainer.class));
-		// Add this as message listener for room
-		room.addMessageListener(this);
-		// Connect to room with given room ID
-		room.connect(client.getChatRoomInfo().getRoomID(),null);
-	    // Get message sender interface for room
-		sender = room.getChatMessageSender();
-		running = true;
-		// Send initial message for room
-		sender
-				.sendMessage("Hi, I'm a robot. To get rid of me, send me a direct message.");
-		
-		while (running) {
-			wait();
-		}
-	}
-
-	protected void addSharedObject(ISharedObjectContainer soContainer) throws ECFException {
-		if (soContainer != null) {
-			// Create a new GUID for new TrivialSharedObject instance
-			ID newID = IDFactory.getDefault().createGUID();
-			// Create TrivialSharedObject
-			TrivialSharedObject tso = new TrivialSharedObject();
-			// Add shared object to container
-			soContainer.getSharedObjectManager().addSharedObject(newID, tso, null);
-		}
-	}
-	
-	public synchronized void handleMessage(String from, String msg) {
-		// direct message
-		try {
-			sender.sendMessage("gotta run");
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		running = false;
-		notifyAll();
-	}
-
-	public void handleMessage(ID fromID, ID toID, Type type, String subject,
-			String messageBody) {
-		System.out.println("Got message from "+fromID+": "+messageBody);
-	}
-
-
-}
diff --git a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/TrivialSharedObject.java b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/TrivialSharedObject.java
index c309bffff..d1312d764 100644
--- a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/TrivialSharedObject.java
+++ b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/TrivialSharedObject.java
@@ -1,18 +1,46 @@
 package org.eclipse.ecf.example.clients;
 
+import java.io.IOException;
+
 import org.eclipse.ecf.core.SharedObjectInitException;
+import org.eclipse.ecf.core.events.ISharedObjectMessageEvent;
+import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.sharedobject.AbstractSharedObject;
+import org.eclipse.ecf.core.sharedobject.SharedObjectMsg;
+import org.eclipse.ecf.core.sharedobject.SharedObjectMsgEvent;
+import org.eclipse.ecf.core.util.Event;
 
 public class TrivialSharedObject extends AbstractSharedObject {
 
 	public TrivialSharedObject() {
 		super();
-		System.out.println("TrivialSharedObject is here!");
 	}
 
 	protected void initialize() throws SharedObjectInitException {
 		super.initialize();
-		System.out.println("TrivialSharedObject with id "+getID());
 	}
-	
+	public void sendMessageTo(ID targetID, String message) {
+		try {
+			super.sendSharedObjectMsgTo(targetID, SharedObjectMsg.createMsg(
+					null, "handleMessage", message));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	protected Event handleSharedObjectMsgEvent(ISharedObjectMessageEvent event) {
+		try {
+			((SharedObjectMsgEvent) event.getData()).getSharedObjectMsg()
+					.invoke(this);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return event;
+	}
+
+	protected void handleMessage(String message) {
+		// XXX this should call the view back to display the message/do other things, etc
+		System.out.println("TrivialSharedObject.handleMessage(" + message + ")");
+	}
+
 }
diff --git a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPClient.java b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPClient.java
index b41056313..d4eb7a542 100644
--- a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPClient.java
+++ b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPClient.java
@@ -87,12 +87,15 @@ public class XMPPClient {
 	public void connect(String account, String password) throws ECFException {
 		setupContainer();
 		setupPresence();
+		doConnect(account,password);
+	}
+	protected void doConnect(String account, String password) throws ECFException  {
 		// Now connect
 		ID targetID = IDFactory.getDefault().createID(namespace, account);
 		container.connect(targetID,ConnectContextFactory.createPasswordConnectContext(password));
 		userID = getID(account);
 	}
-	private ID getID(String name) {
+	public ID getID(String name) {
 		try {
 			return IDFactory.getDefault().createID(namespace, name);
 		} catch (IDInstantiationException e) {
diff --git a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPSORobotApplication.java b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPSORobotApplication.java
new file mode 100644
index 000000000..ac4a88e3a
--- /dev/null
+++ b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPSORobotApplication.java
@@ -0,0 +1,108 @@
+package org.eclipse.ecf.example.clients;
+
+import org.eclipse.core.runtime.IPlatformRunnable;
+import org.eclipse.ecf.core.ISharedObjectContainer;
+import org.eclipse.ecf.core.identity.ID;
+import org.eclipse.ecf.core.identity.IDFactory;
+import org.eclipse.ecf.core.util.ECFException;
+import org.eclipse.ecf.presence.IPresence;
+import org.eclipse.ecf.presence.IPresenceListener;
+import org.eclipse.ecf.presence.IRosterEntry;
+
+public class XMPPSORobotApplication implements IPlatformRunnable, IMessageReceiver {
+
+	private boolean running = false;
+	private String userName;
+	private XMPPClient client;
+	private String targetIMUser;
+	private TrivialSharedObject sharedObject = null;
+	
+	public synchronized Object run(Object args) throws Exception {
+		if (args instanceof Object[]) {
+			Object[] arguments = (Object[]) args;
+			while (arguments.length > 0 && arguments[0] instanceof String
+					&& ((String) arguments[0]).startsWith("-")) {
+				System.arraycopy(arguments, 1,
+						arguments = new Object[arguments.length - 1], 0,
+						arguments.length);
+			}
+			if (arguments.length == 4) {
+				if (arguments[0] instanceof String
+						&& arguments[1] instanceof String
+						&& arguments[2] instanceof String
+						&& arguments[3] instanceof String) {
+					userName = (String) arguments[0];
+					String hostName = (String) arguments[1];
+					String password = (String) arguments[2];
+					String targetName = (String) arguments[3];
+					runRobot(hostName, password, targetName);
+					return new Integer(0);
+				}
+			}
+		}
+		System.out
+				.println("Usage: pass in four arguments (username, hostname, password, targetIMUser)");
+		return new Integer(-1);
+	}
+
+	private IPresenceListener getPresenceListener() {
+		return new IPresenceListener() {
+			public void handleContainerDeparted(ID departedContainer) {
+			}
+			public void handleContainerJoined(ID joinedContainer) {
+			}
+			public void handleRosterEntry(IRosterEntry entry) {
+			}
+			public void handleSetRosterEntry(IRosterEntry entry) {
+			}
+			public void handlePresence(ID fromID, IPresence presence) {
+			}};
+	}
+	private void runRobot(String hostName, String password, String targetIMUser)
+			throws ECFException, Exception, InterruptedException {
+		// Create client and connect to host
+		client = new XMPPClient(this, getPresenceListener());
+		client.setupContainer();
+		client.setupPresence();
+		// Get ISharedObjectContainer adapter and add TrivialSharedObject to container
+		ISharedObjectContainer socontainer = (ISharedObjectContainer) client.getContainer().getAdapter(ISharedObjectContainer.class);
+		createTrivialSharedObjectForContainer(socontainer);
+
+		client.doConnect(userName + "@" + hostName, password);
+		
+		this.targetIMUser = targetIMUser;
+		// Send initial message for room
+		client.sendMessage(targetIMUser,"Hi, I'm an im robot. To get rid of me, just send an IM back");
+		
+		running = true;
+		int count = 0;
+		while (running && count++ < 10) {
+			sendSOMessage(count+" hello there");
+			wait(10000);
+		}
+	}
+
+    protected void sendSOMessage(String msg) {
+    	if (sharedObject != null) {
+    		sharedObject.sendMessageTo(client.getID(targetIMUser),msg);
+    	}
+    }
+	protected void createTrivialSharedObjectForContainer(ISharedObjectContainer soContainer) throws ECFException {
+		if (soContainer != null) {
+			// Create a new GUID for new TrivialSharedObject instance
+			ID newID = IDFactory.getDefault().createStringID(TrivialSharedObject.class.getName());
+			// Create TrivialSharedObject
+			sharedObject = new TrivialSharedObject();
+			// Add shared object to container
+			soContainer.getSharedObjectManager().addSharedObject(newID, sharedObject, null);
+		}
+	}
+	
+	public synchronized void handleMessage(String from, String msg) {
+		// direct message
+		//client.sendMessage(from,"gotta run");
+		//running = false;
+		notifyAll();
+	}
+
+}
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
index 44ecfbda5..2e589183d 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
@@ -24,5 +24,4 @@ Require-Bundle: org.eclipse.ecf,
 Export-Package: org.eclipse.ecf.example.collab, org.eclipse.ecf.example.collab.share, org.eclipse.ecf.example.collab.share.url, org.eclipse.ecf.example.collab.share.io
 Eclipse-LazyStart: true
 Provide-Package: org.eclipse.ecf.example.collab
-Eclipse-RegisterBuddy: org.eclipse.ecf, org.eclipse.ecf.provider
 Bundle-ManifestVersion: 2
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 1.launch b/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 1.launch
index ddb0bc02b..39a3e47f2 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 1.launch
+++ b/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 1.launch
@@ -19,8 +19,8 @@
 <mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
 <mapEntry key="org.eclipse.ecf/debug/twophasecommiteventprocessor" value="true"/>
 <mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.team.ftp/requests" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
+<mapEntry key="org.eclipse.team.ftp/requests" value="true"/>
 <mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
 <mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/>
@@ -44,8 +44,8 @@
 <mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
 <mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
 <mapEntry key="org.eclipse.core.resources/restore" value="false"/>
+<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
 <mapEntry key="org.eclipse.ecf/debug/filter" value="*"/>
 <mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
@@ -59,22 +59,22 @@
 <mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
 <mapEntry key="org.eclipse.ecf/debug/idfactory" value="true"/>
 <mapEntry key="org.eclipse.ecf.example.collab/debug/genericsharedobject" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
 <mapEntry key="org.eclipse.ecf.provider.jmdns/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
 <mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectmanager" value="true"/>
 <mapEntry key="org.eclipse.ecf.datashare/debug" value="true"/>
 <mapEntry key="org.eclipse.ecf/debug/factoryinit" value="true"/>
-<mapEntry key="org.eclipse.ecf.sdo/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
+<mapEntry key="org.eclipse.ecf.sdo/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
+<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
 <mapEntry key="org.eclipse.ecf.sdo/EMFUpdateManager" value="true"/>
 <mapEntry key="org.eclipse.ecf.ui/debug/textchatcomposite" value="true"/>
 <mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
-<mapEntry key="org.eclipse.ecf.example.collab/debug/transactionsharedobject" value="true"/>
 <mapEntry key="org.eclipse.ecf.datashare/ConsistentMulticaster" value="true"/>
+<mapEntry key="org.eclipse.ecf.example.collab/debug/transactionsharedobject" value="true"/>
 <mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
 <mapEntry key="org.eclipse.ecf.example.collab/debug/flag" value="true"/>
@@ -83,12 +83,12 @@
 <mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewer_cache_debug" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
 <mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
+<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
 <mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.ecf.provider.xmpp/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
 <mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.xmpp/debug" value="true"/>
 <mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
@@ -99,36 +99,36 @@
 <mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/filter" value="*"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
 <mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
 <mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
 <mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
 <mapEntry key="org.eclipse.core.resources/natures" value="false"/>
+<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
 <mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
 <mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
 <mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider/debug/transactioneventprocessor" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
 <mapEntry key="org.eclipse.pde.build/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.irc/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectwrapper" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectwrapper" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.irc/debug/filter" value="*"/>
 <mapEntry key="org.eclipse.help.base/debug" value="true"/>
 <mapEntry key="org.eclipse.ecf.sdo/SharedDataGraph" value="true"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.jms/debug" value="true"/>
-<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
+<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
 <mapEntry key="org.eclipse.core.resources/strings" value="false"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
@@ -139,8 +139,8 @@
 <mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
 <mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
@@ -161,12 +161,12 @@
 <mapEntry key="org.eclipse.ecf.example.collab/debug/filter" value="*"/>
 <mapEntry key="org.eclipse.ecf.provider/debug" value="true"/>
 <mapEntry key="org.eclipse.ecf.example.collab/debug/urlsharedobject" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
 <mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
+<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
 <mapEntry key="org.eclipse.ecf.example.collab/debug" value="true"/>
 <mapEntry key="org.eclipse.ecf.provider.jms/debug/brokercontainer" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
 <mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
@@ -184,8 +184,8 @@
 <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
 <mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
 <mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
 <mapEntry key="org.eclipse.ecf.ui/debug/flag" value="true"/>
 <mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
@@ -204,20 +204,20 @@
 <mapEntry key="org.eclipse.ecf.provider/debug/connection" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.ecf.provider.jmdns/debug/flag" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.jms/debug/clientcontainer" value="true"/>
 <mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
+<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
 <mapEntry key="org.eclipse.ecf/debug/sharedobjectcontainerfactory" value="true"/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
+<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
 <mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
+<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
 <mapEntry key="org.eclipse.ecf/debug/flag" value="true"/>
 <mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
@@ -226,8 +226,8 @@
 <mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
 <mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
+<mapEntry key="org.eclipse.team.core/threading" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/packageadmin/timing" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
@@ -235,8 +235,8 @@
 <mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
 <mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
 <mapEntry key="org.eclipse.ecf.ui/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.team.ftp/list" value="true"/>
 <mapEntry key="org.eclipse.ecf.provider/debug/basesharedobject" value="false"/>
+<mapEntry key="org.eclipse.team.ftp/list" value="true"/>
 <mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
@@ -245,25 +245,25 @@
 <mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
+<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
+<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.jms/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.team.ftp/responses" value="true"/>
 <mapEntry key="org.eclipse.team.core/debug" value="false"/>
+<mapEntry key="org.eclipse.team.ftp/responses" value="true"/>
 <mapEntry key="org.eclipse.ecf.datashare/OrderedMulticaster" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
 <mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectcontext" value="true"/>
 <mapEntry key="org.eclipse.ecf.discovery/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectcontext" value="true"/>
 <mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
 <mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackdebug" value="true"/>
 <mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
@@ -271,16 +271,16 @@
 <mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
+<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmppgroupchatsharedobject" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
 <mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmpppresencesharedobject" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
+<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
 <mapEntry key="org.eclipse.ecf.provider.jms/debug/channel" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
@@ -293,11 +293,11 @@
 <mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
 <mapEntry key="org.eclipse.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/container" value="true"/>
 <mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/container" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ecf.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
+<mapEntry key="org.eclipse.ecf.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.ecf.provider.jmdns/debug" value="true"/>
 <mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
@@ -310,8 +310,8 @@
 <mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
 <mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/formatter/enable_new" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
 <mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
+<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
 <mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
 <mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
 </mapAttribute>
@@ -324,14 +324,12 @@
 <booleanAttribute key="clearws" value="false"/>
 <stringAttribute key="location1" value="C:\eclipse3.1m4\eclipse\runtime-workspace"/>
 <stringAttribute key="pde.version" value="3.2a"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value=""/>
 <stringAttribute key="templateConfig" value=""/>
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="clearConfig" value="false"/>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
 <booleanAttribute key="useDefaultConfig" value="true"/>
 <booleanAttribute key="askclear" value="false"/>
 <booleanAttribute key="includeOptional" value="true"/>
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml b/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml
index f3bc5e8e0..143facdde 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml
+++ b/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml
@@ -21,7 +21,7 @@
             class="org.eclipse.ecf.example.collab.ui.CollabRosterView"
             icon="icons/person.gif"
             id="org.eclipse.ecf.example.collab.ui.CollabRosterView"
-            name="ECF Collaboration Roster"/>
+            name="ECF Roster"/>
    </extension>
    <extension
          point="org.eclipse.ui.actionSets">
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/RosterSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/RosterSharedObject.java
index 8c2e96604..ed31dc89e 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/RosterSharedObject.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/RosterSharedObject.java
@@ -39,6 +39,6 @@ public class RosterSharedObject extends AbstractSharedObject {
 
 	protected void handleMessage(String message) {
 		// XXX this should call the view back to display the message/do other things, etc
-		System.out.println("GOT MESSAGE: " + message);
+		System.out.println("RosterSharedObject.handleMessage(" + message + ")");
 	}
 }
diff --git a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
index abe98aec9..b5ab7de2e 100644
--- a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ecf
 Provide-Package: org.eclipse.ecf.provider.comm.tcp, org.eclipse.ecf.provider.app, org.eclipse.ecf.provider.generic, org.eclipse.ecf.provider.generic.gmm
 Export-Package: org.eclipse.ecf.provider.comm.tcp, org.eclipse.ecf.provider.app, org.eclipse.ecf.provider.generic, org.eclipse.ecf.provider.generic.gmm
-Eclipse-RegisterBuddy: org.eclipse.ecf
-Eclipse-BuddyPolicy: dependent
+Eclipse-BuddyPolicy: global
 Bundle-ManifestVersion: 2
 
diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
index 8f6707180..bc7d98bfb 100644
--- a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Eclipse-LazyStart: true
 Eclipse-AutoStart: true
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.core.runtime
-Eclipse-BuddyPolicy: registered
 Provide-Package: org.eclipse.ecf.core,
  org.eclipse.ecf.core.comm,
  org.eclipse.ecf.core.comm.provider,
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF
index 506f3f6c0..3d264fd1a 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF
@@ -13,3 +13,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jivesoftware.smack
 Eclipse-AutoStart: true
 Export-Package: org.eclipse.ecf.provider.xmpp.container, org.eclipse.ecf.provider.xmpp.identity
+Eclipse-BuddyPolicy: global
+