Made discovery and server creation asynchronous upon ECF collab plugin startup. Added boolean entry to preference page. Improved DiscoveryView UI

7 files changed, 165 insertions, 132 deletions

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 acd9fcbec..1e4bec857 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
@@ -16,8 +16,8 @@
 <mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
 <mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
 <mapEntry key="org.eclipse.core.resources/contenttype/cache" 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.ecf.sdo/DataGraphSharingFactory" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
@@ -31,8 +31,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"/>
@@ -46,22 +46,22 @@
 <mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
 <mapEntry key="org.eclipse.ecf/debug/idfactory" value="false"/>
 <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="false"/>
 <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.core.runtime/registry/debug/events/extension" value="false"/>
 <mapEntry key="org.eclipse.ecf.ui/debug/textchatcomposite" value="true"/>
-<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"/>
@@ -70,12 +70,12 @@
 <mapEntry key="org.eclipse.osgi/resolver/debug" 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.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"/>
@@ -83,23 +83,23 @@
 <mapEntry key="org.eclipse.help/debug/context" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/requires" 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.runtime/loader/debug/activateplugin" 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.core.runtime/loader/debug/filter/native" value="*"/>
+<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.core.runtime/loader/debug/filter/native" value="*"/>
 <mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="false"/>
+<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.core.runtime/preferences/get" value="false"/>
@@ -108,18 +108,18 @@
 <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/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.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.runtime/contenttypes/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
+<mapEntry key="org.eclipse.core.runtime/contenttypes/debug" value="false"/>
 <mapEntry key="org.eclipse.core.resources/strings" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/checkCoreBindingGetJavaElement" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/timing/startup" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
@@ -128,8 +128,8 @@
 <mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/allTypesCache" 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"/>
@@ -150,13 +150,13 @@
 <mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/failure" value="false"/>
 <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.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.core.runtime/loader/debug/filter/loader" value="*"/>
 <mapEntry key="org.eclipse.core.runtime/loader/debug/actions" 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.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"/>
@@ -176,10 +176,10 @@
 <mapEntry key="org.eclipse.core.runtime/preferences/set" value="false"/>
 <mapEntry key="org.eclipse.team.core/streams" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/jobs/locks" 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.jdt.ui/debug/TypeConstraints" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/keyBindings" 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.ecf.ui/debug/flag" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
 <mapEntry key="org.eclipse.ecf.example.collab/debug/progsharedobject" value="false"/>
@@ -187,24 +187,24 @@
 <mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
 <mapEntry key="org.eclipse.ecf/debug/connectionfactory" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/checkCoreBindingIsEqualTo" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
 <mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
 <mapEntry key="org.eclipse.ecf.example.collab/debug/filetransfersharedobject" value="true"/>
 <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.core.runtime/registry/debug/events/plugin" value="false"/>
+<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.osgi/debug/messageBundles" value="false"/>
 <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.help.webapp/debug" value="true"/>
 <mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" 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"/>
@@ -212,17 +212,17 @@
 <mapEntry key="org.eclipse.ecf.provider/debug/flag" value="true"/>
 <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.core.runtime/preferences/general" value="false"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/syncinfo" 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"/>
 <mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/loader/debug/filter/resource" value="*"/>
+<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
 <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"/>
@@ -231,42 +231,42 @@
 <mapEntry key="org.eclipse.osgi/monitor/resources" 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.core.runtime/url/debug/cachecopy" value="false"/>
+<mapEntry key="org.eclipse.pde.core/cache" 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.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.core.runtime/jobs/beginend" 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.core/debug" value="false"/>
 <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="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/useUIBindingGetJavaElement" value="false"/>
 <mapEntry key="org.eclipse.ecf.discovery/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/useUIBindingGetJavaElement" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectcontext" 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.core.runtime/debug/pluginstopper" 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/perf/uijob" value="200"/>
 <mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" 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.ui/trace/contexts" 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/build/invoking" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/loader/debug/failure" 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.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.ui/perf/page.listeners" value="200"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
 <mapEntry key="org.eclipse.core.resources/history" value="false"/>
@@ -277,11 +277,11 @@
 <mapEntry key="org.eclipse.help/debug" value="true"/>
 <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="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.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"/>
@@ -293,10 +293,10 @@
 <mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.jmdns/debug/jmdns" value="true"/>
 <mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="false"/>
 <mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
+<mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
+<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
 <mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
 </mapAttribute>
 <stringAttribute key="selectedPlugin" value="org.eclipse.ecf.provider"/>
@@ -307,15 +307,15 @@
 <booleanAttribute key="clearws" value="false"/>
 <stringAttribute key="location1" value="C:\eclipse3.1m4\eclipse\runtime-workspace"/>
 <stringAttribute key="templateConfig" value=""/>
-<stringAttribute key="vmargs" value=""/>
 <booleanAttribute key="default" value="true"/>
+<stringAttribute key="vmargs" value=""/>
 <booleanAttribute key="clearConfig" value="true"/>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" 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"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="progargs" value=""/>
-<booleanAttribute key="askclear" value="true"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <mapAttribute key="org.eclipse.debug.core.environmentVariables">
 <mapEntry key="smack.debugEnabled" value="true"/>
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPlugin.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPlugin.java
index 8d8fa8eef..36162571d 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPlugin.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPlugin.java
@@ -15,8 +15,10 @@ import java.net.URL;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.resource.FontRegistry;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.widgets.Shell;
@@ -79,8 +81,28 @@ public class ClientPlugin extends AbstractUIPlugin implements
 		//this.getPreferenceStore().setDefault(ClientPlugin.PREF_CONFIRM_FILE_RECEIVE, true);
 		this.getPreferenceStore().setDefault(ClientPlugin.PREF_CONFIRM_REMOTE_VIEW, true);
 		
-		this.getPreferenceStore().setDefault(ClientPlugin.PREF_START_SERVER,false);
-		this.getPreferenceStore().setDefault(ClientPlugin.PREF_REGISTER_SERVER,false);
+		this.getPreferenceStore().setDefault(ClientPlugin.PREF_START_SERVER,true);
+		this.getPreferenceStore().setDefault(ClientPlugin.PREF_REGISTER_SERVER,true);
+		this.getPreferenceStore().setDefault(ClientPlugin.PREF_START_DISCOVERY,true);
+	}
+	
+	class ClientStartupJob extends Job {
+
+		public ClientStartupJob(String name) {
+			super(name);
+		}
+
+		protected IStatus run(IProgressMonitor monitor) {
+			try {
+				initDiscovery();
+				initServer();
+			} catch (Exception e) {
+				log("Exception on initialization",e);
+			}
+			return new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, "Discovery complete", null);
+		}
+		
+		
 	}
 	/**
 	 * This method is called upon plug-in activation
@@ -88,33 +110,37 @@ public class ClientPlugin extends AbstractUIPlugin implements
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		setPreferenceDefaults();
-		initDiscovery();
-		initServer();
+		ClientStartupJob job = new ClientStartupJob("Setting up Dynamic Service Discovery");
+		job.schedule();
 	}
 
-	protected void initDiscovery() {
-		if (discoveryStartup == null) {
+	protected synchronized void initDiscovery() throws Exception {
+		if (discoveryStartup == null && getPreferenceStore().getBoolean(PREF_START_DISCOVERY)) {
 			discoveryStartup = new DiscoveryStartup();
 		}
 	}
 	
-	protected void initServer() {
-		if (serverStartup == null) {
+	protected synchronized void initServer() throws Exception {
+		if (serverStartup == null && getPreferenceStore().getBoolean(PREF_START_SERVER)) {
 			serverStartup = new ServerStartup();
 		}
 	}
 	
-	protected boolean isDiscoveryActive() {
+	protected synchronized boolean isDiscoveryActive() {
 		if (discoveryStartup == null) return false;
-		else return true;
+		else return discoveryStartup.isActive();
+	}
+	protected synchronized boolean isServerActive() {
+		if (serverStartup == null) return false;
+		else return serverStartup.isActive();
 	}
-	protected void disposeDiscovery() {
+	protected synchronized void disposeDiscovery() {
 		if (discoveryStartup != null) {
 			discoveryStartup.dispose();
 			discoveryStartup = null;
 		}
 	}
-	protected void disposeServer() {
+	protected synchronized void disposeServer() {
 		if (serverStartup != null) {
 			serverStartup.dispose();
 			serverStartup = null;
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPluginConstants.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPluginConstants.java
index 7d41019ed..722af3cdd 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPluginConstants.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPluginConstants.java
@@ -33,7 +33,7 @@ public interface ClientPluginConstants {
 	
 	public static final String PREF_START_SERVER = "startServerOnStartup";
 	public static final String PREF_REGISTER_SERVER = "registerServerOnStartup";
-	
+	public static final String PREF_START_DISCOVERY = "startDiscoveryOnStartup";
 	/*
 	 * Contstants used to describe decoration images.
 	 */
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
index 8a67f8d01..5f97c0079 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
@@ -11,6 +11,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.ecf.core.ISharedObjectContainer;
 import org.eclipse.ecf.core.SharedObjectContainerFactory;
+import org.eclipse.ecf.core.SharedObjectContainerInstantiationException;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.identity.IDFactory;
 import org.eclipse.ecf.core.identity.ServiceID;
@@ -31,6 +32,7 @@ import org.eclipse.ui.PlatformUI;
 
 public class DiscoveryStartup {
 
+	protected static final String DISCOVERYVIEW_ID = "org.eclipse.ecf.ui.view.discoveryview";
 	public static final String DISCOVERY_CONTAINER = "org.eclipse.ecf.provider.jmdns.container.JmDNS";
 	public static final String TCPSERVER_DISCOVERY_TYPE = "_ecftcp._tcp.local.";
 	public static final String PROP_PROTOCOL_NAME = "protocol";
@@ -52,7 +54,7 @@ public class DiscoveryStartup {
     static String serviceTypes[] = new String[] {
             TCPSERVER_DISCOVERY_TYPE
         };
-	public DiscoveryStartup() {
+	public DiscoveryStartup() throws Exception {
 		setupDiscovery();
 	}
 	
@@ -63,35 +65,38 @@ public class DiscoveryStartup {
 		}
 		discovery = null;
 	}
-	
-	protected void setupDiscovery() {
-		if (discovery == null && ClientPlugin.getDefault().getPreferenceStore().getBoolean(ClientPlugin.PREF_REGISTER_SERVER)) {
-			try {
-				socontainer = SharedObjectContainerFactory
-						.getDefault().makeSharedObjectContainer(DISCOVERY_CONTAINER);
-				discovery = (IDiscoveryContainer) socontainer
-						.getAdapter(IDiscoveryContainer.class);
-				if (discovery != null) {
-					setupDiscoveryContainer(discovery);
-					socontainer.joinGroup(null,null);
-					//registerServiceTypes();
-				}
-				else {
-					if (socontainer != null) {
-						socontainer.dispose(1000);
-						socontainer = null;
-					}
-					discovery = null;
-					ClientPlugin.log("No discovery container available");
-				}
-			} catch (Exception e) {
+	protected boolean isActive() {
+		return discovery != null;
+	}
+	protected void setupDiscovery() throws Exception {
+		try {
+			socontainer = SharedObjectContainerFactory
+					.getDefault().makeSharedObjectContainer(DISCOVERY_CONTAINER);
+			discovery = (IDiscoveryContainer) socontainer
+					.getAdapter(IDiscoveryContainer.class);
+			if (discovery != null) {
+				setupDiscoveryContainer(discovery);
+				socontainer.joinGroup(null,null);
+			}
+			else {
 				if (socontainer != null) {
 					socontainer.dispose(1000);
 					socontainer = null;
 				}
 				discovery = null;
-				ClientPlugin.log("Exception creating discovery container",e);
+				ClientPlugin.log("No discovery container available");
+			}
+		} catch (SharedObjectContainerInstantiationException e1) {
+			socontainer = null;
+			discovery = null;
+			return;
+		} catch (Exception e) {
+			if (socontainer != null) {
+				socontainer.dispose(1000);
+				socontainer = null;
 			}
+			discovery = null;
+			throw e;
 		}
 	}
 
@@ -127,7 +132,7 @@ public class DiscoveryStartup {
                     IWorkbenchWindow ww = PlatformUI.getWorkbench()
                             .getActiveWorkbenchWindow();
                     IWorkbenchPage wp = ww.getActivePage();
-                    IViewPart view = wp.showView("org.eclipse.ecf.ui.view.discoveryview");
+                    IViewPart view = wp.showView(DISCOVERYVIEW_ID);
                     discoveryView = (DiscoveryView) view;
                     discoveryView.setShowTypeDetails(false);
                     discoveryView.setDiscoveryController(new IDiscoveryController() {
@@ -136,13 +141,11 @@ public class DiscoveryStartup {
 						}
 
 						public void setupDiscoveryContainer(DiscoveryView dview) {
-							System.out.println("setupDiscoveryContainer");	
-							ClientPlugin.getDefault().initDiscovery();
+							//ClientPlugin.getDefault().initDiscovery();
 						}
 
 						public void disposeDiscoveryContainer(DiscoveryView dview) {
-							System.out.println("disposeDiscoveryContainer");						
-							ClientPlugin.getDefault().disposeDiscovery();
+							//ClientPlugin.getDefault().disposeDiscovery();
 						}
 
 						public IDiscoveryContainer getDiscoveryContainer() {
@@ -183,6 +186,7 @@ public class DiscoveryStartup {
 				}});
         }
 	}
+    
 	public static void unregisterServerType() {
 		if (discovery != null) {
 			discovery.unregisterAllServices();
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java
index 981e2860a..eb11557b1 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java
@@ -24,40 +24,31 @@ public class ServerStartup {
 
 	static List servers = new ArrayList();
 	
-	public ServerStartup() {
-		if (ClientPlugin.getDefault().getPreferenceStore().getBoolean(ClientPlugin.PREF_START_SERVER)) {
-			try {
-				InputStream ins = this.getClass().getResourceAsStream(SERVER_FILE_NAME);
-				if (ins != null) {
-					createServers(ins);
-				}
-			} catch (Exception e) {
-				ClientPlugin.log("Exception in ServerStartup initialization",e);
-			}
+	public ServerStartup() throws Exception {
+		InputStream ins = this.getClass().getResourceAsStream(SERVER_FILE_NAME);
+		if (ins != null) {
+			createServers(ins);
 		}
 	}
-	
+	protected boolean isActive() {
+		return (servers.size() > 0);
+	}
 	public void dispose() {
 		destroyServers();
 	}
 	protected synchronized void destroyServers() {
-		if (servers != null) {
-			for (Iterator i = servers.iterator(); i.hasNext();) {
-				TCPServerSOContainer s = (TCPServerSOContainer) i.next();
-				DiscoveryStartup.unregisterServer(s);
-				if (s != null) {
-					try {
-						s.dispose(5000);
-					} catch (Exception e) {
-						ClientPlugin.log("Exception destroying server "
-								+ s.getConfig().getID());
-					}
+		for (Iterator i = servers.iterator(); i.hasNext();) {
+			TCPServerSOContainer s = (TCPServerSOContainer) i.next();
+			DiscoveryStartup.unregisterServer(s);
+			if (s != null) {
+				try {
+					s.dispose(5000);
+				} catch (Exception e) {
+					ClientPlugin.log("Exception destroying server " + s.getConfig().getID());
 				}
 			}
-			servers.clear();
-			servers = null;
 		}
-
+		servers.clear();
 		if (serverGroups != null) {
 			for (int i = 0; i < serverGroups.length; i++) {
 				serverGroups[i].takeOffTheAir();
@@ -84,7 +75,9 @@ public class ServerStartup {
 							.getIDForGroup(), serverGroups[j], group.getName(),
 							connect.getTimeout());
 					servers.add(cont);
-					registerServer(cont);
+					if (ClientPlugin.getDefault().getPreferenceStore().getBoolean(ClientPlugin.PREF_REGISTER_SERVER)) {
+						registerServer(cont);
+					}
 					ClientPlugin.log("ECF group server created: "+cont.getConfig().getID().getName());
 				}
 				serverGroups[j].putOnTheAir();
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ClientPreferencePage.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ClientPreferencePage.java
index 2396cf350..e1d8702bf 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ClientPreferencePage.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ClientPreferencePage.java
@@ -57,9 +57,9 @@ public class ClientPreferencePage extends FieldEditorPreferencePage implements
 		addField(new ColorFieldEditor(ClientPlugin.PREF_OTHER_TEXT_COLOR, "Chat Text Color For Other:", getFieldEditorParent()));
 		addField(new ColorFieldEditor(ClientPlugin.PREF_SYSTEM_TEXT_COLOR, "Chat Text Color For System:", getFieldEditorParent()));
 		
-		addField(new BooleanFieldEditor(ClientPlugin.PREF_START_SERVER,"Start ECF Group Server on Startup",getFieldEditorParent()));
-		addField(new BooleanFieldEditor(ClientPlugin.PREF_REGISTER_SERVER,"Register ECF Group Server on Startup",getFieldEditorParent()));
-		
+		addField(new BooleanFieldEditor(ClientPlugin.PREF_START_DISCOVERY,"Activate ECF Discovery on Startup",getFieldEditorParent()));
+		addField(new BooleanFieldEditor(ClientPlugin.PREF_START_SERVER,"Activate ECF Server on Startup",getFieldEditorParent()));
+		addField(new BooleanFieldEditor(ClientPlugin.PREF_REGISTER_SERVER,"Publish Local Server for Discovery",getFieldEditorParent()));
 		/*IntegerFieldEditor rate = new IntegerFieldEditor(ClientPlugin.PREF_FILE_TRANSFER_RATE,
 				"Maximum transfer rate for file transfers.", getFieldEditorParent());*/
 		/*rate.setTextLimit(5);
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java
index d203b563f..a5ac038eb 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java
@@ -48,14 +48,15 @@ import org.eclipse.ui.part.ViewPart;
 
 
 public class DiscoveryView extends ViewPart {
-    protected static final int TREE_EXPANSION_LEVELS = 3;
+    protected static final int SERVICE_INFO_TIMEOUT = 3000;
+	protected static final int TREE_EXPANSION_LEVELS = 3;
 	private TreeViewer viewer;
 	private Action requestServiceInfoAction;
 	private Action registerServiceTypeAction;
 	private Action connectToAction;
 	private Action disconnectContainerAction;
 	private Action connectContainerAction;
-	
+
 	IDiscoveryContainer dcontainer = null;
 	ISharedObjectContainer socontainer = null;
 	IDiscoveryController controller = null;
@@ -446,7 +447,16 @@ public class DiscoveryView extends ViewPart {
     protected void expandAll() {
         viewer.expandToLevel(TREE_EXPANSION_LEVELS);
     }
+    /*
+	private void hookDoubleClickAction() {
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+			public void doubleClick(DoubleClickEvent event) {
+				selectedDoubleClickAction.run();
+			}
+		});
+	}
 
+*/
 	private void makeActions() {
 		requestServiceInfoAction = new Action() {
             public void run() {
@@ -455,7 +465,7 @@ public class DiscoveryView extends ViewPart {
                 	TreeParent p = (TreeParent) treeObject;
                     final ServiceID targetID = p.getID();
                     if (dcontainer != null) {
-                    	dcontainer.requestServiceInfo(targetID,3000);
+                    	dcontainer.requestServiceInfo(targetID,SERVICE_INFO_TIMEOUT);
                     }
                 }
             }
@@ -523,7 +533,9 @@ public class DiscoveryView extends ViewPart {
 		connectContainerAction.setText("Start discovery");
 		connectContainerAction.setToolTipText("Start discovery");
 		connectContainerAction.setEnabled(true);
+		
 	}
+	
 	private void fillContextMenu(IMenuManager manager) {
 		final TreeObject treeObject = getSelectedTreeObject();
 		if (treeObject != null && treeObject instanceof TreeParent) {
@@ -605,12 +617,10 @@ public class DiscoveryView extends ViewPart {
 					TreeParent tp = (TreeParent) treeObject;
 					if (tp.getID() != null) {
 						IServiceInfo info = tp.getServiceInfo();
-						if (info != null) {
-							if (!info.isResolved()) {
-								requestServiceInfoAction.run();
-							} else {
-								connectToAction.run();
-							}
+						if (info != null && info.isResolved()) {
+							connectToAction.run();
+						} else {
+							requestServiceInfoAction.run();							
 						}
 					}
 				}