[256936] Support for Offline Mode

https://bugs.eclipse.org/bugs/show_bug.cgi?id=256936

7 files changed, 238 insertions, 110 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.db/plugin.xml b/plugins/org.eclipse.emf.cdo.server.db/plugin.xml
index 91d3df45f7..b4668f1b3e 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.server.db/plugin.xml
@@ -14,6 +14,15 @@
 <plugin>
 
    <extension-point id="mappingStrategies" name="%extension-point.name" schema="schema/mappingStrategies.exsd"/>
+   
+   <extension
+         point="org.eclipse.net4j.util.factories">
+      <factory
+            class="org.eclipse.emf.cdo.server.db.CDODBBrowser$ContainerBased$Factory"
+            productGroup="org.eclipse.emf.cdo.server.db.browsers"
+            type="default">
+      </factory>
+   </extension>
 
    <extension
          point="org.eclipse.emf.cdo.server.storeFactories">
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBBrowser.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBBrowser.java
index 9657cf83b5..c795273ad8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBBrowser.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBBrowser.java
@@ -8,15 +8,20 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.db;
+package org.eclipse.emf.cdo.server.db;
 
-import org.eclipse.emf.cdo.server.db.IDBStore;
+import org.eclipse.emf.cdo.server.internal.db.bundle.OM;
 import org.eclipse.emf.cdo.spi.server.InternalRepository;
 
 import org.eclipse.net4j.db.DBException;
 import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
+import org.eclipse.net4j.util.StringUtil;
 import org.eclipse.net4j.util.concurrent.Worker;
+import org.eclipse.net4j.util.container.ContainerEventAdapter;
+import org.eclipse.net4j.util.container.IContainer;
+import org.eclipse.net4j.util.container.IPluginContainer;
+import org.eclipse.net4j.util.event.IListener;
+import org.eclipse.net4j.util.factory.ProductCreationException;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -40,8 +45,10 @@ import java.util.Set;
 
 /**
  * @author Eike Stepper
+ * @since 3.0
  */
-public class DBBrowser extends Worker
+@SuppressWarnings("nls")
+public class CDODBBrowser extends Worker
 {
   private static final String REQUEST_PREFIX = "GET ";
 
@@ -62,12 +69,17 @@ public class DBBrowser extends Worker
 
   private Map<String, InternalRepository> repositories;
 
-  public DBBrowser(Map<String, InternalRepository> repositories)
+  public CDODBBrowser(Map<String, InternalRepository> repositories)
   {
     this.repositories = repositories;
     setDaemon(true);
   }
 
+  public Map<String, InternalRepository> getRepositories()
+  {
+    return repositories;
+  }
+
   public int getPort()
   {
     return port;
@@ -405,16 +417,113 @@ public class DBBrowser extends Worker
     super.doDeactivate();
   }
 
-  public static void main(String[] args)
+  /**
+   * @author Eike Stepper
+   */
+  public static class ContainerBased extends CDODBBrowser
   {
-    Map<String, InternalRepository> repos = new HashMap<String, InternalRepository>();
-    repos.put("repo1", null);
-    repos.put("repo1_master", null);
-    repos.put("clone", null);
-    repos.put("clone2", null);
-
-    DBBrowser browser = new DBBrowser(repos);
-    browser.activate();
-    ConcurrencyUtil.sleep(1000000);
+    private IContainer<?> container;
+
+    private IListener containerListener = new ContainerEventAdapter<Object>()
+    {
+      @Override
+      protected void onAdded(IContainer<Object> container, Object element)
+      {
+        addElement(element);
+      }
+
+      @Override
+      protected void onRemoved(IContainer<Object> container, Object element)
+      {
+        removeElement(element);
+      }
+    };
+
+    public ContainerBased(IContainer<?> container)
+    {
+      super(new HashMap<String, InternalRepository>());
+      this.container = container;
+    }
+
+    public ContainerBased()
+    {
+      this(IPluginContainer.INSTANCE);
+    }
+
+    public IContainer<?> getContainer()
+    {
+      return container;
+    }
+
+    @Override
+    protected void doActivate() throws Exception
+    {
+      super.doActivate();
+      for (Object element : container.getElements())
+      {
+        addElement(element);
+      }
+
+      container.addListener(containerListener);
+    }
+
+    @Override
+    protected void doDeactivate() throws Exception
+    {
+      container.removeListener(containerListener);
+      super.doDeactivate();
+    }
+
+    private void addElement(Object element)
+    {
+      if (element instanceof InternalRepository)
+      {
+        InternalRepository repository = (InternalRepository)element;
+        getRepositories().put(repository.getName(), repository);
+      }
+    }
+
+    private void removeElement(Object element)
+    {
+      if (element instanceof InternalRepository)
+      {
+        InternalRepository repository = (InternalRepository)element;
+        getRepositories().remove(repository.getName());
+      }
+    }
+
+    /**
+     * @author Eike Stepper
+     */
+    public static class Factory extends org.eclipse.net4j.util.factory.Factory
+    {
+      public static final String PRODUCT_GROUP = "org.eclipse.emf.cdo.server.db.browsers";
+
+      public static final String TYPE = "default";
+
+      public Factory()
+      {
+        super(PRODUCT_GROUP, TYPE);
+      }
+
+      public CDODBBrowser.ContainerBased create(String description) throws ProductCreationException
+      {
+        CDODBBrowser.ContainerBased browser = new CDODBBrowser.ContainerBased();
+
+        try
+        {
+          if (!StringUtil.isEmpty(description))
+          {
+            browser.setPort(Integer.valueOf(description));
+          }
+        }
+        catch (Exception ex)
+        {
+          OM.LOG.warn(ex);
+        }
+
+        return browser;
+      }
+    }
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.server/CDOServer.launch b/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
index 85b408cc5b..e4dfedf3b9 100644
--- a/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
+++ b/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
@@ -25,7 +25,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}&#13;&#10;-debug&#13;&#10;-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="-Xms40m&#13;&#10;-Xmx1024m&#13;&#10;-Ddebug=true&#13;&#10;-Dnet4j.config=&quot;${resource_loc:/org.eclipse.emf.cdo.server.product/rootfiles/configuration}&quot;&#13;&#10;-Dorg.osgi.service.http.port=8080"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx1024m&#13;&#10;-Ddebug=true&#13;&#10;-Dnet4j.config=&quot;${resource_loc:/org.eclipse.emf.cdo.server.product/rootfiles/configuration}&quot;&#13;&#10;-Dorg.eclipse.emf.cdo.server.browser.port=7777&#13;&#10;-Dorg.osgi.service.http.port=8080"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <stringAttribute key="selectedPlugin" value="org.eclipse.emf.cdo"/>
@@ -46,23 +46,23 @@
 <mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
 <mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
+<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
 <mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
 <mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.util" value="true"/>
 <mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
 <mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
 <mapEntry key="org.eclipse.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/installhandler" 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.team.cvs.core/threading" value="false"/>
@@ -72,8 +72,8 @@
 <mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
 <mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
 <mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
-<mapEntry key="org.eclipse.team.core/threading" 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.update.core/debug/parsing" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
@@ -86,14 +86,14 @@
 <mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
 <mapEntry key="org.eclipse.help.base/debug/search" 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.pde.build/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
 <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.osgi/resolver/generics" 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.osgi/resolver/requires" value="false"/>
 <mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
@@ -105,8 +105,8 @@
 <mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
 <mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
 <mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
 <mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
 <mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
 <mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
@@ -122,11 +122,11 @@
 <mapEntry key="org.eclipse.net4j/debug.buffer" value="true"/>
 <mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/locks" 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.emf.cdo.examples/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"/>
@@ -135,17 +135,17 @@
 <mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/>
 <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.emf.cdo/debug.object" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.object" value="true"/>
+<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.revision" 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.jdt.core/debug/javadelta" value="false"/>
 <mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/showHeapStatus" 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.jdt.core/debug/javamodel/cache" value="false"/>
@@ -157,45 +157,45 @@
 <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/build/needbuild" 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/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
+<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/>
 <mapEntry key="org.eclipse.core.resources/history" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
+<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
 <mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
 <mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/perf.revision" value="true"/>
 <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/debug.model" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
 <mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
 <mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
 <mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
+<mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
 <mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<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.net4j/debug.acceptor" value="true"/>
@@ -222,8 +222,8 @@
 <mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
 <mapEntry key="org.eclipse.help/debug/context" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.net4j.examples/debug" value="true"/>
 <mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
@@ -236,12 +236,12 @@
 <mapEntry key="org.eclipse.emf.cdo.common/debug.revision" value="true"/>
 <mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
 <mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/>
-<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/save" 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.emf.cdo.server/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
 <mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
@@ -258,25 +258,25 @@
 <mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/>
 <mapEntry key="org.eclipse.net4j.debug/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/>
 <mapEntry key="org.eclipse.pde.core/cache" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
 <mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
+<mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.common/perf" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
 <mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
+<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
 <mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.concurrency" value="true"/>
 <mapEntry key="org.eclipse.net4j.fileshare.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.util/debug.concurrency" value="true"/>
 <mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
@@ -284,20 +284,20 @@
 <mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.common/perf.revision.writing" value="true"/>
 <mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/>
 <mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.model" 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.help/debug/search" 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.ui/perf/part.create" value="800"/>
 <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.team.core/streams" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/debug" value="true"/>
 <mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
-<mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
+<mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
 <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"/>
@@ -314,15 +314,15 @@
 <mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
 <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.net4j.buddies.common/debug" value="true"/>
 <mapEntry key="org.eclipse.debug.core/debug" value="false"/>
+<mapEntry key="org.eclipse.net4j.buddies.common/debug" value="true"/>
 <mapEntry key="org.eclipse.core.resources/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/>
 <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.net4j.jms.server/debug.protocol" value="true"/>
+<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.core.runtime/perf" value="false"/>
@@ -334,10 +334,10 @@
 <mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<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.emf.cdo/debug.resource" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
 <mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
@@ -354,8 +354,8 @@
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" 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.debug.ui/debug/viewers/deltas" value="false"/>
 <mapEntry key="org.eclipse.help.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
 <mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
 </mapAttribute>
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java
index fbd85e8e0b..9d59b1bb67 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java
@@ -35,6 +35,8 @@ public class CDOServerApplication extends OSGiApplication
 {
   public static final String ID = OM.BUNDLE_ID + ".app"; //$NON-NLS-1$
 
+  public static final String PROP_BROWSER_PORT = OM.BUNDLE_ID + ".browser.port"; //$NON-NLS-1$
+
   private IRepository[] repositories;
 
   private List<IAppExtension> extensions = new ArrayList<IAppExtension>();
@@ -59,6 +61,12 @@ public class CDOServerApplication extends OSGiApplication
         OM.LOG.warn(Messages.getString("CDOServerApplication.3") + configFile.getAbsolutePath()); //$NON-NLS-1$
       }
 
+      String port = System.getProperty(PROP_BROWSER_PORT);
+      if (port != null)
+      {
+        IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.server.db.browsers", "default", port); //$NON-NLS-1$ //$NON-NLS-2$
+      }
+
       startExtensions(configFile);
     }
     else
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBOfflineConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBOfflineConfig.java
index bb075e3631..421bf2140f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBOfflineConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBOfflineConfig.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.emf.cdo.tests.db;
 
+import org.eclipse.emf.cdo.server.db.CDODBBrowser;
 import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig.OfflineConfig;
 
 /**
@@ -19,7 +20,7 @@ public abstract class DBOfflineConfig extends OfflineConfig
 {
   private static final long serialVersionUID = 1L;
 
-  private transient DBBrowser dbBrowser;
+  private transient CDODBBrowser dbBrowser;
 
   public DBOfflineConfig(String name)
   {
@@ -30,7 +31,7 @@ public abstract class DBOfflineConfig extends OfflineConfig
   public void setUp() throws Exception
   {
     super.setUp();
-    dbBrowser = new DBBrowser(repositories);
+    dbBrowser = new CDODBBrowser(repositories);
     dbBrowser.activate();
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBStoreRepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBStoreRepositoryConfig.java
index 0ed4ec4d52..6b355993be 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBStoreRepositoryConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBStoreRepositoryConfig.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.tests.db;
 
 import org.eclipse.emf.cdo.server.IStore;
 import org.eclipse.emf.cdo.server.db.CDODBUtil;
+import org.eclipse.emf.cdo.server.db.CDODBBrowser;
 import org.eclipse.emf.cdo.server.db.mapping.IMappingStrategy;
 import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig;
 
@@ -27,7 +28,7 @@ public abstract class DBStoreRepositoryConfig extends RepositoryConfig
 {
   private static final long serialVersionUID = 1L;
 
-  private transient DBBrowser dbBrowser;
+  private transient CDODBBrowser dbBrowser;
 
   public DBStoreRepositoryConfig(String name)
   {
@@ -47,7 +48,7 @@ public abstract class DBStoreRepositoryConfig extends RepositoryConfig
   public void setUp() throws Exception
   {
     super.setUp();
-    dbBrowser = new DBBrowser(repositories);
+    dbBrowser = new CDODBBrowser(repositories);
     dbBrowser.activate();
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
index 2eda835bbb..d1449545e3 100644
--- a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
+++ b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
@@ -26,8 +26,8 @@
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx512m"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.jface.text@default:default,org.eclipse.help.ui@default:default,org.apache.commons.codec*1.3.0.v20080530-1600@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.osgi@-1:true,org.h2.jdbc@default:default,org.eclipse.swt@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.externaltools@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.update.ui@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.sat4j.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jdt@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.exporter@default:default,org.mortbay.jetty.util@default:default,org.junit@default:default,com.mysql.jdbc@default:default,org.eclipse.emf.edit@default:default,org.eclipse.help@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.team.ui@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ui.views@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.apache.lucene.analysis@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.ui.ide.application@default:default,org.apache.derby@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.jsch.core@default:default,org.eclipse.equinox.event@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.debug.core@default:default,org.eclipse.core.resources@default:default,org.eclipse.compare.core@default:default,org.eclipse.osgi.util@default:default,org.eclipse.emf.teneo.hibernate@default:default,org.sat4j.pb@default:default,org.eclipse.help.webapp@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.ui.console@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf@default:default,org.eclipse.jface@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.debug.ui@default:default,org.eclipse.emf.importer@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.teneo@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.update.configurator@3:true,org.eclipse.core.databinding.observable@default:default,org.eclipse.draw2d@default:default,org.eclipse.compare@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ant@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.emf.teneo.hibernate.mapper@default:default,org.eclipse.ui@default:default,org.eclipse.jdt.debug@default:default,com.jcraft.jsch@default:default,org.eclipse.emf.teneo.annotations@default:default,org.postgresql.jdbc3@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.emf.ecore@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.ui.ide@default:default,org.eclipse.emf.teneo.eclipse@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.swt.win32.win32.x86@default:false,javax.servlet@default:default,org.eclipse.platform@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.common@2:true,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.text@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.emf.converter@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.update.core@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.equinox.p2.console@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.p2.engine@default:default,org.apache.ant@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ltk.core.refactoring@default:default,org.hibernate@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.emf.teneo.ui.capabilities@default:default,org.eclipse.emf.teneo.hibernate.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.apache.jasper@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.util@default:default,org.eclipse.ui.browser@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.emf.codegen@default:default,org.apache.commons.codec*1.3.0.v20100106-1700@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.hsqldb@default:default,org.eclipse.help.appserver@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.ui.win32@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.app@default:default,org.eclipse.help.base@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.runtime@default:true,org.eclipse.zest.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.compare.win32@default:default,org.eclipse.ui.net@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,javax.servlet.jsp@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.apache.lucene@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.core.boot@default:default,org.apache.commons.logging@default:default,org.hamcrest.core@default:default,org.apache.commons.httpclient@default:default,com.ibm.icu@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ltk.ui.refactoring@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.ui@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.ui.ide@default:default,org.eclipse.emf.cdo.examples.company.edit@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.examples.company@default:default,org.eclipse.emf.cdo.examples@default:default,org.eclipse.net4j@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.emf.cdo.team@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.filebuffers@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ui.navigator@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.event@default:default,org.eclipse.core.boot@default:default,org.eclipse.emf.importer@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.compare@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.teneo.annotations@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ant.core@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.swt@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ui.console@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.apache.commons.httpclient@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.apache.commons.codec*1.3.0.v20100106-1700@default:default,org.eclipse.emf.teneo.ui.capabilities@default:default,org.eclipse.jdt.core@default:default,org.eclipse.emf.edit.ui@default:default,org.postgresql.jdbc3@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.rcp@default:default,org.eclipse.emf.ant@default:default,org.apache.commons.logging@default:default,org.hamcrest.core@default:default,org.eclipse.ui.win32@default:false,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.draw2d@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.sat4j.core@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.core.runtime@default:true,org.mortbay.jetty.util@default:default,org.eclipse.emf@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.equinox.app@default:default,org.apache.commons.codec*1.3.0.v20080530-1600@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ui.browser@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.util@default:default,org.hsqldb@default:default,org.eclipse.equinox.p2.console@default:default,org.apache.ant@default:default,com.ibm.icu@default:default,org.eclipse.help@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.emf.ecore.editor@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.emf.teneo.hibernate.eclipse@default:default,org.eclipse.jdt@default:default,org.eclipse.ecf@default:default,com.jcraft.jsch@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.apache.jasper@default:default,org.eclipse.update.ui@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.emf.databinding@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.emf.common.ui@default:default,org.junit@default:default,org.apache.commons.el@default:default,org.eclipse.text@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.compare.win32@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.apache.derby@default:default,org.eclipse.help.base@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.core.variables@default:default,org.eclipse.compare.core@default:default,org.eclipse.debug.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.zest.core@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.debug.ui@default:default,org.eclipse.search@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.emf.teneo.hibernate.mapper@default:default,javax.servlet@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.sat4j.pb@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.ui.navigator.resources@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.help.appserver@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.externaltools@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.ui.editors@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.emf.teneo.hibernate@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.emf.converter@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,javax.servlet.jsp@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.common@default:default,org.eclipse.osgi.services@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.ui.forms@default:default,org.eclipse.jface@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.core.expressions@default:default,org.eclipse.emf.teneo@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.update.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.platform@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.apache.lucene@default:default,org.eclipse.core.jobs@default:default,org.eclipse.zest.layouts@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.jsch.core@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.emf.mapping@default:default,org.hibernate@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui@default:default,org.eclipse.emf.teneo.eclipse@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,com.mysql.jdbc@default:default,org.eclipse.ecf.filetransfer@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo.ui.ide@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.examples.company.edit@default:default,org.eclipse.emf.cdo.examples.company@default:default,org.eclipse.emf.cdo.team@default:default,org.eclipse.emf.cdo.examples@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.edit@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
 <booleanAttribute key="tracing" value="true"/>
@@ -44,27 +44,27 @@
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
 <mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
 <mapEntry key="org.eclipse.net4j.pop/perf" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
 <mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
 <mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
 <mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
 <mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.net4j.pop.ui/perf" value="false"/>
+<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
 <mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
+<mapEntry key="org.eclipse.net4j.pop.ui/perf" value="false"/>
 <mapEntry key="org.eclipse.net4j.pop/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.util" value="true"/>
 <mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
 <mapEntry key="org.eclipse.net4j.db.postgresql/debug" value="true"/>
 <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.jface.text/debug/AbstractInformationControlManager" 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.team.cvs.core/threading" value="false"/>
@@ -74,8 +74,8 @@
 <mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
 <mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
 <mapEntry key="org.eclipse.debug.core/debug/commands" 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.jdt.apt.core/debug/generatedFileMaps" value="false"/>
@@ -91,14 +91,14 @@
 <mapEntry key="org.eclipse.help/debug/toc" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/buffermanager" 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.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"/>
@@ -106,14 +106,14 @@
 <mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/builder/stats" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.equinox.security.ui/debug/storage" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug" value="false"/>
+<mapEntry key="org.eclipse.equinox.security.ui/debug/storage" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.types" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
 <mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/>
-<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.core.resources/perf/save.participants" value="500"/>
@@ -127,78 +127,78 @@
 <mapEntry key="org.eclipse.net4j/debug.buffer" value="false"/>
 <mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.repository" value="true"/>
-<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.emf.cdo.examples/debug" value="true"/>
-<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/trace/handlers.verbose.commandId" value=""/>
 <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.ui/listeners/IWorkbenchPartReference" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.net4j.pop.repository/perf" value="false"/>
 <mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/>
+<mapEntry key="org.eclipse.net4j.pop.repository/perf" 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.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.object" value="true"/>
 <mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.object" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.transaction" 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.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
+<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
 <mapEntry key="org.eclipse.jdt.apt.core/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
 <mapEntry key="org.eclipse.emf.cdo.server.hibernate.id/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/perf.revision" value="true"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
 <mapEntry key="org.eclipse.net4j/set.signal.thread.name" value="false"/>
+<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.emf.cdo.server/debug.session" value="true"/>
 <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.ui/debug/swtdebugglobal" 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.net4j.db.hsqldb/debug" value="true"/>
 <mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
 <mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/>
+<mapEntry key="org.eclipse.core.resources/history" value="false"/>
 <mapEntry key="org.eclipse.net4j.http.server/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
 <mapEntry key="org.eclipse.pde.core/validation" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
 <mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
 <mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.equinox.security.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/uses" value="false"/>
+<mapEntry key="org.eclipse.equinox.security.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/perf.revision" value="true"/>
 <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/debug.model" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="true"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
 <mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
@@ -206,11 +206,11 @@
 <mapEntry key="org.eclipse.equinox.security/debug/loginFramework" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
 <mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
+<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
 <mapEntry key="org.eclipse.ui.intro/trace/logPerformance" 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.ui/trace/contexts.verbose" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
 <mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/>
 <mapEntry key="org.eclipse.net4j.buddies.ui/debug" value="true"/>
@@ -233,8 +233,8 @@
 <mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
 <mapEntry key="org.eclipse.ui.intro/flags/noBrowser" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
-<mapEntry key="org.eclipse.equinox.security/debug" value="false"/>
 <mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
+<mapEntry key="org.eclipse.equinox.security/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
 <mapEntry key="org.eclipse.net4j.db.postgresql/debug.sql" value="true"/>
@@ -242,8 +242,8 @@
 <mapEntry key="org.eclipse.help/debug/context" value="false"/>
 <mapEntry key="org.eclipse.net4j.template.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.net4j.examples/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFiles" value="false"/>
@@ -259,12 +259,12 @@
 <mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
 <mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/>
 <mapEntry key="org.eclipse.net4j/open.channel.timeout" value="10000"/>
-<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"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
 <mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
@@ -281,18 +281,18 @@
 <mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/>
 <mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/>
+<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/>
 <mapEntry key="org.eclipse.pde.core/cache" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.ui/test" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
 <mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
+<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/perf" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
 <mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
+<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
 <mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
@@ -308,21 +308,21 @@
 <mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.common/perf.revision.writing" value="true"/>
 <mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.help/debug/search" value="false"/>
 <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
+<mapEntry key="org.eclipse.help/debug/search" 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.core.resources/build/stacktrace" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
 <mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.ui/test.bulk_add" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.common/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.ui/test.bulk_add" value="true"/>
 <mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
 <mapEntry key="org.eclipse.net4j.ui/debug" 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"/>
@@ -340,16 +340,16 @@
 <mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
 <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="false"/>
 <mapEntry key="org.eclipse.net4j.buddies.common/debug" value="true"/>
+<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
 <mapEntry key="org.eclipse.core.resources/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" 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.net4j.jms.server/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
 <mapEntry key="org.eclipse.net4j.pop.repository.ccvs/perf" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
+<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
 <mapEntry key="org.eclipse.help/debug" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
@@ -358,14 +358,14 @@
 <mapEntry key="org.eclipse.emf.cdo/perf.revision.loading" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.revision" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.view" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/formatter" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
+<mapEntry key="org.eclipse.jdt.core/debug/formatter" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
 <mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" 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.team.cvs.core/syncchangeevents" value="false"/>
 <mapEntry key="org.eclipse.net4j.http.common/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/cpresolution/failure" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.resource" value="true"/>
@@ -388,8 +388,8 @@
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" 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.help.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
 <mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
 </mapAttribute>