Created build.xml for org.eclipse.ecf.test.provider and checked in.  Made 'custom builds' for necessary projects.  Built new integration version and checed into org.eclipse.ecf-feature
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 436d1f5..a62eb8a 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
@@ -221,7 +221,7 @@
 <mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/failure" value="false"/>
 </mapAttribute>
 <stringAttribute key="selectedPlugin" value="org.eclipse.ecf.provider"/>
-<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticAdd" value="false"/>
 <stringAttribute key="checked" value="org.eclipse.ecf.example.collab,org.eclipse.ecf.provider"/>
 <booleanAttribute key="includeFragments" value="false"/>
 <stringAttribute key="configLocation" value=""/>
@@ -230,14 +230,14 @@
 <stringAttribute key="templateConfig" value=""/>
 <booleanAttribute key="default" value="false"/>
 <stringAttribute key="vmargs" value="-Dsmack.debugEnabled=true"/>
-<booleanAttribute key="clearConfig" value="false"/>
+<booleanAttribute key="clearConfig" value="true"/>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="extplugins" value="org.apache.ant;org.apache.lucene;org.eclipse.compare;org.eclipse.core.expressions;org.eclipse.core.filebuffers;org.eclipse.core.resources;org.eclipse.core.runtime;org.eclipse.core.runtime.compatibility;org.eclipse.core.variables;org.eclipse.debug.core;org.eclipse.debug.ui;org.eclipse.help;org.eclipse.help.appserver;org.eclipse.help.base;org.eclipse.jdt.core;org.eclipse.jdt.debug;org.eclipse.jdt.debug.ui;org.eclipse.jdt.junit;org.eclipse.jdt.junit.runtime;org.eclipse.jdt.launching;org.eclipse.jdt.ui;org.eclipse.jface;org.eclipse.jface.text;org.eclipse.ltk.core.refactoring;org.eclipse.ltk.ui.refactoring;org.eclipse.osgi;org.eclipse.search;org.eclipse.swt;org.eclipse.swt.win32;org.eclipse.team.core;org.eclipse.team.cvs.core;org.eclipse.team.cvs.ui;org.eclipse.team.ui;org.eclipse.text;org.eclipse.ui;org.eclipse.ui.console;org.eclipse.ui.editors;org.eclipse.ui.forms;org.eclipse.ui.ide;org.eclipse.ui.views;org.eclipse.ui.workbench;org.eclipse.ui.workbench.texteditor;org.eclipse.update.configurator;org.eclipse.update.core;org.eclipse.update.ui;org.junit;"/>
+<stringAttribute key="extplugins" value=""/>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="progargs" value=""/>
 <booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="wsproject" value="com.composent.identity;com.composent.client;com.composent.comm;org.eclipse.ecf.test.ui;com.composent.api;"/>
+<stringAttribute key="wsproject" value="org.eclipse.emf.codegen.ecore.ui;org.eclipse.ecf.provider;org.eclipse.ltk.ui.refactoring;org.eclipse.ant.core;org.eclipse.team.ui;org.eclipse.emf.mapping;org.eclipse.ui.workbench.texteditor;org.eclipse.ui.workbench;org.eclipse.platform.doc.user;org.eclipse.xsd;org.eclipse.emf.mapping.ecore2ecore;org.eclipse.emf.mapping.ui;org.eclipse.ui.forms;org.eclipse.help.appserver;org.eclipse.ui.console;org.eclipse.jdt.debug;org.eclipse.help.base;org.eclipse.emf.common;org.eclipse.pde;org.eclipse.ecf.sdo;org.eclipse.jface;org.eclipse.core.variables;org.eclipse.ecf.example.collab;org.eclipse.jdt.doc.isv;org.eclipse.jdt.ui;org.eclipse.update.configurator;org.eclipse.update.ui;org.eclipse.emf.mapping.xsd2ecore;org.eclipse.team.cvs.ssh2;org.eclipse.update.core;org.eclipse.jdt.source;org.eclipse.emf.ecore.sdo.doc;org.eclipse.debug.core;org.eclipse.help.ide;org.eclipse.sdk;org.eclipse.emf.ecore.sdo.editor;org.eclipse.emf.ecore.change.edit;org.eclipse.emf.common.ui;org.eclipse.ui.cheatsheets;org.eclipse.ecf.example.sdo.editor;org.eclipse.debug.ui;org.eclipse.compare;org.eclipse.ecf.test.sdo;org.apache.ant;org.eclipse.pde.build;org.eclipse.ui.presentations.r21;org.eclipse.emf.ecore.sdo;org.eclipse.emf.source;org.eclipse.jdt.junit.runtime;org.eclipse.ui.editors;org.eclipse.core.expressions;org.eclipse.jdt.junit;org.eclipse.pde.core;org.eclipse.platform.source;org.eclipse.jface.text;org.eclipse.team.cvs.ui;org.eclipse.core.boot;org.eclipse.emf.edit;org.eclipse.swt;org.eclipse.xsd.edit;org.eclipse.core.runtime;org.eclipse.ui.externaltools;org.eclipse.emf.mapping.ecore2ecore.editor;org.eclipse.emf.ecore;org.eclipse.help.webapp;org.eclipse.pde.doc.user;org.eclipse.emf.ecore.sdo.source;org.eclipse.xsd.editor;org.eclipse.emf.codegen.ecore;org.eclipse.ant.ui;org.eclipse.emf.doc;org.eclipse.emf.ecore.xmi;org.eclipse.xsd.test;org.eclipse.emf.mapping.xsd2ecore.editor;org.eclipse.osgi;org.eclipse.tomcat;org.apache.lucene;org.eclipse.pde.runtime;org.eclipse.help.ui;org.eclipse.ui.views;org.eclipse.ecf.test.provider;org.eclipse.search;org.eclipse.emf;org.eclipse.jdt.doc.user;org.eclipse.text;org.eclipse.core.runtime.compatibility;org.eclipse.platform;org.eclipse.platform.doc.isv;org.eclipse.team.core;org.junit;org.eclipse.ui.ide;org.eclipse.emf.ecore.change;org.eclipse.osgi.util;org.eclipse.pde.ui;org.eclipse.ui.intro;org.eclipse.jdt.launching;org.eclipse.emf.codegen.ui;org.eclipse.help;org.eclipse.core.resources;org.eclipse.team.cvs.ssh;org.eclipse.team.cvs.core;org.eclipse.osgi.services;org.eclipse.emf.codegen;org.eclipse.pde.source;org.eclipse.update.scheduler;org.eclipse.emf.ecore.sdo.edit;org.eclipse.jdt;org.eclipse.pde.junit.runtime;org.eclipse.jdt.core;org.eclipse.jdt.debug.ui;org.eclipse.ecf;org.eclipse.ui;org.eclipse.core.filebuffers;org.eclipse.xsd.doc;org.eclipse.xsd.source;org.eclipse.emf.edit.ui;org.eclipse.emf.ecore.edit;org.eclipse.emf.ecore.editor;org.eclipse.ltk.core.refactoring;org.eclipse.emf.commonj.sdo;org.eclipse.ui.win32;org.eclipse.ui.workbench.compatibility;org.eclipse.update.core.win32;org.eclipse.swt.win32;org.eclipse.platform.source.win32.win32.x86;org.eclipse.core.resources.win32;"/>
 <booleanAttribute key="askclear" value="true"/>
 <stringAttribute key="location0" value="C:\eclipse3.1m4\eclipse\runtime-workspace"/>
 </launchConfiguration>
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 2.launch b/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 2.launch
index 193da34..7007dbc 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 2.launch
+++ b/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 2.launch
@@ -8,37 +8,37 @@
 <stringAttribute key="location2" value="C:\eclipse3.1m4\eclipse\runtime-workspace"/>
 <mapAttribute key="tracingOptions">
 <mapEntry key="org.eclipse.ecf.example.collab/debug/urlsharedobject" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmppsharedobject" value="true"/>
 <mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmppsharedobject" value="true"/>
 <mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackconnection" value="true"/>
 <mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.ecf.example.collab/debug" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/strings" value="false"/>
+<mapEntry key="org.eclipse.ecf.example.collab/debug" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/loader/debug/filter/loader" value="*"/>
 <mapEntry key="org.eclipse.core.runtime/loader/debug/actions" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/timing/shutdown" 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.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
+<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider/debug/filter" value="*"/>
 <mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/packages" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/loader/debug" value="false"/>
 <mapEntry key="org.eclipse.core.resources/monitor/listeners" value="false"/>
 <mapEntry key="org.eclipse.ant.core/debug" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
 <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
@@ -49,14 +49,14 @@
 <mapEntry key="org.eclipse.ecf/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/registry/debug/dump" value=""/>
+<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
 <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.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.ecf.ui/debug/flag" value="true"/>
 <mapEntry key="org.eclipse.ecf/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ecf.ui/debug/flag" value="true"/>
 <mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
 <mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
 <mapEntry key="org.eclipse.ecf.example.collab/debug/progsharedobject" value="false"/>
@@ -64,8 +64,8 @@
 <mapEntry key="org.eclipse.ecf.provider.xmpp/debug/flag" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
+<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
 <mapEntry key="org.eclipse.ecf/debug/idfactory" value="true"/>
 <mapEntry key="org.eclipse.ecf/debug/connectionfactory" value="true"/>
@@ -80,15 +80,15 @@
 <mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
 <mapEntry key="org.eclipse.ecf/debug/factoryinit" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/part.activate" value="false"/>
-<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.osgi/trace/filters" value="trace.properties"/>
+<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.core.runtime/registry/debug/events/extension" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
 <mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
 <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.core.resources/refresh" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
 <mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
@@ -96,12 +96,12 @@
 <mapEntry key="org.eclipse.ecf.example.collab/debug/flag" value="true"/>
 <mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/errorondeadlock" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider/debug/flag" value="true"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/jobs/errorondeadlock" 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.ecf.provider.xmpp/debug" value="true"/>
 <mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
@@ -121,31 +121,31 @@
 <mapEntry key="org.eclipse.ecf.ui/debug/filter" value="*"/>
 <mapEntry key="org.eclipse.ecf.provider/debug/basesharedobject" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
 <mapEntry key="org.eclipse.core.resources/monitor/builders" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save/markers" 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.ecf.provider/debug/gmm" value="false"/>
 <mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/workbench.restore" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/selection" 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.ui/trace/workbench.restore" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/part.create" value="false"/>
 <mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<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.team.cvs.core/dirtycaching" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/>
 <mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/loader/debug/properties" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/include.timings" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
@@ -156,15 +156,15 @@
 <mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectcontext" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" 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/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.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/debug/pluginstopper" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackdebug" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/workbench.start" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/contenttypes/debug" value="false"/>
@@ -173,8 +173,8 @@
 <mapEntry key="org.eclipse.ecf.provider/debug/connectionping" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/uijob.longwarning" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/uijob.longwarning" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/page.listeners" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
@@ -184,36 +184,36 @@
 <mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
 <mapEntry key="org.eclipse.jdt.debug.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
+<mapEntry key="org.eclipse.debug.core/debug" value="true"/>
 <mapEntry key="org.eclipse.help/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/perspective" value="false"/>
 <mapEntry key="org.eclipse.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/container" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/container" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
 <mapEntry key="org.eclipse.ecf.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/config/debug" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
 <mapEntry key="org.eclipse.jdt.debug/debug" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/part.listeners" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="false"/>
-<mapEntry key="org.eclipse.ecf.example.collab/debug/filter" value="*"/>
-<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.ecf.example.collab/debug/filter" value="*"/>
 <mapEntry key="org.eclipse.core.runtime/loader/debug/filter/class" value="*"/>
 <mapEntry key="org.eclipse.ecf.provider/debug" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/preferences/debug" value="false"/>
@@ -228,16 +228,16 @@
 <booleanAttribute key="clearws" value="false"/>
 <stringAttribute key="location1" value="C:\eclipse3.1m4\eclipse\second-runtime-workspace"/>
 <stringAttribute key="templateConfig" value=""/>
-<stringAttribute key="vmargs" value=""/>
 <booleanAttribute key="default" value="false"/>
-<booleanAttribute key="clearConfig" value="false"/>
+<stringAttribute key="vmargs" value=""/>
+<booleanAttribute key="clearConfig" value="true"/>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="extplugins" value="org.apache.ant;org.apache.lucene;org.eclipse.compare;org.eclipse.core.expressions;org.eclipse.core.filebuffers;org.eclipse.core.resources;org.eclipse.core.runtime;org.eclipse.core.runtime.compatibility;org.eclipse.core.variables;org.eclipse.debug.core;org.eclipse.debug.ui;org.eclipse.help;org.eclipse.help.appserver;org.eclipse.help.base;org.eclipse.jdt.core;org.eclipse.jdt.debug;org.eclipse.jdt.debug.ui;org.eclipse.jdt.junit;org.eclipse.jdt.junit.runtime;org.eclipse.jdt.launching;org.eclipse.jdt.ui;org.eclipse.jface;org.eclipse.jface.text;org.eclipse.ltk.core.refactoring;org.eclipse.ltk.ui.refactoring;org.eclipse.osgi;org.eclipse.search;org.eclipse.swt;org.eclipse.swt.win32;org.eclipse.team.core;org.eclipse.team.cvs.core;org.eclipse.team.cvs.ui;org.eclipse.team.ui;org.eclipse.text;org.eclipse.ui;org.eclipse.ui.console;org.eclipse.ui.editors;org.eclipse.ui.forms;org.eclipse.ui.ide;org.eclipse.ui.views;org.eclipse.ui.workbench;org.eclipse.ui.workbench.texteditor;org.eclipse.update.configurator;org.eclipse.update.core;org.eclipse.update.ui;org.junit;"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="extplugins" value=""/>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="progargs" value=""/>
-<stringAttribute key="wsproject" value="com.composent.identity;com.composent.client;com.composent.comm;org.eclipse.ecf.test.ui;com.composent.api;"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<stringAttribute key="wsproject" value="org.eclipse.ecf.provider.xmpp;org.eclipse.ecf.test;org.eclipse.ecf.ui;org.eclipse.ecf.test.ui;"/>
 <booleanAttribute key="askclear" value="true"/>
 <stringAttribute key="location0" value="C:\eclipse3.1m4\eclipse\second-runtime-workspace"/>
 </launchConfiguration>