[303312] [UI] Include support for branching in navigator integration

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

6 files changed, 105 insertions, 95 deletions

diff --git a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
index 055dcb9758..70719b37b2 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
+++ b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
@@ -16,12 +16,10 @@
 		<property name="overrideUUID" value="1ff5d226-b1f0-40fb-aba2-0c31b38c764f"/>
 		-->
 		<property name="supportingAudits" value="true"/>
-		<property name="verifyingRevisions" value="false"/>
-		<property name="currentLRUCapacity" value="10000"/>
-		<property name="revisedLRUCapacity" value="100"/>
+		<property name="supportingBranches" value="true"/>
 
 		<store type="db">
-			<mappingStrategy type="horizontal">
+			<mappingStrategy type="horizontalBranching">
 				<property name="qualifiedNames" value="false"/>
 				<property name="toManyReferences" value="ONE_TABLE_PER_REFERENCE"/>
 				<property name="toOneReferences" value="LIKE_ATTRIBUTES"/>
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditMappingStrategy.java
index cf864adcfb..a76fb4793d 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditMappingStrategy.java
@@ -23,36 +23,40 @@ import org.eclipse.emf.ecore.EStructuralFeature;
  */
 public class HorizontalAuditMappingStrategy extends AbstractHorizontalMappingStrategy
 {
-  @Override
-  public IClassMapping doCreateClassMapping(EClass eClass)
+  public HorizontalAuditMappingStrategy()
   {
-    return new HorizontalAuditClassMapping(this, eClass);
   }
 
-  @Override
-  public IListMapping doCreateListMapping(EClass containingClass, EStructuralFeature feature)
+  public boolean hasAuditSupport()
   {
-    return new AuditListTableMapping(this, containingClass, feature);
+    return true;
   }
 
-  @Override
-  public IListMapping doCreateFeatureMapMapping(EClass containingClass, EStructuralFeature feature)
+  public boolean hasBranchingSupport()
   {
-    return new AuditFeatureMapTableMapping(this, containingClass, feature);
+    return false;
   }
 
-  public boolean hasAuditSupport()
+  public boolean hasDeltaSupport()
   {
-    return true;
+    return false;
   }
 
-  public boolean hasDeltaSupport()
+  @Override
+  public IClassMapping doCreateClassMapping(EClass eClass)
   {
-    return false;
+    return new HorizontalAuditClassMapping(this, eClass);
   }
 
-  public boolean hasBranchingSupport()
+  @Override
+  public IListMapping doCreateListMapping(EClass containingClass, EStructuralFeature feature)
   {
-    return false;
+    return new AuditListTableMapping(this, containingClass, feature);
+  }
+
+  @Override
+  public IListMapping doCreateFeatureMapMapping(EClass containingClass, EStructuralFeature feature)
+  {
+    return new AuditFeatureMapTableMapping(this, containingClass, feature);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditMappingStrategyWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditMappingStrategyWithRanges.java
index 775142210a..689323f98d 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditMappingStrategyWithRanges.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditMappingStrategyWithRanges.java
@@ -27,11 +27,6 @@ public class HorizontalAuditMappingStrategyWithRanges extends AbstractHorizontal
   {
   }
 
-  public boolean hasDeltaSupport()
-  {
-    return true;
-  }
-
   public boolean hasAuditSupport()
   {
     return true;
@@ -42,6 +37,11 @@ public class HorizontalAuditMappingStrategyWithRanges extends AbstractHorizontal
     return false;
   }
 
+  public boolean hasDeltaSupport()
+  {
+    return true;
+  }
+
   @Override
   public IClassMapping doCreateClassMapping(EClass eClass)
   {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingMappingStrategy.java
index a22d05e09a..6b89329024 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingMappingStrategy.java
@@ -23,25 +23,16 @@ import org.eclipse.emf.ecore.EStructuralFeature;
  */
 public class HorizontalBranchingMappingStrategy extends AbstractHorizontalMappingStrategy
 {
-  @Override
-  public IClassMapping doCreateClassMapping(EClass eClass)
+  public HorizontalBranchingMappingStrategy()
   {
-    return new HorizontalBranchingClassMapping(this, eClass);
-  }
-
-  @Override
-  public IListMapping doCreateListMapping(EClass containingClass, EStructuralFeature feature)
-  {
-    return new BranchingListTableMapping(this, containingClass, feature);
   }
 
-  @Override
-  public IListMapping doCreateFeatureMapMapping(EClass containingClass, EStructuralFeature feature)
+  public boolean hasAuditSupport()
   {
-    return new BranchingFeatureMapTableMapping(this, containingClass, feature);
+    return true;
   }
 
-  public boolean hasAuditSupport()
+  public boolean hasBranchingSupport()
   {
     return true;
   }
@@ -51,8 +42,21 @@ public class HorizontalBranchingMappingStrategy extends AbstractHorizontalMappin
     return false;
   }
 
-  public boolean hasBranchingSupport()
+  @Override
+  public IClassMapping doCreateClassMapping(EClass eClass)
   {
-    return true;
+    return new HorizontalBranchingClassMapping(this, eClass);
+  }
+
+  @Override
+  public IListMapping doCreateListMapping(EClass containingClass, EStructuralFeature feature)
+  {
+    return new BranchingListTableMapping(this, containingClass, feature);
+  }
+
+  @Override
+  public IListMapping doCreateFeatureMapMapping(EClass containingClass, EStructuralFeature feature)
+  {
+    return new BranchingFeatureMapTableMapping(this, containingClass, feature);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditMappingStrategy.java
index c1eb937203..59a96e08ed 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditMappingStrategy.java
@@ -23,25 +23,16 @@ import org.eclipse.emf.ecore.EStructuralFeature;
  */
 public class HorizontalNonAuditMappingStrategy extends AbstractHorizontalMappingStrategy
 {
-  @Override
-  protected IClassMapping doCreateClassMapping(EClass eClass)
+  public HorizontalNonAuditMappingStrategy()
   {
-    return new HorizontalNonAuditClassMapping(this, eClass);
-  }
-
-  @Override
-  public IListMapping doCreateListMapping(EClass containingClass, EStructuralFeature feature)
-  {
-    return new NonAuditListTableMapping(this, containingClass, feature);
   }
 
-  @Override
-  public IListMapping doCreateFeatureMapMapping(EClass containingClass, EStructuralFeature feature)
+  public boolean hasAuditSupport()
   {
-    return new NonAuditFeatureMapTableMapping(this, containingClass, feature);
+    return false;
   }
 
-  public boolean hasAuditSupport()
+  public boolean hasBranchingSupport()
   {
     return false;
   }
@@ -51,8 +42,21 @@ public class HorizontalNonAuditMappingStrategy extends AbstractHorizontalMapping
     return true;
   }
 
-  public boolean hasBranchingSupport()
+  @Override
+  public IListMapping doCreateListMapping(EClass containingClass, EStructuralFeature feature)
   {
-    return false;
+    return new NonAuditListTableMapping(this, containingClass, feature);
+  }
+
+  @Override
+  public IListMapping doCreateFeatureMapMapping(EClass containingClass, EStructuralFeature feature)
+  {
+    return new NonAuditFeatureMapTableMapping(this, containingClass, feature);
+  }
+
+  @Override
+  protected IClassMapping doCreateClassMapping(EClass eClass)
+  {
+    return new HorizontalNonAuditClassMapping(this, eClass);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.server/CDOServer.launch b/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
index b921725803..405cd9d6ea 100644
--- a/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
+++ b/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
@@ -25,8 +25,8 @@
 <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="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selected_target_plugins" value="org.hibernate@default:default,javax.servlet@default:default,org.eclipse.core.resources.win32.x86@default:false,org.hsqldb@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.common@2:true,org.mortbay.jetty.server@default:default,org.eclipse.emf.teneo.hibernate.mapper@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.expressions@default:default,org.apache.jasper@default:default,org.apache.commons.logging@default:default,org.apache.derby@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.ecore.xmi@default:default,org.apache.commons.el@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.h2.jdbc@default:default,org.eclipse.emf.teneo.annotations@default:default,org.eclipse.equinox.http.servlet@default:default,org.postgresql.jdbc3@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.resources@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.variables@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.registry@default:default,com.mysql.jdbc@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.team.core@default:default,org.eclipse.emf.teneo@default:default,org.eclipse.equinox.preferences@default:default,org.apache.ant@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.emf.common@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.db.h2@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.net4j.db.hsqldb@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.server.hibernate.teneo@default:default,org.eclipse.net4j.db.derby@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j.db.mysql@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.hibernate@default:default,org.eclipse.net4j.db.postgresql@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.h2.jdbc@default:default,org.eclipse.emf.teneo.annotations@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.mortbay.jetty.server@default:default,org.eclipse.equinox.app@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.common@2:true,org.apache.jasper@default:default,org.eclipse.core.runtime@default:true,org.apache.ant@default:default,org.eclipse.core.resources.win32.x86@default:false,javax.servlet.jsp@default:default,org.eclipse.osgi.services@default:default,org.eclipse.emf.teneo.hibernate.mapper@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.hsqldb@default:default,org.apache.commons.logging@default:default,org.eclipse.emf.teneo@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.jobs@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.http.registry@default:default,org.hibernate@default:default,javax.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.http.servlet@default:default,org.apache.derby@default:default,org.eclipse.emf.ecore.xmi@default:default,com.mysql.jdbc@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.emf.ecore@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem@default:default,org.postgresql.jdbc3@default:default,org.eclipse.core.resources@default:default,org.eclipse.osgi@-1:true,org.apache.commons.el@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.db.derby@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.net4j.db.postgresql@default:default,org.eclipse.net4j.db.hsqldb@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.net4j@default:default,org.eclipse.net4j.db@default:default,org.eclipse.emf.cdo.server.hibernate@default:default,org.eclipse.emf.cdo.server.hibernate.teneo@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.net4j.db.mysql@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
 <booleanAttribute key="tracing" value="true"/>
@@ -42,23 +42,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"/>
@@ -68,8 +68,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"/>
@@ -82,14 +82,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"/>
@@ -101,8 +101,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"/>
@@ -118,11 +118,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"/>
@@ -131,17 +131,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"/>
@@ -153,45 +153,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"/>
@@ -218,8 +218,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"/>
@@ -232,12 +232,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"/>
@@ -254,25 +254,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"/>
@@ -280,20 +280,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"/>
@@ -310,15 +310,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"/>
@@ -330,10 +330,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"/>
@@ -350,8 +350,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>