Fix for 231969

1 files changed, 40 insertions, 38 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab 2.launch b/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab 2.launch
index f98801111..440ca6b4b 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab 2.launch
+++ b/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab 2.launch
@@ -18,8 +18,10 @@
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dch.ethz.iks.slp.debug=true&#13;&#10;-Dnet.slp.traceMsg=true&#13;&#10;-Dnet.slp.traceReg=true"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value=""/>
 <booleanAttribute key="tracing" value="false"/>
 <mapAttribute key="tracingOptions">
@@ -46,25 +48,25 @@
 <mapEntry key="org.eclipse.ecf.provider.xmpp/debug/filter" value="*"/>
 <mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
 <mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
+<mapEntry key="org.eclipse.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
 <mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/gmm" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/gmm" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.jms/debug" value="true"/>
 <mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
 <mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
 <mapEntry key="org.eclipse.team.core/threading" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
 <mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
 <mapEntry key="org.eclipse.ecf.example.collab/debug/progsharedobject" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewer_cache_debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
 <mapEntry key="org.eclipse.ecf.ui/debug/textchatcomposite" value="true"/>
+<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
 <mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmpppresencesharedobject" value="true"/>
 <mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
@@ -74,15 +76,15 @@
 <mapEntry key="org.eclipse.ecf/debug/sharedobjectcontainerfactory" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
 <mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
 <mapEntry key="org.eclipse.pde.build/debug" value="false"/>
+<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
 <mapEntry key="org.eclipse.osgi/debug/packages" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
 <mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
 <mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
@@ -91,12 +93,12 @@
 <mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
 <mapEntry key="org.eclipse.ecf.provider/debug/container" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
+<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
 <mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
 <mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
 <mapEntry key="org.eclipse.ecf/debug/connectionfactory" value="true"/>
@@ -110,44 +112,44 @@
 <mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
 <mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
 <mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
 <mapEntry key="org.eclipse.ecf/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
 <mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
 <mapEntry key="org.eclipse.pde.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ecf.ui/debug/flag" value="true"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
+<mapEntry key="org.eclipse.ecf.ui/debug/flag" value="true"/>
 <mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
 <mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
+<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.xmpp/debug/flag" value="true"/>
 <mapEntry key="org.eclipse.core.resources/strings" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
 <mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
+<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
 <mapEntry key="org.eclipse.ecf/debug/flag" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
 <mapEntry key="org.eclipse.ecf/debug/factoryinit" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
-<mapEntry key="org.eclipse.ecf/debug/abstractsharedobject" value="true"/>
 <mapEntry key="org.eclipse.ecf/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ecf/debug/abstractsharedobject" value="true"/>
 <mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
 <mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
 <mapEntry key="org.eclipse.update.core/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
 <mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
 <mapEntry key="org.eclipse.core.resources/history" value="false"/>
@@ -155,8 +157,8 @@
 <mapEntry key="org.eclipse.ecf.provider/debug/filter" value="*"/>
 <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.xmpp/debug" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider.jms/debug/brokercontainer" value="true"/>
 <mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.jms/debug/brokercontainer" value="true"/>
 <mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.irc/debug/filter" value="*"/>
 <mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
@@ -179,33 +181,33 @@
 <mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
 <mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.jmdns/debug/container" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackconnection" value="true"/>
+<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.ecf.datashare/OrderedMulticaster" value="true"/>
 <mapEntry key="org.eclipse.ecf.sdo/SharedDataGraph" value="true"/>
+<mapEntry key="org.eclipse.ecf.datashare/OrderedMulticaster" value="true"/>
+<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
 <mapEntry key="org.eclipse.ecf.sdo/DataGraphSharingFactory" value="true"/>
 <mapEntry key="org.eclipse.ecf.provider/debug/containerfactory" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/packageadmin/timing" value="false"/>
 <mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
 <mapEntry key="org.eclipse.ecf.datashare/ConsistentMulticaster" value="true"/>
+<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
 <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
 <mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
 <mapEntry key="org.eclipse.ecf.provider.jmdns/debug/flag" value="true"/>
 <mapEntry key="org.eclipse.ecf.discovery/debug/flag" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
 <mapEntry key="org.eclipse.ecf.example.collab/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
 <mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
@@ -214,19 +216,19 @@
 <mapEntry key="org.eclipse.ecf.discovery/debug/filter" value="*"/>
 <mapEntry key="org.eclipse.ecf.provider.jmdns/debug/filter" value="*"/>
 <mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/jmdns" value="true"/>
 <mapEntry key="org.eclipse.ecf.provider.irc/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/jmdns" value="true"/>
 <mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider.yahoo/debug" value="true"/>
+<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
 <mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jms/debug/channel" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.jms/debug/channel" value="true"/>
 <mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
 <mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
 <mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
@@ -262,17 +264,17 @@
 <mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
 <mapEntry key="org.eclipse.ecf.example.collab/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
 <mapEntry key="org.eclipse.ecf.example.collab/debug/urlsharedobject" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
+<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectcontext" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmppgroupchatsharedobject" value="true"/>
+<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
 <mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
+<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmppgroupchatsharedobject" value="true"/>
 <mapEntry key="org.eclipse.ecf.provider.irc/debug/irccontainer" value="true"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
 <mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
 <mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
@@ -287,26 +289,26 @@
 <mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
 <mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
 <mapEntry key="org.eclipse.debug.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackdebug" value="true"/>
 <mapEntry key="org.eclipse.core.resources/debug" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackdebug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/connection" value="true"/>
 <mapEntry key="org.eclipse.ecf.provider.jms/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/connection" value="true"/>
 <mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
 <mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
 <mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.team.ftp/list" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
+<mapEntry key="org.eclipse.team.ftp/list" value="true"/>
 <mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
 <mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
 <mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
 <mapEntry key="org.eclipse.ecf.provider/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
 <mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
+<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
 <mapEntry key="org.eclipse.ecf.provider.jmdns/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
 <mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>