Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-05-01 07:05:44 +0000
committerEike Stepper2010-05-01 07:05:44 +0000
commitc22713f193ebc115e63f0fb51b10aca9ea4940c7 (patch)
tree83ecabc24f98b4f9e575327ae41d4f422815c078
parentb17dfea8dc97b2216391e49b3e224a61b7601109 (diff)
downloadcdo-c22713f193ebc115e63f0fb51b10aca9ea4940c7.tar.gz
cdo-c22713f193ebc115e63f0fb51b10aca9ea4940c7.tar.xz
cdo-c22713f193ebc115e63f0fb51b10aca9ea4940c7.zip
[256936] Support for Offline Mode
https://bugs.eclipse.org/bugs/show_bug.cgi?id=256936
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.company.edit/plugin.properties5
-rw-r--r--plugins/org.eclipse.emf.cdo.server/CDOServer.launch6
-rw-r--r--plugins/org.eclipse.emf.cdo.team/src/org/eclipse/emf/cdo/internal/team/RepositoryManager.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 branching).launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 non-audit).launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 offline).launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2).launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb - nonaudit).launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb).launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Mysql).launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL - noaudit).launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate -standalone).launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate).launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/CDO AllTests (All Configs).launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Embedded).launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Offline).launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/CDO AllTests.launch5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/IDE.launch1014
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/plugin.properties3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java3
-rw-r--r--plugins/org.eclipse.net4j.tests/Net4j AllTests (OSGi).launch767
-rw-r--r--plugins/org.eclipse.net4j.tests/Net4j AllTests.launch4
-rw-r--r--plugins/org.gastro.rcp.department/GastroDepartment1.launch5
-rw-r--r--plugins/org.gastro.rcp.department/GastroDepartment2.launch5
-rw-r--r--plugins/org.gastro.rcp.table/GastroTable1.launch5
-rw-r--r--plugins/org.gastro.rcp.table/GastroTable2.launch9
-rw-r--r--plugins/org.gastro.server/GastroServer.launch6
-rw-r--r--plugins/org.gastro.testclient/GastroTestClient1.launch4
-rw-r--r--plugins/org.gastro.testclient/GastroTestClient2.launch5
-rw-r--r--releng/org.eclipse.emf.cdo.formatchecker/FormatChecker.launch4
36 files changed, 937 insertions, 1007 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.examples.company.edit/plugin.properties
index a41dfd98a0..7a4cc28e2f 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/plugin.properties
@@ -28,6 +28,8 @@ _UI_CreateSibling_description = Create a new sibling of type {0} for the selecte
_UI_PropertyDescriptor_description = The {0} of the {1}
+_UI_Address_type = Address
+_UI_Order_type = Order
_UI_Supplier_type = Supplier
_UI_PurchaseOrder_type = Purchase Order
_UI_OrderDetail_type = Order Detail
@@ -61,8 +63,6 @@ _UI_SalesOrder_id_feature = Id
_UI_SalesOrder_customer_feature = Customer
_UI_Unknown_feature = Unspecified
-_UI_Address_type = Address
-_UI_Order_type = Order
_UI_Address_name_feature = Name
_UI_Address_street_feature = Street
_UI_Address_city_feature = City
@@ -78,7 +78,6 @@ _UI_Supplier_preferred_feature = Preferred
_UI_OrderAddress_type = Order Address
_UI_OrderAddress_testAttribute_feature = Test Attribute
-_UI_Company_type = Product
_UI_Company_name_feature = Name
_UI_Company_orderDetails_feature = Order Details
_UI_Company_vat_feature = Vat
diff --git a/plugins/org.eclipse.emf.cdo.server/CDOServer.launch b/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
index 54437686bb..9cdfab3145 100644
--- a/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
+++ b/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
@@ -27,10 +27,10 @@
<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.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="product" value="org.eclipse.platform.ide"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.emf.cdo"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.common@2:true,org.apache.commons.logging@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.h2@default:default,org.eclipse.core.filesystem@default:default,org.apache.ant@default:default,org.eclipse.emf.teneo@default:default,org.eclipse.core.runtime@default:true,org.eclipse.emf.teneo.hibernate.mapper@default:default,org.eclipse.osgi@-1:true,javax.servlet@default:default,org.eclipse.core.expressions@default:default,org.mortbay.jetty.util@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.hibernate@default:default,org.eclipse.equinox.http.registry@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ant.core@default:default,org.eclipse.emf.teneo.annotations@default:default,org.eclipse.core.variables@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.jobs@default:default,org.eclipse.team.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.osgi.services@default:default,org.apache.jasper@default:default,org.eclipse.equinox.app@default:default,org.hsqldb@default:default,org.apache.derby@default:default,javax.servlet.jsp@default:default,org.postgresql.jdbc3@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.http.jetty@default:default,org.apache.commons.el@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.resources@default:default,com.mysql.jdbc@default:default,org.eclipse.core.contenttype@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.db.postgresql@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.hibernate.teneo@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.server.hibernate@default:default,org.eclipse.net4j.db.mysql@default:default,org.eclipse.net4j.db.derby@default:default,org.eclipse.net4j.db.hsqldb@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.db@default:default,org.eclipse.emf.cdo.server.net4j@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.resources@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.ecore.change@default:default,org.eclipse.osgi@-1:true,org.apache.commons.el@default:default,org.eclipse.emf.teneo@default:default,org.apache.jasper@default:default,org.eclipse.core.variables@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.postgresql.jdbc3@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem@default:default,org.hibernate@default:default,org.apache.commons.logging@default:default,com.mysql.jdbc@default:default,org.h2@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.expressions@default:default,org.apache.derby@default:default,org.eclipse.emf.common@default:default,org.apache.ant@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.http.jetty@default:default,org.mortbay.jetty.util@default:default,org.eclipse.emf.teneo.hibernate.mapper@default:default,org.eclipse.core.filesystem.win32.x86@default:false,javax.servlet.jsp@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.teneo.annotations@default:default,javax.servlet@default:default,org.eclipse.team.core@default:default,org.hsqldb@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.contenttype@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.server.hibernate.teneo@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.net4j.db@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j.db.mysql@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.net4j.db.hsqldb@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db.postgresql@default:default,org.eclipse.net4j.db.derby@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.server.hibernate@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="true"/>
diff --git a/plugins/org.eclipse.emf.cdo.team/src/org/eclipse/emf/cdo/internal/team/RepositoryManager.java b/plugins/org.eclipse.emf.cdo.team/src/org/eclipse/emf/cdo/internal/team/RepositoryManager.java
index 4d75011ac4..98b89d3da5 100644
--- a/plugins/org.eclipse.emf.cdo.team/src/org/eclipse/emf/cdo/internal/team/RepositoryManager.java
+++ b/plugins/org.eclipse.emf.cdo.team/src/org/eclipse/emf/cdo/internal/team/RepositoryManager.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -154,10 +154,4 @@ public class RepositoryManager extends Container<IRepositoryProject> implements
}
}
}
-
- @Override
- protected void doDeactivate() throws Exception
- {
- super.doDeactivate();
- }
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 branching).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 branching).launch
index 00fbd415c3..9f0aede20b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 branching).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 branching).launch
@@ -6,10 +6,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 non-audit).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 non-audit).launch
index 4a8a8cb614..bd96010a4f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 non-audit).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 non-audit).launch
@@ -6,10 +6,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 offline).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 offline).launch
index 982e5f8bfe..3bbfdca09e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 offline).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 offline).launch
@@ -6,10 +6,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2).launch
index 0281301d97..caabdcdb00 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2).launch
@@ -6,10 +6,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb - nonaudit).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb - nonaudit).launch
index 4882695f1b..2177180bdb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb - nonaudit).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb - nonaudit).launch
@@ -6,10 +6,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb).launch
index 8749f187c4..dd70e23951 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Hsqldb).launch
@@ -6,10 +6,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Mysql).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Mysql).launch
index 0ae434ac5b..94f3912619 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Mysql).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Mysql).launch
@@ -6,10 +6,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL - noaudit).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL - noaudit).launch
index 6d4648fa46..d624f94450 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL - noaudit).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL - noaudit).launch
@@ -6,10 +6,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate -standalone).launch b/plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate -standalone).launch
index cf1cc5009f..3c20b95881 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate -standalone).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate -standalone).launch
@@ -8,10 +8,6 @@
</listAttribute>
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;true&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;folder nest=&amp;quot;false&amp;quot; path=&amp;quot;/org.eclipse.emf.cdo/src/org&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.folder&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate).launch b/plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate).launch
index fa3dae4e10..6bd629e368 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/CDO AllTests (Hibernate).launch
@@ -6,10 +6,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (All Configs).launch b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (All Configs).launch
index ff5da27d58..69d88fec04 100644
--- a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (All Configs).launch
+++ b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (All Configs).launch
@@ -6,10 +6,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Embedded).launch b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Embedded).launch
index 7e61919c09..6864564c69 100644
--- a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Embedded).launch
+++ b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Embedded).launch
@@ -6,10 +6,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Offline).launch b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Offline).launch
index 21f0d24bf1..25018247f3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Offline).launch
+++ b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (Offline).launch
@@ -6,10 +6,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests.launch b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests.launch
index 111715c5ea..09dd8432a8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests.launch
+++ b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests.launch
@@ -25,11 +25,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="com.mountainminds.eclemma.ui.launchGroup.coverage"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/IDE.launch b/plugins/org.eclipse.emf.cdo.ui.ide/IDE.launch
index f7f50d52d8..aca13d0292 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/IDE.launch
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/IDE.launch
@@ -13,10 +13,6 @@
<booleanAttribute key="default" value="true"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../IDE2"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="pde.version" value="3.3"/>
@@ -28,550 +24,550 @@
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="true"/>
<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
+<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
+<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
+<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
+<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
+<mapEntry key="org.eclipse.core.resources/history" value="false"/>
+<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
+<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
+<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
+<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
+<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
+<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
+<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
+<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
+<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
+<mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
+<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/breadcrumb" value="false"/>
<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug" value="true"/>
-<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.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.gmf.runtime.common.ui.services.action/debug/methods/entering" 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"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.store" value="true"/>
-<mapEntry key="org.eclipse.ocl/debug/evaluation" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/exceptions/catching" 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.emf.transaction/debug/methods/exiting" 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.jdt.apt.core/debug/generatedFileMaps" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.net4j.db/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.chat.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/viewers/contentProvider" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/viewers/presentationId" value=""/>
<mapEntry key="org.eclipse.debug.ui/debug/viewers/stateSaveRestore" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug.id" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug.model" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug.revision" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.common/perf" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.common/perf.revision" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.writing" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.examples.spring/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.examples/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.server.hibernate.id/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.server.hibernate/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug.session" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug.transaction" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug.types" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.team/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.tests.model1.diagram/debug" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.tests.model1.diagram/debug/visualID" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.help/debug/toc" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.tests/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.ui.ide/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.ui/test" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo.ui/test.bulk_add" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.adapter" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.repository" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.resource" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.revision" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.session" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.statemachine" value="false"/>
<mapEntry key="org.eclipse.emf.cdo/debug.store" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/events/tracing" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder/stats" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.types" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/plugin/ondemand/loading" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.util" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.view" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/load.resource.before.notification" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/perf" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/perf.revision" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/perf.revision.loading" value="false"/>
+<mapEntry key="org.eclipse.emf.ocl/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.ocl/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.emf.ocl/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.emf.ocl/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.emf.ocl/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.emf.query.ocl/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.net4j.db.hsqldb/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
+<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.emf.query/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.query/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.emf.query/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.emf.query/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.emf.query/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.emf.transaction/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.emf.transaction/debug/locking" value="false"/>
+<mapEntry key="org.eclipse.emf.transaction/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.emf.transaction/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.emf.transaction/debug/transactions" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.validation/debug/cache" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/constraints/disabled" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/constraints/evaluation" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/listeners" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/parsers" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/providers" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/xml" value="false"/>
+<mapEntry key="org.eclipse.emf.workspace/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.emf.workspace/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.emf.workspace/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
+<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
+<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
+<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
+<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
+<mapEntry key="org.eclipse.equinox.security.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.equinox.security.ui/debug/storage" value="false"/>
+<mapEntry key="org.eclipse.equinox.security/debug" value="false"/>
+<mapEntry key="org.eclipse.equinox.security/debug/loginFramework" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/admin" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/execute" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/model/operations" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/services/config" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/redo" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/undo" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/plugin/ondemand/loading" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/activate" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/config" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/execute" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/throwing" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.buffer" 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.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.ui/listeners/IWorkbenchPartReference" value="false"/>
-<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.gmf.runtime.common.ui.action/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/admin" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/run" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/services/config" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/services/config" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/admin" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/repeat" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/run" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/resource/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug" value="true"/>
<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/exiting" 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.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug" value="true"/>
-<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.gmf.runtime.emf.type.core/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/perf.revision" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.net4j/set.signal.thread.name" value="false"/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.session" value="true"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/transactions" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/security" 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.gmf.runtime.emf.type.core/debug/exceptions/throwing" value="false"/>
-<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.gmf.runtime.diagram.ui.actions/debug/exceptions/throwing" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/methods/entering" 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.jdt.core/debug/search" 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.equinox.preferences/set" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.common/perf.revision" value="false"/>
-<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.emf.cdo.common/perf.revision.reading" 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"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/canonical" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/events" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/persistencemgr" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/methods/entering" 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.gmf.runtime.diagram.ui/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
-<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.gmf.runtime.diagram.ui/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/perf" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/throwing" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/events/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/events/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/resources" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug" value="true"/>
<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/model/operations" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
-<mapEntry key="org.eclipse.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.osgi/resolver/imports" value="false"/>
-<mapEntry key="org.eclipse.net4j.db.postgresql/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
+<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
+<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
+<mapEntry key="org.eclipse.help/debug" value="true"/>
<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/xml" 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.help/debug/search" value="false"/>
+<mapEntry key="org.eclipse.help/debug/toc" value="false"/>
+<mapEntry key="org.eclipse.jdt.apt.core/debug" value="false"/>
+<mapEntry key="org.eclipse.jdt.apt.core/debug/compilationEnv" value="false"/>
+<mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFileMaps" value="false"/>
<mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFiles" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
-<mapEntry key="org.eclipse.emf.query/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.net4j/open.channel.timeout" value="10000"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.jdt.apt.pluggable.core/debug" value="false"/>
+<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/builder/stats" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.net4j.db.mysql/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.util/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/providers" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/catching" value="false"/>
-<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.query/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/failure" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/formatter" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/indexmanager/advanced" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
+<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
+<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
+<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
+<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
+<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
<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.ui/perf/part.input" value="200"/>
-<mapEntry key="org.eclipse.emf.query/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/BreadcrumbItemDropDown" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/admin" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/load.resource.before.notification" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.tests.model1.diagram/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.writing" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug" 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.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
-<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.gmf.runtime.common.core/debug/services/config" value="false"/>
-<mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/admin" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.jdt.apt.core/debug/compilationEnv" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.adapter" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/contentProvider" value="false"/>
-<mapEntry key="org.eclipse.m2m.qvt.oml.ocl.emf.libraries/loglevel" value="Severe"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/repeat" value="false"/>
-<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.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.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.gmf.runtime.diagram.ui.actions/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.channel" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/perf.revision.loading" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.view" value="true"/>
-<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.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.emf.cdo/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.net4j.http/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.buffer.stream" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/undo" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/resource/tracing" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.chat/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.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.jface.text/assert/TextSelection/validConstructorArguments" 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.emf.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/methods/exiting" value="false"/>
-<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.net4j.db.postgresql/debug" value="true"/>
<mapEntry key="org.eclipse.jface.text/debug/AbstractInformationControlManager" value="false"/>
+<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
+<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
+<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
+<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
+<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
+<mapEntry key="org.eclipse.m2m.qvt.oml.ocl.emf.libraries/loglevel" value="Severe"/>
<mapEntry key="org.eclipse.m2m.qvt.oml.ocl/loglevel" value="Severe"/>
-<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/throwing" 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.gmf.runtime.draw2d.ui.figures/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/presentationId" value=""/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.net4j.buddies.chat.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.buddies.chat/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.buddies.common/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.buddies.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.hsqldb/debug.sql" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.mysql/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.mysql/debug.sql" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.postgresql/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.postgresql/debug.sql" value="true"/>
+<mapEntry key="org.eclipse.net4j.db/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
+<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.examples/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.http.common/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.http.server/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.http/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.jms.server/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.net4j.jms.server/debug.store" value="true"/>
+<mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.jms/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.net4j.jvm/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.tests/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.util.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.util/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j.util/debug.concurrency" value="true"/>
+<mapEntry key="org.eclipse.net4j.util/debug.lifecycle" value="true"/>
+<mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/>
+<mapEntry key="org.eclipse.net4j.util/debug.om" value="true"/>
+<mapEntry key="org.eclipse.net4j.util/debug.om.monitor" value="true"/>
+<mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/>
+<mapEntry key="org.eclipse.net4j/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/>
+<mapEntry key="org.eclipse.net4j/debug.buffer" value="true"/>
+<mapEntry key="org.eclipse.net4j/debug.buffer.stream" value="false"/>
+<mapEntry key="org.eclipse.net4j/debug.channel" value="true"/>
+<mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
+<mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
+<mapEntry key="org.eclipse.net4j/debug.signal" value="true"/>
+<mapEntry key="org.eclipse.net4j/open.channel.timeout" value="10000"/>
+<mapEntry key="org.eclipse.net4j/set.signal.thread.name" value="false"/>
<mapEntry key="org.eclipse.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/execute" value="false"/>
+<mapEntry key="org.eclipse.ocl/debug/evaluation" value="false"/>
+<mapEntry key="org.eclipse.ocl/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.ocl/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.ocl/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.ocl/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.ocl/debug/parsing" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
+<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
+<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.ui.ide/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/debug/workingSets" value="false"/>
-<mapEntry key="org.eclipse.emf.query/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/services/config" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/exceptions/catching" 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.emf.validation/debug/parsers" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" 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.emf.workspace/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/resources" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
+<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
+<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
+<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<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.emf.validation/debug/constraints/disabled" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/activate" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server.hibernate/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.signal" value="true"/>
-<mapEntry key="org.eclipse.emf.query/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/timing" 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.gmf.runtime.emf.ui.properties/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.util/debug.om.monitor" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
+<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/uses" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
+<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
+<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
+<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
+<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
+<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
+<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
+<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/events" value="false"/>
+<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
+<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
+<mapEntry key="org.eclipse.team.core/debug" value="false"/>
+<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
+<mapEntry key="org.eclipse.team.core/streams" value="false"/>
+<mapEntry key="org.eclipse.team.core/threading" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
+<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
+<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
+<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
+<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
+<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
+<mapEntry key="org.eclipse.ui.ide/debug/markers" value="false"/>
+<mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
+<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
+<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
+<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
+<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
+<mapEntry key="org.eclipse.ui.intro/debug/toolbar" value="false"/>
+<mapEntry key="org.eclipse.ui.intro/flags/noBrowser" value="false"/>
+<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
+<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
+<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
+<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
+<mapEntry key="org.eclipse.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/events/tracing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.transaction" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.resources/strings" 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.apt.core/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager/advanced" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<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/showAllJobs" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/swtdebugglobal" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/workingSets" value="false"/>
+<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/debug" 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.tests/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/redo" 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.gmf.runtime.emf.clipboard.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/listeners" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.equinox.security/debug/loginFramework" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.net4j.jvm/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/markers" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/cache" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.lifecycle" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.examples.spring/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
-<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
-<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
-<mapEntry key="org.eclipse.net4j.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<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.jobs/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/throwing" 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.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.om" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/locking" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/run" 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.emf.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug" 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.gmf.runtime.diagram.ui/debug/filter/canonical" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.common/perf" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.common/debug.id" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.concurrency" value="true"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/BreadcrumbItemDropDown" value="false"/>
-<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/breadcrumb" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
+<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
+<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/exiting" 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.common/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.session" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.net4j.db.mysql/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.net4j.util.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/debug/toolbar" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.common/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.browser/debug" 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.gmf.runtime.common.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
-<mapEntry key="org.eclipse.net4j.tests/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.statemachine" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/formatter" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.net4j.http.common/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/failure" value="false"/>
-<mapEntry key="org.eclipse.jdt.apt.pluggable.core/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
+<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
+<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
+<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
+<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
+<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
+<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints/evaluation" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.team/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/admin" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
+<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/sources" 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.emf.query.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug" value="true"/>
+<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
</mapAttribute>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
index 6a48fa4518..d4a28156d2 100644
--- a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
+++ b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
@@ -28,8 +28,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.emf.cdo"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.update.core.win32@default:false,org.sat4j.pb@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.jface@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.ui.net@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.update.configurator@3:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.apache.commons.logging@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.p2.engine@default:default,org.eclipse.osgi.util@default:default,org.eclipse.help.base@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.core.filesystem@default:default,org.apache.ant@default:default,org.eclipse.emf.teneo@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding.property@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.externaltools@default:default,org.eclipse.emf.teneo.hibernate@default:default,org.eclipse.emf.teneo.hibernate.mapper@default:default,org.eclipse.equinox.event@default:default,org.eclipse.osgi@-1:true,org.eclipse.ecf@default:default,org.eclipse.debug.core@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.core.expressions@default:default,org.mortbay.jetty.util@default:default,org.eclipse.help.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.hibernate@default:default,org.eclipse.draw2d@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.runtime.compatibility@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.apache.lucene@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ui.forms@default:default,org.eclipse.team.ui@default:default,org.eclipse.ant.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.emf@default:default,org.eclipse.update.ui@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.teneo.annotations@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.rcp@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.core.variables@default:default,org.eclipse.emf.ecore.xmi@default:default,org.sat4j.core@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.help.appserver@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.update.core@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.console@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.emf.ant@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.junit@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.jsch.core@default:default,org.eclipse.osgi.services@default:default,org.apache.jasper@default:default,org.eclipse.text@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.hsqldb@default:default,org.apache.derby@default:default,com.jcraft.jsch@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.core.net@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.emf.ecore.edit@default:default,javax.servlet.jsp@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.director.app@default:default,org.postgresql.jdbc3@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.boot@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.databinding.observable@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.codec@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.platform@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.swt@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.search@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.zest.core@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ui.browser@default:default,org.eclipse.emf.importer@default:default,org.eclipse.compare.win32@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.ui.win32@default:false,org.eclipse.equinox.http.jetty@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.jdt.core@default:default,org.apache.commons.el@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.emf.importer.ecore@default:default,org.eclipse.help@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.mapping@default:default,org.eclipse.equinox.util@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.teneo.hibernate.eclipse@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.workbench.texteditor@default:default,com.ibm.icu@default:default,org.eclipse.ui.intro@default:default,org.eclipse.emf.teneo.eclipse@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.navigator@default:default,com.mysql.jdbc@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.compare@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jface.text@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.examples.company@default:default,org.eclipse.emf.cdo.examples@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.examples.company.edit@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.ui.ide@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.emf.cdo.team@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.editors@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.lucene@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.exporter@default:default,com.jcraft.jsch@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.apache.lucene.analysis@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.jsch.core@default:default,org.eclipse.ui.net@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.ecore.change@default:default,org.hamcrest.core@default:default,org.eclipse.emf.teneo.hibernate.eclipse@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.osgi@-1:true,org.eclipse.equinox.p2.extensionlocation@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.emf.teneo@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.update.ui@default:default,org.apache.jasper@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.core.commands@default:default,org.eclipse.help.appserver@default:default,org.eclipse.draw2d@default:default,org.eclipse.help@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.emf.ant@default:default,org.eclipse.platform@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.update.scheduler@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.swt@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.update.core@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.emf.databinding@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.zest.core@default:default,org.postgresql.jdbc3@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.jface@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ui.browser@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.team.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.search@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.compare.win32@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.emf.importer@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.update.configurator@3:true,org.eclipse.emf.mapping.ecore2xml@default:default,org.hibernate@default:default,org.eclipse.zest.layouts@default:default,org.apache.commons.logging@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jface.databinding@default:default,com.mysql.jdbc@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.emf.teneo.eclipse@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ui.console@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.boot@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.core.databinding.observable@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.jdt.core@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.debug.ui@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jdt@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.expressions@default:default,org.eclipse.compare@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.apache.derby@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.equinox.event@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.common@default:default,org.junit@default:default,org.apache.commons.codec@default:default,org.apache.ant@default:default,org.eclipse.equinox.util@default:default,org.mortbay.jetty.server@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf@default:default,org.mortbay.jetty.util@default:default,org.eclipse.emf.teneo.hibernate.mapper@default:default,org.eclipse.core.filesystem.win32.x86@default:false,javax.servlet.jsp@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.ui.win32@default:false,org.eclipse.debug.core@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.rcp@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ui@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.sat4j.core@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.ui.workbench@default:default,com.ibm.icu@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.emf.teneo.annotations@default:default,org.eclipse.ui.intro@default:default,javax.servlet@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.team.core@default:default,org.hsqldb@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.filebuffers@default:default,org.apache.commons.httpclient@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.emf.teneo.hibernate@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help.base@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.ui.ide@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.examples.company.edit@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.team@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.net4j@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.examples.company@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.examples@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="true"/>
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch b/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch
index 0317efbe33..210edaeb0d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch
+++ b/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch
@@ -27,8 +27,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.emf.cdo"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.update.core.win32@default:false,org.sat4j.pb@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.jface@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.update.configurator@3:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.apache.commons.logging@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.p2.engine@default:default,org.eclipse.osgi.util@default:default,org.eclipse.help.base@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.core.filesystem@default:default,org.apache.ant@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding.property@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.externaltools@default:default,org.eclipse.osgi@-1:true,org.eclipse.ecf@default:default,org.eclipse.debug.core@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.expressions@default:default,org.mortbay.jetty.util@default:default,org.eclipse.help.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.runtime.compatibility@default:default,org.mortbay.jetty.server@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.apache.lucene@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ui.forms@default:default,org.eclipse.team.ui@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.update.ui@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.core.variables@default:default,org.eclipse.emf.ecore.xmi@default:default,org.sat4j.core@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.help.appserver@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.update.core@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.console@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.emf.ant@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.junit@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.jsch.core@default:default,org.eclipse.osgi.services@default:default,org.apache.jasper@default:default,org.eclipse.text@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,com.jcraft.jsch@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.core.net@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.emf.ecore.edit@default:default,javax.servlet.jsp@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.boot@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.databinding.observable@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.codec@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.platform@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.swt@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.search@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ui.browser@default:default,org.eclipse.emf.importer@default:default,org.eclipse.ui.win32@default:false,org.eclipse.equinox.http.jetty@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.jdt.core@default:default,org.apache.commons.el@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.emf.importer.ecore@default:default,org.eclipse.help@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.mapping@default:default,org.eclipse.emf.converter@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.workbench.texteditor@default:default,com.ibm.icu@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.compare@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jface.text@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.examples.company@default:default,org.eclipse.emf.cdo.examples@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.doc@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.examples.company.edit@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.ui.ide@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.emf.cdo.team@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.editors@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.lucene@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.exporter@default:default,com.jcraft.jsch@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.apache.lucene.analysis@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.jsch.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.ecore.change@default:default,org.hamcrest.core@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.osgi@-1:true,org.apache.commons.el@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.update.ui@default:default,org.apache.jasper@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.core.commands@default:default,org.eclipse.help.appserver@default:default,org.eclipse.help@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.emf.ant@default:default,org.eclipse.platform@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.update.scheduler@default:default,org.eclipse.swt@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.update.core@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.jface@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ui.browser@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.team.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.search@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.emf.importer@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.update.configurator@3:true,org.eclipse.emf.mapping.ecore2xml@default:default,org.apache.commons.logging@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ui.console@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.boot@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jdt.core@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.debug.ui@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.expressions@default:default,org.eclipse.compare@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.common@default:default,org.junit@default:default,org.apache.commons.codec@default:default,org.apache.ant@default:default,org.mortbay.jetty.server@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.emf.importer.ecore@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.filesystem.win32.x86@default:false,javax.servlet.jsp@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.ui.win32@default:false,org.eclipse.debug.core@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ui@default:default,org.sat4j.core@default:default,org.eclipse.ui.workbench@default:default,com.ibm.icu@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.intro@default:default,javax.servlet@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.filebuffers@default:default,org.apache.commons.httpclient@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help.base@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.ui.ide@default:default,org.eclipse.emf.cdo.doc@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.examples.company.edit@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.team@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.net4j@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.examples.company@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.examples@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="true"/>
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.properties b/plugins/org.eclipse.emf.cdo.ui/plugin.properties
index 743c2adfa6..1fc54d1df6 100644
--- a/plugins/org.eclipse.emf.cdo.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.ui/plugin.properties
@@ -78,10 +78,9 @@ view.name.2 = CDO Remote Sessions
editor.name.0 = CDO Editor
page.name.0 = CDO
page.name.1 = User Interface
+perspective.name = CDO Explorer
# ==============================================================================
# %%% END OF TRANSLATED PROPERTIES %%%
# The above properties have been shipped for translation.
# ==============================================================================
-
-perspective.name = CDO Explorer \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java
index 0f145a2637..94e551b4eb 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java
@@ -82,7 +82,6 @@ public class RollbackTransactionDialog extends TitleAreaDialog
{
StringBuilder builder = new StringBuilder();
builder.append(Messages.getString("RollbackTransactionDialog.0")); //$NON-NLS-1$
- builder.append("\n"); //$NON-NLS-1$
append(builder, transaction.getNewObjects().size(),
Messages.getString("RollbackTransactionDialog.4"), Messages.getString("RollbackTransactionDialog.5")); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties
index 352ca6e17e..7e8992f511 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties
@@ -35,7 +35,7 @@ CDOActionBarContributor_0=Lock
CDOEditor.0=Target Time
CDOEditor.1=Open Target Time Slider
CDOEditor.17=Transaction error
-CDOEditor.18=An error occured while committing the transaction.\nSee Error Log for details.
+CDOEditor.18=A commit error occured. See error log for details.
CDOEditor.23=New Root
CDOEditor.26=Bulk Add
CDOEditor.27=Calculating...
@@ -116,8 +116,8 @@ CreateResourceNodeAction.1=Create a new CDOResourceFolder
CreateResourceNodeAction.2=Relative names not allowed
CreateResourceNodeAction.3=Folder name cannot be empty
CreateResourceNodeAction.4=Resource name cannot be empty
-CreateResourceNodeAction.5=There exist a folder with name
-CreateResourceNodeAction.6=There exist a resource with name
+CreateResourceNodeAction.5=There exist a folder with name
+CreateResourceNodeAction.6=There exist a resource with name
ExportResourceAction.1=Export Resource
ExportResourceAction.2=Export a CDO resource
ExportResourceAction.3=A single URI must be entered\!
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
index 9bcff8211e..bc5eed52f1 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
@@ -10,8 +10,10 @@
*/
package org.eclipse.emf.cdo.internal.ui.views;
+import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.internal.ui.actions.OpenSessionAction;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.CDOEditorUtil;
import org.eclipse.emf.cdo.ui.CDOItemProvider;
import org.eclipse.net4j.util.container.IContainer;
@@ -66,4 +68,18 @@ public class CDOSessionsView extends ContainerView
manager.add(openSessionAction);
super.fillLocalToolBar(manager);
}
+
+ @Override
+ protected void doubleClicked(Object object)
+ {
+ if (object instanceof CDOResource)
+ {
+ CDOResource resource = (CDOResource)object;
+ CDOEditorUtil.openEditor(getSite().getPage(), resource.cdoView(), resource.getPath());
+ }
+ else
+ {
+ super.doubleClicked(object);
+ }
+ }
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java
index cb46982944..6cd357553e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java
@@ -28,6 +28,7 @@ import org.eclipse.net4j.util.event.IEvent;
import org.eclipse.net4j.util.event.IListener;
import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
import org.eclipse.net4j.util.om.pref.OMPreferencesChangeEvent;
+import org.eclipse.net4j.util.ui.UIUtil;
import org.eclipse.emf.spi.cdo.InternalCDOObject;
@@ -158,7 +159,7 @@ public class CDOEventHandler
private void checkDetachedSelection(final Set<?> detachedObjects)
{
- treeViewer.getControl().getDisplay().asyncExec(new Runnable()
+ UIUtil.getDisplay().asyncExec(new Runnable()
{
public void run()
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
index 8c6290eb42..a03f933bf5 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
@@ -42,7 +42,8 @@ public class CDOLabelDecorator implements ILabelDecorator
{
public static final String[] DECORATION_PROPOSALS = { "${element}", "${id}", "${state}", "${created}", "${revised}" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- public static final String DEFAULT_DECORATION = DECORATION_PROPOSALS[0] + " [" + DECORATION_PROPOSALS[1] + "]"; //$NON-NLS-1$ //$NON-NLS-2$
+ public static final String DEFAULT_DECORATION = DECORATION_PROPOSALS[0]
+ + " [" + DECORATION_PROPOSALS[1] + ", " + DECORATION_PROPOSALS[2] + "]"; //$NON-NLS-1$ //$NON-NLS-2$
public static final String NO_DECORATION = DECORATION_PROPOSALS[0];
diff --git a/plugins/org.eclipse.net4j.tests/Net4j AllTests (OSGi).launch b/plugins/org.eclipse.net4j.tests/Net4j AllTests (OSGi).launch
index 37015a0872..f2f7de7c90 100644
--- a/plugins/org.eclipse.net4j.tests/Net4j AllTests (OSGi).launch
+++ b/plugins/org.eclipse.net4j.tests/Net4j AllTests (OSGi).launch
@@ -20,10 +20,6 @@
<listEntry value="1"/>
</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
@@ -36,430 +32,431 @@
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.net4j"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.ui@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.swt@default:default,org.junit*3.8.2.v20090203-1005@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jface@default:default,org.eclipse.emf.common@default:default,org.eclipse.pde.junit.runtime@default:default,org.junit*4.7.0.v20091118-1515@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.contenttype@default:default,org.eclipse.osgi@-1:true,org.eclipse.help@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.osgi.services@default:default,com.ibm.icu@default:default,org.eclipse.core.runtime.compatibility.auth@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.osgi.util@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.emf.common@default:default,com.ibm.icu@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.junit@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.osgi.services@default:default,org.eclipse.core.expressions@default:default,org.eclipse.swt@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui@default:default,org.eclipse.help@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.registry@default:default,org.eclipse.jface@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j@default:default,org.eclipse.net4j.tests@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="true"/>
<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
+<mapEntry key="com.soyatec.uml.core/trace/level" value="error"/>
+<mapEntry key="com.soyatec.uml.core/trace/module/UMLPlugin" value="false"/>
+<mapEntry key="com.soyatec.uml.core/trace/module/viewEvent" value="false"/>
+<mapEntry key="com.soyatec.uml.std/trace/module/modelJavaEvent" value="false"/>
+<mapEntry key="com.soyatec.uml.std/trace/module/modelMapper" value="false"/>
+<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
+<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.team.ftp/requests" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug" value="true"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
+<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
+<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
+<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
+<mapEntry key="org.eclipse.core.resources/history" value="false"/>
+<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
+<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
+<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
+<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
+<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
+<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
+<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
+<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
+<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
+<mapEntry key="org.eclipse.emf.ocl/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.ocl/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.emf.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
+<mapEntry key="org.eclipse.emf.ocl/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.emf.ocl/debug/methods/exiting" value="false"/>
<mapEntry key="org.eclipse.emf.query.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/entering" 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.gmf.runtime.emf.ui.properties/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/methods/exiting" 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"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/execute" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
+<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.emf.query/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.query/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.emf.query/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/services/config" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
+<mapEntry key="org.eclipse.emf.query/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.emf.query/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.emf.transaction/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.emf.transaction/debug/locking" value="false"/>
+<mapEntry key="org.eclipse.emf.transaction/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.emf.transaction/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.emf.transaction/debug/transactions" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.validation/debug/cache" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/constraints/disabled" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/constraints/evaluation" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/listeners" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/methods/exiting" value="false"/>
<mapEntry key="org.eclipse.emf.validation/debug/parsers" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug" value="true"/>
-<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.emf.workspace/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/resources" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/events/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/providers" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/xml" value="false"/>
+<mapEntry key="org.eclipse.emf.workspace/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
-<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints/disabled" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/plugin/ondemand/loading" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
+<mapEntry key="org.eclipse.emf.workspace/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.emf.workspace/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
+<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
+<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
+<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
+<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/admin" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/execute" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/redo" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/undo" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/throwing" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.net4j/perf" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/plugin/ondemand/loading" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/activate" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug" value="true"/>
-<mapEntry key="org.eclipse.team.ftp/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.query/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/config" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/execute" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/admin" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/run" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/formatter/enable_new" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/execute" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/model/operations" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/exiting" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/services/config" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug" 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.gmf.runtime.emf.ui.properties/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/catching" value="false"/>
-<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.gmf.runtime.common.ui.services.dnd/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/services/config" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug" value="true"/>
<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/events" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/admin" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/repeat" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/run" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/events/tracing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/resource/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug" value="true"/>
<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
-<mapEntry key="org.eclipse.net4j/debug.lifecycle.dump" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/transactions" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/catching" value="false"/>
-<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/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="com.soyatec.uml.core/trace/level" value="error"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/throwing" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="com.soyatec.uml.core/trace/module/UMLPlugin" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/methods/exiting" 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.gmf.runtime.emf.clipboard.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/redo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/dnd/tracing" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/listeners" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/catching" value="false"/>
-<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.gmf.runtime.draw2d.ui.render/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/canonical" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/events" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/persistencemgr" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/throwing" 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.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/throwing" value="false"/>
-<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.gmf.runtime.diagram.ui/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/methods/exiting" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug" value="true"/>
<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/dnd/tracing" 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.gmf.runtime.diagram.ui/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/throwing" value="false"/>
<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/events/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/events/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/resources" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug" value="true"/>
<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/cache" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug" value="true"/>
-<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/model/operations" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/dnd/tracing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.help.base/debug" value="true"/>
+<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
-<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
-<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
-<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
+<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
+<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
+<mapEntry key="org.eclipse.help/debug" value="true"/>
<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/xml" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
-<mapEntry key="org.eclipse.emf.query/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
+<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
+<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/methods/entering" 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.validation/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/throwing" 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"/>
-<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/locking" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/run" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/providers" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/catching" value="false"/>
-<mapEntry key="com.soyatec.uml.core/trace/module/viewEvent" value="false"/>
-<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.query/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/canonical" value="false"/>
-<mapEntry key="org.eclipse.team.ftp/responses" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/formatter/enable_new" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
+<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
+<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
+<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
+<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
+<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
<mapEntry key="org.eclipse.jdt.ui/debug" 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.emf.query/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/admin" 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/debug.lifecycle" 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"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.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.gmf.runtime.common.ui/debug/methods/exiting" 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.gmf.runtime.common.core/debug/services/config" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
-<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/admin" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
+<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
+<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
+<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
+<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
+<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
+<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
+<mapEntry key="org.eclipse.net4j/debug" value="true"/>
+<mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
+<mapEntry key="org.eclipse.net4j/debug.lifecycle" value="true"/>
+<mapEntry key="org.eclipse.net4j/debug.lifecycle.dump" value="true"/>
+<mapEntry key="org.eclipse.net4j/perf" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug" value="true"/>
+<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug" value="true"/>
+<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/services" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/repeat" value="false"/>
-<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.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.osgi/debug/startlevel" value="false"/>
+<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
+<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
+<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
+<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
+<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
+<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
+<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
+<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="com.soyatec.uml.std/trace/module/modelMapper" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
+<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
+<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
+<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
+<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
+<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
+<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
+<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
+<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
+<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
+<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
+<mapEntry key="org.eclipse.team.core/debug" value="false"/>
+<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
+<mapEntry key="org.eclipse.team.core/streams" value="false"/>
+<mapEntry key="org.eclipse.team.core/threading" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug" value="true"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
+<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
+<mapEntry key="org.eclipse.team.ftp/debug" value="false"/>
<mapEntry key="org.eclipse.team.ftp/list" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/methods/entering" value="false"/>
-<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.team.ftp/requests" value="true"/>
+<mapEntry key="org.eclipse.team.ftp/responses" value="true"/>
+<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
+<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
+<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
+<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
+<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
+<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
+<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
+<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
+<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
+<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
+<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
+<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
+<mapEntry key="org.eclipse.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
+<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints/evaluation" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
+<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
+<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
+<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
+<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="com.soyatec.uml.std/trace/module/modelJavaEvent" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/undo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/admin" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
+<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
+<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
+<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/sources" 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.emf.query.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/resource/tracing" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug" value="true"/>
+<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
</mapAttribute>
+<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
<booleanAttribute key="useNamedJRE" value="true"/>
diff --git a/plugins/org.eclipse.net4j.tests/Net4j AllTests.launch b/plugins/org.eclipse.net4j.tests/Net4j AllTests.launch
index e69d693579..4a82821baf 100644
--- a/plugins/org.eclipse.net4j.tests/Net4j AllTests.launch
+++ b/plugins/org.eclipse.net4j.tests/Net4j AllTests.launch
@@ -10,10 +10,6 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.eclipse.emf.cdo&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
diff --git a/plugins/org.gastro.rcp.department/GastroDepartment1.launch b/plugins/org.gastro.rcp.department/GastroDepartment1.launch
index ded2f92622..ca93aca64e 100644
--- a/plugins/org.gastro.rcp.department/GastroDepartment1.launch
+++ b/plugins/org.gastro.rcp.department/GastroDepartment1.launch
@@ -14,7 +14,6 @@
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../gastro.department1.rt"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<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&#13;&#10;-consolelog"/>
@@ -24,8 +23,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.gastro.rcp.product"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.net4j"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.jface@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.p2.engine@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding.property@default:default,org.eclipse.osgi@-1:true,org.eclipse.ecf@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.expressions@default:default,org.eclipse.emf.common@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.ui.forms@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.jobs@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.ui.ide@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.osgi.services@default:default,org.eclipse.text@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.views@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.swt@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ui.win32@default:false,org.eclipse.ui@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.help@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.commands@default:default,com.ibm.icu@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jface.text@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.gastro.inventory.edit@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.net4j@default:default,org.gastro.rcp@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.common@default:default,org.gastro.business@default:default,org.eclipse.emf.cdo.edit@default:default,org.gastro.business.edit@default:default,org.gastro.inventory@default:default,org.eclipse.net4j.tcp@default:default,org.gastro.rcp.department@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.ecore.change@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.osgi@-1:true,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.commands@default:default,org.eclipse.help@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.swt@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.jface@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.ui.views@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.net@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ui.win32@default:false,org.eclipse.emf.ecore@default:default,org.eclipse.ui@default:default,org.eclipse.ui.workbench@default:default,com.ibm.icu@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.identity@default:default,javax.servlet@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.contenttype@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.gastro.rcp.department@default:default,org.eclipse.emf.cdo.net4j@default:default,org.gastro.inventory@default:default,org.eclipse.emf.cdo.edit@default:default,org.gastro.rcp@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j@default:default,org.eclipse.net4j.tcp@default:default,org.gastro.business@default:default,org.gastro.inventory.edit@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.util@default:default,org.gastro.business.edit@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="true"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/plugins/org.gastro.rcp.department/GastroDepartment2.launch b/plugins/org.gastro.rcp.department/GastroDepartment2.launch
index 9090a0fed1..99dbaa372e 100644
--- a/plugins/org.gastro.rcp.department/GastroDepartment2.launch
+++ b/plugins/org.gastro.rcp.department/GastroDepartment2.launch
@@ -14,7 +14,6 @@
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../gastro.department2.rt"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<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&#13;&#10;-consolelog"/>
@@ -24,8 +23,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.gastro.rcp.product"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.net4j"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.jface@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.p2.engine@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding.property@default:default,org.eclipse.osgi@-1:true,org.eclipse.ecf@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.expressions@default:default,org.eclipse.emf.common@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.ui.forms@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.jobs@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.ui.ide@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.osgi.services@default:default,org.eclipse.text@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.views@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.swt@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ui.win32@default:false,org.eclipse.ui@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.help@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.commands@default:default,com.ibm.icu@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jface.text@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.gastro.inventory.edit@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.net4j@default:default,org.gastro.rcp@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.common@default:default,org.gastro.business@default:default,org.eclipse.emf.cdo.edit@default:default,org.gastro.business.edit@default:default,org.gastro.inventory@default:default,org.eclipse.net4j.tcp@default:default,org.gastro.rcp.department@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.ecore.change@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.osgi@-1:true,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.commands@default:default,org.eclipse.help@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.swt@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.jface@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.ui.views@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.net@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ui.win32@default:false,org.eclipse.emf.ecore@default:default,org.eclipse.ui@default:default,org.eclipse.ui.workbench@default:default,com.ibm.icu@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.identity@default:default,javax.servlet@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.contenttype@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.gastro.rcp.department@default:default,org.eclipse.emf.cdo.net4j@default:default,org.gastro.inventory@default:default,org.eclipse.emf.cdo.edit@default:default,org.gastro.rcp@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j@default:default,org.eclipse.net4j.tcp@default:default,org.gastro.business@default:default,org.gastro.inventory.edit@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.util@default:default,org.gastro.business.edit@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="true"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/plugins/org.gastro.rcp.table/GastroTable1.launch b/plugins/org.gastro.rcp.table/GastroTable1.launch
index 5144362662..1f45a11ba4 100644
--- a/plugins/org.gastro.rcp.table/GastroTable1.launch
+++ b/plugins/org.gastro.rcp.table/GastroTable1.launch
@@ -14,7 +14,6 @@
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../gastro.table1.rt"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<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&#13;&#10;-consolelog"/>
@@ -24,8 +23,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.gastro.rcp.product"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.net4j.util"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.jface@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.p2.engine@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding.property@default:default,org.eclipse.osgi@-1:true,org.eclipse.ecf@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.expressions@default:default,org.eclipse.emf.common@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.ui.forms@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.jobs@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.ui.ide@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.osgi.services@default:default,org.eclipse.text@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.views@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.swt@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ui.win32@default:false,org.eclipse.ui@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.help@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.commands@default:default,com.ibm.icu@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jface.text@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.gastro.inventory.edit@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.net4j@default:default,org.gastro.rcp@default:default,org.gastro.rcp.table@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.common@default:default,org.gastro.business@default:default,org.eclipse.emf.cdo.edit@default:default,org.gastro.business.edit@default:default,org.gastro.inventory@default:default,org.eclipse.net4j.tcp@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.ecore.change@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.osgi@-1:true,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.commands@default:default,org.eclipse.help@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.swt@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.jface@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.ui.views@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.net@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ui.win32@default:false,org.eclipse.emf.ecore@default:default,org.eclipse.ui@default:default,org.eclipse.ui.workbench@default:default,com.ibm.icu@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.identity@default:default,javax.servlet@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.contenttype@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.net4j@default:default,org.gastro.rcp.table@default:default,org.gastro.inventory@default:default,org.eclipse.emf.cdo.edit@default:default,org.gastro.rcp@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j@default:default,org.eclipse.net4j.tcp@default:default,org.gastro.business@default:default,org.gastro.inventory.edit@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.util@default:default,org.gastro.business.edit@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="true"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/plugins/org.gastro.rcp.table/GastroTable2.launch b/plugins/org.gastro.rcp.table/GastroTable2.launch
index 78e59bb6d0..c2d9f48d0d 100644
--- a/plugins/org.gastro.rcp.table/GastroTable2.launch
+++ b/plugins/org.gastro.rcp.table/GastroTable2.launch
@@ -13,10 +13,6 @@
<booleanAttribute key="default" value="false"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../gastro.table2.rt"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<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&#13;&#10;-consolelog"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Ddebug=true&#13;&#10;-Dgastro.config=${workspace_loc:/org.gastro.rcp.table/config/table2.properties}"/>
@@ -24,10 +20,11 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.gastro.rcp.product"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.net4j.util"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.emf.common@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.security.win32.x86@default:false,com.ibm.icu*3.4.5@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.views@default:default,com.ibm.icu*4.0.1.v20090415@default:default,com.ibm.icu*3.6.1.v20080530@default:default,com.ibm.icu*3.8.1.v20081217@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ecf@default:default,org.eclipse.core.commands@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.p2.core@default:default,javax.servlet*2.4.0.v200806031604@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.jface@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.expressions@default:default,com.ibm.icu*4.0.0.v20081201@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.resources@default:default,javax.servlet*2.5.0.v200806031605@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.forms@default:default,com.ibm.icu*3.6.0.v20080530@default:default,org.eclipse.swt@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.ui.win32@default:false,org.eclipse.emf.edit.ui@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.team.core@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.help@default:default,org.eclipse.text@default:default,org.eclipse.jface.text@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ant.core@default:default,javax.servlet*2.3.0.v200806031603@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.jarprocessor@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.util@default:default,org.gastro.business.edit@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo@default:default,org.gastro.rcp.table@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j.tcp@default:default,org.gastro.rcp@default:default,org.gastro.business@default:default,org.gastro.inventory.edit@default:default,org.eclipse.emf.cdo.edit@default:default,org.gastro.inventory@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.ecore.change@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.osgi@-1:true,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.commands@default:default,org.eclipse.help@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.swt@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.jface@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.ui.views@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.net@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ui.win32@default:false,org.eclipse.emf.ecore@default:default,org.eclipse.ui@default:default,org.eclipse.ui.workbench@default:default,com.ibm.icu@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.identity@default:default,javax.servlet@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.contenttype@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.net4j@default:default,org.gastro.rcp.table@default:default,org.gastro.inventory@default:default,org.eclipse.emf.cdo.edit@default:default,org.gastro.rcp@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j@default:default,org.eclipse.net4j.tcp@default:default,org.gastro.business@default:default,org.gastro.inventory.edit@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.util@default:default,org.gastro.business.edit@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="true"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<booleanAttribute key="useProduct" value="true"/>
diff --git a/plugins/org.gastro.server/GastroServer.launch b/plugins/org.gastro.server/GastroServer.launch
index f480ee2bda..d26730ccb3 100644
--- a/plugins/org.gastro.server/GastroServer.launch
+++ b/plugins/org.gastro.server/GastroServer.launch
@@ -25,10 +25,10 @@
<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;-Dorg.osgi.service.http.port=9090&#13;&#10;-Dservlet.config=${workspace_loc:/org.gastro.server.web/config/gastro.properties}"/>
<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.equinox.registry"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.common@2:true,org.apache.commons.logging@default:default,org.h2@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.runtime@default:true,org.eclipse.osgi@-1:true,javax.servlet@default:default,org.eclipse.core.expressions@default:default,org.mortbay.jetty.util@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.equinox.http.registry@default:default,org.mortbay.jetty.server@default:true,org.eclipse.ant.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.jobs@default:default,org.eclipse.team.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.apache.derby@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.http.jetty@default:true,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.contenttype@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.server.db@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j@default:default,org.gastro.server.web@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.common@default:default,org.gastro.business@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j.db.derby@default:default,org.gastro.server@default:default,org.gastro.inventory@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.db@default:default,org.eclipse.emf.cdo.server.net4j@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.resources@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.ecore.change@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.variables@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.jobs@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem@default:default,org.apache.commons.logging@default:default,org.h2@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.expressions@default:default,org.apache.derby@default:default,org.eclipse.emf.common@default:default,org.mortbay.jetty.server@default:true,org.eclipse.equinox.http.jetty@default:true,org.mortbay.jetty.util@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.emf.ecore@default:default,javax.servlet@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.contenttype@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.net4j.db@default:default,org.gastro.inventory@default:default,org.eclipse.emf.cdo.common@default:default,org.gastro.server@default:default,org.gastro.server.web@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.db.h2@default:default,org.gastro.business@default:default,org.eclipse.net4j.db.derby@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.util@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="true"/>
diff --git a/plugins/org.gastro.testclient/GastroTestClient1.launch b/plugins/org.gastro.testclient/GastroTestClient1.launch
index ba0a4ecff1..f13ce30f8e 100644
--- a/plugins/org.gastro.testclient/GastroTestClient1.launch
+++ b/plugins/org.gastro.testclient/GastroTestClient1.launch
@@ -22,8 +22,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.net4j.util.ui"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.update.core.win32@default:false,org.sat4j.pb@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.jface@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.ui.net@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.update.configurator@3:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.apache.commons.logging@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.p2.engine@default:default,org.eclipse.osgi.util@default:default,org.eclipse.help.base@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.core.filesystem@default:default,org.apache.ant@default:default,org.eclipse.emf.teneo@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding.property@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.externaltools@default:default,org.eclipse.emf.teneo.hibernate@default:default,org.eclipse.emf.teneo.hibernate.mapper@default:default,org.eclipse.osgi@-1:true,org.eclipse.ecf@default:default,org.eclipse.debug.core@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.core.expressions@default:default,org.mortbay.jetty.util@default:default,org.eclipse.help.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.hibernate@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.runtime.compatibility@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.apache.lucene@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ui.forms@default:default,org.eclipse.team.ui@default:default,org.eclipse.ant.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.emf@default:default,org.eclipse.update.ui@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.teneo.annotations@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.rcp@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.core.variables@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.sat4j.core@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.help.appserver@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.update.core@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.console@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.emf.ant@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.junit@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.jsch.core@default:default,org.eclipse.osgi.services@default:default,org.apache.jasper@default:default,org.eclipse.text@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.apache.derby@default:default,com.jcraft.jsch@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.core.net@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.emf.ecore.edit@default:default,javax.servlet.jsp@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.boot@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.databinding.observable@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.codec@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.platform@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.swt@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.search@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ui.browser@default:default,org.eclipse.emf.importer@default:default,org.eclipse.compare.win32@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.ui.win32@default:false,org.eclipse.equinox.http.jetty@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.jdt.core@default:default,org.apache.commons.el@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.emf.importer.ecore@default:default,org.eclipse.help@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.mapping@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.teneo.hibernate.eclipse@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.workbench.texteditor@default:default,com.ibm.icu@default:default,org.eclipse.ui.intro@default:default,org.eclipse.emf.teneo.eclipse@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.compare@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jface.text@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.gastro.inventory.edit@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.net4j@default:default,org.gastro.testclient@default:default,org.eclipse.net4j@default:default,org.eclipse.net4j.jms.api@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.ui@default:default,org.gastro.business@default:default,org.eclipse.emf.cdo.edit@default:default,org.gastro.business.edit@default:default,org.gastro.inventory@default:default,org.eclipse.net4j.tcp@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.editors@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.lucene@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.exporter@default:default,com.jcraft.jsch@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.apache.lucene.analysis@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.jsch.core@default:default,org.eclipse.ui.net@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.ecore.change@default:default,org.hamcrest.core@default:default,org.eclipse.emf.teneo.hibernate.eclipse@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.osgi@-1:true,org.eclipse.equinox.p2.extensionlocation@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.emf.teneo@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.update.ui@default:default,org.apache.jasper@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.core.commands@default:default,org.eclipse.help.appserver@default:default,org.eclipse.help@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.emf.ant@default:default,org.eclipse.platform@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.update.scheduler@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.swt@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.update.core@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.emf.databinding@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.jface@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ui.browser@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.team.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.search@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.compare.win32@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.emf.importer@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.update.configurator@3:true,org.eclipse.emf.mapping.ecore2xml@default:default,org.hibernate@default:default,org.apache.commons.logging@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.emf.teneo.eclipse@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ui.console@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.boot@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.jdt.core@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.debug.ui@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jdt@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.expressions@default:default,org.eclipse.compare@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.apache.derby@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.common@default:default,org.junit@default:default,org.apache.commons.codec@default:default,org.apache.ant@default:default,org.mortbay.jetty.server@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf@default:default,org.mortbay.jetty.util@default:default,org.eclipse.emf.teneo.hibernate.mapper@default:default,org.eclipse.core.filesystem.win32.x86@default:false,javax.servlet.jsp@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.ui.win32@default:false,org.eclipse.debug.core@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.rcp@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ui@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.sat4j.core@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.ui.workbench@default:default,com.ibm.icu@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.emf.teneo.annotations@default:default,org.eclipse.ui.intro@default:default,javax.servlet@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.filebuffers@default:default,org.apache.commons.httpclient@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.emf.teneo.hibernate@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help.base@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.jms.api@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.emf.cdo.net4j@default:default,org.gastro.inventory@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j@default:default,org.eclipse.net4j.tcp@default:default,org.gastro.testclient@default:default,org.gastro.business@default:default,org.gastro.inventory.edit@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.util@default:default,org.gastro.business.edit@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="true"/>
diff --git a/plugins/org.gastro.testclient/GastroTestClient2.launch b/plugins/org.gastro.testclient/GastroTestClient2.launch
index 862d6e4fa5..bed85d232b 100644
--- a/plugins/org.gastro.testclient/GastroTestClient2.launch
+++ b/plugins/org.gastro.testclient/GastroTestClient2.launch
@@ -15,15 +15,14 @@
<stringAttribute key="location" value="${workspace_loc}/../gastro2.rt"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.net4j.util.ui"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.http.jetty@default:default,org.apache.commons.logging@default:default,org.eclipse.ui.ide.application@default:default,org.sat4j.pb@default:default,org.apache.lucene.analysis@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.emf.ecore.editor@default:default,org.apache.commons.codec@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.security@default:default,org.eclipse.compare.win32@default:default,org.eclipse.equinox.app@default:default,org.hibernate@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.ltk.ui.refactoring@default:default,com.ibm.icu@default:default,org.eclipse.emf@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.emf.common@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.emf.importer.ecore@default:default,org.eclipse.equinox.p2.publisher@default:default,org.apache.lucene@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.resources@default:default,org.eclipse.debug.core@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.core.variables@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jdt.launching@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.ui.views@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.emf.codegen@default:default,org.junit@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.emf.teneo.annotations@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.apache.commons.el@default:default,org.mortbay.jetty.util@default:default,org.eclipse.update.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.team.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.core.expressions@default:default,org.eclipse.help.appserver@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.text@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.emf.teneo.hibernate.eclipse@default:default,com.jcraft.jsch@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.teneo.eclipse@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.rcp@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ui.win32@default:false,org.sat4j.core@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.swt@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.teneo.hibernate@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.jface@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.emf.teneo@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ui.net@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.emf.importer.rose@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.update.configurator@3:true,org.eclipse.emf.importer@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.update.ui@default:default,org.eclipse.ui@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.help@default:default,javax.servlet@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.equinox.p2.ql@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.ui.ide@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.jdt@default:default,org.apache.derby@default:default,org.eclipse.emf.teneo.hibernate.mapper@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ant.core@default:default,org.eclipse.platform@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.apache.jasper@default:default,org.eclipse.emf.mapping.ecore@default:default,org.apache.ant@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jdt.core@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.preferences@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jsch.core@default:default,org.eclipse.emf.ant@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.editors@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.ui.console@default:default,org.apache.commons.httpclient@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.forms@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.core.boot@default:default,org.eclipse.help.base@default:default,org.eclipse.ui.browser@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.search@default:default,javax.servlet.jsp@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.help.webapp@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.emf.exporter@default:default,org.eclipse.emf.mapping.ui@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.net4j@default:default,org.gastro.inventory.edit@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.gastro.testclient@default:default,org.gastro.inventory@default:default,org.gastro.business@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j.jms.api@default:default,org.gastro.business.edit@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.net4j.tcp@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.editors@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.lucene@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.exporter@default:default,com.jcraft.jsch@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.apache.lucene.analysis@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.jsch.core@default:default,org.eclipse.ui.net@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.ecore.change@default:default,org.hamcrest.core@default:default,org.eclipse.emf.teneo.hibernate.eclipse@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.osgi@-1:true,org.eclipse.equinox.p2.extensionlocation@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.emf.teneo@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.update.ui@default:default,org.apache.jasper@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.core.commands@default:default,org.eclipse.help.appserver@default:default,org.eclipse.help@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.emf.ant@default:default,org.eclipse.platform@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.update.scheduler@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.swt@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.update.core@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.emf.databinding@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.jface@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ui.browser@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.team.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.search@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.compare.win32@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.emf.importer@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.update.configurator@3:true,org.eclipse.emf.mapping.ecore2xml@default:default,org.hibernate@default:default,org.apache.commons.logging@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.emf.teneo.eclipse@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ui.console@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.boot@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.jdt.core@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.debug.ui@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jdt@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.expressions@default:default,org.eclipse.compare@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.apache.derby@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.common@default:default,org.junit@default:default,org.apache.commons.codec@default:default,org.apache.ant@default:default,org.mortbay.jetty.server@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf@default:default,org.mortbay.jetty.util@default:default,org.eclipse.emf.teneo.hibernate.mapper@default:default,org.eclipse.core.filesystem.win32.x86@default:false,javax.servlet.jsp@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.ui.win32@default:false,org.eclipse.debug.core@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.rcp@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ui@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.sat4j.core@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.ui.workbench@default:default,com.ibm.icu@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.emf.teneo.annotations@default:default,org.eclipse.ui.intro@default:default,javax.servlet@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.filebuffers@default:default,org.apache.commons.httpclient@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.emf.teneo.hibernate@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help.base@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.jms.api@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.emf.cdo.net4j@default:default,org.gastro.inventory@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j@default:default,org.eclipse.net4j.tcp@default:default,org.gastro.testclient@default:default,org.gastro.business@default:default,org.gastro.inventory.edit@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.util@default:default,org.gastro.business.edit@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="true"/>
diff --git a/releng/org.eclipse.emf.cdo.formatchecker/FormatChecker.launch b/releng/org.eclipse.emf.cdo.formatchecker/FormatChecker.launch
index 2601858406..92d89d7feb 100644
--- a/releng/org.eclipse.emf.cdo.formatchecker/FormatChecker.launch
+++ b/releng/org.eclipse.emf.cdo.formatchecker/FormatChecker.launch
@@ -6,10 +6,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.formatchecker.FormatChecker"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.formatchecker"/>
</launchConfiguration>

Back to the top