summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-04-27 04:57:32 (EDT)
committerEike Stepper2008-04-27 04:57:32 (EDT)
commit3180457e9c4298980b5d3479222a59c913597cff (patch)
tree3e1af18ba15b2a0533850470aab442f26ea1e24b
parent6b28c52a080649bafbbbfc75bd9615d8b10ac91b (diff)
downloadcdo-3180457e9c4298980b5d3479222a59c913597cff.zip
cdo-3180457e9c4298980b5d3479222a59c913597cff.tar.gz
cdo-3180457e9c4298980b5d3479222a59c913597cff.tar.bz2
[227995] Implement a self-populating EPackageRegistry
https://bugs.eclipse.org/bugs/show_bug.cgi?id=227995
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/plugin.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch85
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java73
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageManagerDialog.java28
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOPackageRegistryImpl.java58
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java13
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/PreferenceButton.java13
13 files changed, 175 insertions, 141 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore
index 895e88a..21bc2a2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore
@@ -2,7 +2,7 @@
<ecore:EPackage xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mango"
- nsURI="http://www.eiswind.de/mango" nsPrefix="mango">
+ nsURI="http://www.eclipse.org/emf/CDO/tests/mango" nsPrefix="mango">
<eClassifiers xsi:type="ecore:EClass" name="ValueList">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/plugin.xml b/plugins/org.eclipse.emf.cdo.tests.mango/plugin.xml
index cf39098..4bcf855 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/plugin.xml
@@ -5,14 +5,14 @@
<copyright>
</copyright>
- $Id: plugin.xml,v 1.1 2008-01-30 08:58:25 estepper Exp $
+ $Id: plugin.xml,v 1.2 2008-04-27 08:57:26 estepper Exp $
-->
<plugin>
<extension point="org.eclipse.emf.ecore.generated_package">
<package
- uri = "http://www.eiswind.de/mango"
+ uri = "http://www.eclipse.org/emf/CDO/tests/mango"
class = "org.eclipse.emf.cdo.tests.mango.MangoPackage"
genModel = "model/mango.genmodel" />
</extension>
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java
index 21d437e..1494b0e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: MangoPackage.java,v 1.2 2008-02-23 10:00:33 estepper Exp $
+ * $Id: MangoPackage.java,v 1.3 2008-04-27 08:57:26 estepper Exp $
*/
package org.eclipse.emf.cdo.tests.mango;
@@ -39,7 +39,7 @@ public interface MangoPackage extends EPackage
*
* @generated
*/
- String eNS_URI = "http://www.eiswind.de/mango";
+ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/mango";
/**
* The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
index 821385c..1118249 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: MangoFactoryImpl.java,v 1.2 2008-02-23 10:00:34 estepper Exp $
+ * $Id: MangoFactoryImpl.java,v 1.3 2008-04-27 08:57:26 estepper Exp $
*/
package org.eclipse.emf.cdo.tests.mango.impl;
@@ -34,7 +34,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
try
{
MangoFactory theMangoFactory = (MangoFactory)EPackage.Registry.INSTANCE
- .getEFactory("http://www.eiswind.de/mango");
+ .getEFactory("http://www.eclipse.org/emf/CDO/tests/mango");
if (theMangoFactory != null)
{
return theMangoFactory;
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
index 3efbda3..ac3730a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
+++ b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
@@ -17,15 +17,14 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_15"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nosplash&#13;&#10;-console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.aspectj.tracing.debug=false&#13;&#10;-Xms40m&#13;&#10;-Xmx512m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.emf.cdo.ui"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,com.jcraft.jsch,javax.servlet,javax.servlet.jsp,org.apache.ant,org.apache.commons.el,org.apache.commons.logging,org.apache.jasper,org.apache.lucene,org.apache.lucene.analysis,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.databinding.beans,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.net,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.cvs,org.eclipse.cvs.source,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.emf,org.eclipse.emf.ant,org.eclipse.emf.cheatsheets,org.eclipse.emf.codegen,org.eclipse.emf.codegen.ecore,org.eclipse.emf.codegen.ecore.ui,org.eclipse.emf.codegen.ui,org.eclipse.emf.common,org.eclipse.emf.common.ui,org.eclipse.emf.commonj.sdo,org.eclipse.emf.converter,org.eclipse.emf.doc,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.change.edit,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.editor,org.eclipse.emf.ecore.sdo,org.eclipse.emf.ecore.sdo.doc,org.eclipse.emf.ecore.sdo.edit,org.eclipse.emf.ecore.sdo.editor,org.eclipse.emf.ecore.sdo.source,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.edit.ui,org.eclipse.emf.exporter,org.eclipse.emf.importer,org.eclipse.emf.importer.ecore,org.eclipse.emf.importer.java,org.eclipse.emf.importer.rose,org.eclipse.emf.mapping,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.emf.mapping.ecore2xml,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.emf.mapping.ui,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.emf.source,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.registry,org.eclipse.equinox.http.servlet,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.jdt,org.eclipse.jdt.compiler.apt,org.eclipse.jdt.compiler.tool,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.jsch.core,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.pde.ui.templates,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.source,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.ui,org.eclipse.text,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.log,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.scheduler,org.eclipse.update.ui,org.eclipse.xsd,org.eclipse.xsd.cheatsheets,org.eclipse.xsd.doc,org.eclipse.xsd.ecore.exporter,org.eclipse.xsd.ecore.importer,org.eclipse.xsd.edit,org.eclipse.xsd.editor,org.eclipse.xsd.source,org.junit,org.junit4,org.mortbay.jetty"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.tests.mango.edit,org.eclipse.net4j.buddies,org.eclipse.emf.cdo.examples,org.eclipse.emf.cdo.tests.model1.edit,org.eclipse.net4j.util.ui,org.eclipse.emf.cdo.tests.mango,org.eclipse.net4j.tcp,org.eclipse.emf.cdo.doc,org.eclipse.net4j.ui,org.eclipse.emf.cdo.protocol,org.eclipse.net4j.buddies.ui,org.eclipse.ant.optional.junit,test.srd,org.eclipse.net4j.chat,org.eclipse.net4j.util,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.ui,org.eclipse.emf.cdo.edit,org.eclipse.net4j.buddies.protocol,org.eclipse.emf.cdo,test.srd.edit,org.eclipse.emf.cdo.weaver,org.eclipse.net4j.chat.ui,org.eclipse.net4j,org.eclipse.emf.cdo.tests.model1,org.eclipse.emf.cdo.weaver.ui"/>
+<stringAttribute key="selected_target_plugins" value="org.apache.commons.el*1.0.0.v200803061811,org.eclipse.core.runtime*3.4.0.v20080324-1725,org.eclipse.xsd.cheatsheets*2.3.0.v200803041800,org.eclipse.pde.doc.user*3.3.0.v20080323,org.eclipse.emf.importer.ecore*2.4.0.v200803041800,org.eclipse.emf.importer.rose*2.4.0.v200803041800,org.eclipse.core.resources.compatibility*3.4.0.v20071204,org.eclipse.emf.mapping.ecore2ecore.editor*2.4.0.v200803041800,org.eclipse.emf.ecore.change.edit*2.4.0.v200803041800,org.eclipse.pde.core*3.4.0.v20080407-1400,org.eclipse.core.filesystem.win32.x86*1.1.0.v20071126,org.eclipse.ui.views*3.3.0.v20080408-0800,org.eclipse.osgi*3.4.0.v20080407,org.eclipse.update.core*3.2.200.v20080318,org.eclipse.core.runtime.compatibility*3.2.0.v20071008,org.eclipse.debug.core*3.4.0.v20080407,org.eclipse.help.appserver*3.1.200.v20070510,org.eclipse.xsd.doc*2.4.0.v200803041800,org.eclipse.emf.cheatsheets*2.4.0.v200803041800,org.eclipse.core.net*1.0.100.I20080322,org.eclipse.emf.ant*2.4.0.v200803041800,org.eclipse.core.boot*3.1.100.v20080218,org.eclipse.emf.ecore.sdo.edit*2.4.0.v200803041800,org.eclipse.equinox.http.registry*1.0.100.v20080303,org.eclipse.ui.workbench.texteditor*3.4.0.v20080408-0800,org.eclipse.pde.ui*3.4.0.v20080407-1400,org.eclipse.update.ui*3.2.100.v20080318,org.eclipse.equinox.launcher.win32.win32.x86*1.0.100.v20080407,org.eclipse.ui.console*3.3.0.v20080407,org.eclipse.emf*2.4.0.v200803041800,org.eclipse.emf.edit*2.4.0.v200803041800,org.eclipse.equinox.launcher*1.0.100.v20080303,org.eclipse.jdt.doc.isv*3.4.0.v20080408-0800,org.eclipse.core.runtime.compatibility.registry*3.2.200.v20070717,org.eclipse.core.runtime.compatibility.auth*3.2.100.v20070502,org.eclipse.equinox.jsp.jasper*1.0.100.v20080201,org.eclipse.ui.intro*3.2.200.v20080303,org.eclipse.jface.text*3.4.0.v20080408-0800,org.eclipse.team.cvs.ui*3.3.100.I20080304,org.eclipse.team.ui*3.4.0.I20080328,org.eclipse.ui.views.properties.tabbed*3.4.0.I20080324-1800,org.eclipse.ui.navigator*3.3.100.v20080408-0800,org.eclipse.ui.intro.universal*3.2.200.v20080225,org.eclipse.osgi.services*3.1.200.v20071203,org.eclipse.ui.presentations.r21*3.2.100.v20080408-0800,org.eclipse.emf.commonj.sdo*2.4.0.v200803041800,org.eclipse.emf.ecore.edit*2.4.0.v200803041800,org.eclipse.pde.junit.runtime*3.4.0.v20070115-0800,org.eclipse.platform.source*3.3.100.v20080403,org.eclipse.ui.ide*3.4.0.v20080408-0800,org.eclipse.ui.editors*3.4.0.v20080408-0800,org.eclipse.help.base*3.3.100.v20080331,org.eclipse.jdt.compiler.tool*1.0.100.v_852,org.eclipse.core.contenttype*3.3.0.v20080407,org.eclipse.search*3.4.0.v20080408-0800,org.eclipse.help.ui*3.3.100.v20080407,org.eclipse.pde.ui.templates*3.4.0.v20080331-2030,org.eclipse.xsd.editor*2.4.0.v200803041800,org.junit*3.8.2.v200711021030,org.eclipse.jdt.junit.runtime*3.3.0.v20080408-0800,org.eclipse.equinox.jsp.jasper.registry*1.0.0.v20080303,org.eclipse.text*3.4.0.v20080408-0800,org.eclipse.ui.browser*3.2.200.v20080407,org.eclipse.emf.common.ui*2.4.0.v200803041800,org.eclipse.debug.ui*3.4.0.v20080407,org.eclipse.emf.source*2.4.0.v200803041800,org.eclipse.ltk.ui.refactoring*3.4.0.v20080408-0800,javax.servlet*2.4.0.v200803061910,org.eclipse.ui.ide.application*1.0.0.v20080408-0800,org.eclipse.equinox.app*1.0.100.v20080331,org.eclipse.jface.databinding*1.2.0.v20080408-0800,org.apache.ant*1.7.0.v200803061910,org.eclipse.core.databinding*1.1.0.v20080408-0800,org.eclipse.ui.externaltools*3.2.0.v20080407,org.eclipse.jdt.junit4.runtime*1.0.200.v20080408-0800,org.eclipse.core.databinding.beans*1.1.0.v20080408-0800,org.eclipse.emf.ecore.change*2.4.0.v200803041800,org.eclipse.core.expressions*3.4.0.v20080408-0800,javax.servlet.jsp*2.0.0.v200803061910,org.eclipse.emf.codegen.ecore*2.4.0.v200803041800,org.eclipse.xsd*2.4.0.v200803041800,org.eclipse.equinox.registry*3.4.0.v20080316,org.eclipse.emf.importer.java*2.4.0.v200803041800,org.eclipse.core.variables*3.2.100.v20080324-1600,org.eclipse.emf.ecore.sdo*2.4.0.v200803041800,org.eclipse.platform.doc.isv*3.4.0.v20080408-0800,org.eclipse.xsd.ecore.importer*2.4.0.v200803041800,org.eclipse.emf.mapping*2.4.0.v200803041800,org.eclipse.xsd.source*2.4.0.v200803041800,org.eclipse.emf.edit.ui*2.4.0.v200803041800,org.eclipse.emf.importer*2.4.0.v200803041800,org.apache.commons.logging*1.0.4.v200803061811,org.apache.lucene.analysis*1.9.1.v200803061811,org.eclipse.xsd.edit*2.4.0.v200803041800,org.eclipse.help*3.3.100.v20080407,org.eclipse.emf.converter*2.4.0.v200803041800,org.eclipse.emf.ecore*2.4.0.v200803041800,org.eclipse.team.core*3.3.100.I20080326,org.apache.jasper*5.5.17.v200803061811,org.eclipse.jdt.core*3.4.0.v_852,org.eclipse.jface*3.4.0.v20080408-0800,org.apache.lucene*1.9.1.v200803061811,org.eclipse.pde*3.4.0.v20080326-1300,org.eclipse.emf.ecore.xmi*2.4.0.v200803041800,org.eclipse.emf.mapping.ui*2.4.0.v200803041800,org.eclipse.update.scheduler*3.2.100.v20080404,org.eclipse.core.commands*3.4.0.v20080408-0800,org.eclipse.emf.mapping.ecore2ecore*2.4.0.v200803041800,org.eclipse.emf.mapping.xsd2ecore.editor*2.4.0.v200803041800,org.eclipse.jdt.source*3.4.0.v20080408-0800,org.eclipse.pde.source*3.4.0.v20080326-1300,org.eclipse.emf.ecore.sdo.doc*2.4.0.v200803041800,org.eclipse.emf.mapping.xsd2ecore*2.4.0.v200803041800,org.eclipse.rcp.source*3.4.0.v20080402,org.eclipse.help.webapp*3.3.100.v20080407,org.eclipse.emf.common*2.4.0.v200803041800,org.eclipse.core.jobs*3.4.0.v20080310,org.eclipse.update.configurator*3.2.200.v20080404,org.eclipse.compare*3.4.0.I20080322,org.eclipse.jdt.core.manipulation*1.2.0.v20080408-0800,org.eclipse.jdt.junit*3.3.100.v20080408-0800,org.eclipse.emf.doc*2.4.0.v200803041800,org.eclipse.emf.mapping.ecore2xml.ui*2.4.0.v200803041800,org.eclipse.jdt.compiler.apt*1.0.100.v20080407-1345,org.eclipse.equinox.http.servlet*1.0.100.v20080201,org.eclipse.cvs.source*1.0.100.v20080324,org.eclipse.ant.core*3.2.0.v20080319,org.eclipse.ui.workbench*3.4.0.v20080408-0800,org.eclipse.jsch.core*1.1.100.I20080226,org.eclipse.jdt.ui*3.4.0.v20080408-0800,org.eclipse.xsd.ecore.exporter*2.4.0.v200803041800,org.eclipse.ui.views.log*1.0.0.v20080324-0900,org.eclipse.ui.forms*3.3.100.v20080407,com.jcraft.jsch*0.1.37.v200803061811,org.eclipse.ltk.core.refactoring*3.4.0.v20080408-0800,org.eclipse.pde.build*3.4.0.v20080323,org.junit4*4.3.1,org.eclipse.equinox.launcher*1.0.100.v20080407,org.eclipse.core.filesystem*1.2.0.v20080407,org.eclipse.emf.ecore.sdo.source*2.4.0.v200803041800,org.eclipse.swt.win32.win32.x86*3.4.0.v3438,org.eclipse.jdt*3.4.0.v20080408-0800,org.eclipse.team.cvs.core*3.3.100.I20080326,org.eclipse.osgi*3.4.0.v20080331,org.eclipse.core.resources*3.4.0.v20080407,org.eclipse.emf.codegen*2.4.0.v200803041800,org.eclipse.ui.cheatsheets*3.3.100.v20080303,org.eclipse.sdk*3.4.0.v20080403,org.eclipse.equinox.common*3.4.0.v20080407,com.ibm.icu*3.8.1.v20080304,org.eclipse.team.cvs.ssh2*3.2.200.I20071113,org.eclipse.emf.mapping.ecore2xml*2.4.0.v200803041800,org.eclipse.emf.codegen.ecore.ui*2.4.0.v200803041800,org.eclipse.rcp*3.4.0.v20080402,org.eclipse.ant.ui*3.3.0.v20080407,org.eclipse.equinox.preferences*3.2.200.v20080201,org.eclipse.ui.workbench.compatibility*3.2.0.v20080408-0800,org.eclipse.jdt.debug.ui*3.3.0.v20080407,org.eclipse.jdt.launching*3.4.0.v20080407,org.eclipse.team.cvs.ssh*3.2.100.I20080322,org.eclipse.pde.runtime*3.4.0.v20080324-0900,org.eclipse.equinox.common*3.4.0.v20080320,org.eclipse.jdt.doc.user*3.4.0.v20080408-0800,org.eclipse.core.resources.win32.x86*3.4.0.v20071204,org.eclipse.emf.codegen.ui*2.4.0.v200803041800,org.eclipse.emf.ecore.sdo.editor*2.4.0.v200803041800,org.eclipse.platform*3.3.100.v20080403,org.eclipse.ui*3.4.0.v20080408-1602,org.mortbay.jetty*5.1.11.v200803061811,org.eclipse.update.core.win32*3.2.100.v20080107,org.eclipse.osgi.util*3.1.300.v20080303,org.eclipse.ui.win32*3.2.100.v20080408-0800,org.eclipse.emf.ecore.editor*2.4.0.v200803041800,org.eclipse.ui.navigator.resources*3.3.100.v20080408-0800,org.eclipse.core.filebuffers*3.4.0.v20080408-0800,org.eclipse.jdt.debug*3.4.0.v20080407,org.eclipse.swt*3.4.0.v3438,org.eclipse.cvs*1.0.100.v20080324,org.eclipse.equinox.http.jetty*1.0.100.v20080303,org.eclipse.emf.exporter*2.4.0.v200803041800"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.tests.mango.edit*0.8.0.qualifer,org.eclipse.net4j.buddies*0.8.0.qualifier,org.eclipse.emf.cdo.examples*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model3.edit*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model1.edit*0.8.0.qualifier,org.eclipse.net4j.util.ui*0.8.0.qualifier,org.eclipse.emf.cdo.tests.mango*0.8.0.qualifier,org.eclipse.net4j.tcp*0.8.0.qualifier,org.eclipse.emf.cdo.doc*0.8.0.qualifier,org.eclipse.net4j.ui*0.8.0.qualifier,org.eclipse.emf.cdo.protocol*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model3*0.8.0.qualifier,org.eclipse.net4j.buddies.ui*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model2*0.8.0.qualifier,org.eclipse.ant.optional.junit*1.0.0,org.eclipse.net4j.chat*0.8.0.qualifier,org.eclipse.net4j.util*0.8.0.qualifier,org.eclipse.emf.cdo.server*0.8.0.qualifier,org.eclipse.emf.cdo.edit*0.8.0.qualifier,org.eclipse.emf.cdo.ui*0.8.0.qualifier,org.eclipse.net4j.buddies.protocol*0.8.0.qualifier,org.eclipse.emf.cdo*0.8.0.qualifier,org.eclipse.emf.cdo.weaver*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model2.edit*0.8.0.qualifier,org.eclipse.net4j.chat.ui*0.8.0.qualifier,org.eclipse.net4j*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model1*0.8.0.qualifier,org.eclipse.emf.cdo.weaver.ui*0.8.0.qualifier"/>
<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 54bbd60..e2a1a59 100644
--- a/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch
+++ b/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch
@@ -17,15 +17,14 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_15"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nosplash&#13;&#10;-console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.aspectj.tracing.debug=false&#13;&#10;-Xms40m&#13;&#10;-Xmx512m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.emf.cdo"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,com.jcraft.jsch,javax.servlet,javax.servlet.jsp,org.apache.ant,org.apache.commons.el,org.apache.commons.logging,org.apache.jasper,org.apache.lucene,org.apache.lucene.analysis,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.databinding.beans,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.net,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32.x86,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.cvs,org.eclipse.cvs.source,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.emf,org.eclipse.emf.ant,org.eclipse.emf.cheatsheets,org.eclipse.emf.codegen,org.eclipse.emf.codegen.ecore,org.eclipse.emf.codegen.ecore.ui,org.eclipse.emf.codegen.ui,org.eclipse.emf.common,org.eclipse.emf.common.ui,org.eclipse.emf.commonj.sdo,org.eclipse.emf.converter,org.eclipse.emf.doc,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.change.edit,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.editor,org.eclipse.emf.ecore.sdo,org.eclipse.emf.ecore.sdo.doc,org.eclipse.emf.ecore.sdo.edit,org.eclipse.emf.ecore.sdo.editor,org.eclipse.emf.ecore.sdo.source,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.edit.ui,org.eclipse.emf.exporter,org.eclipse.emf.importer,org.eclipse.emf.importer.ecore,org.eclipse.emf.importer.java,org.eclipse.emf.importer.rose,org.eclipse.emf.mapping,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.emf.mapping.ecore2xml,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.emf.mapping.ui,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.emf.source,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.registry,org.eclipse.equinox.http.servlet,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.jdt,org.eclipse.jdt.compiler.apt,org.eclipse.jdt.compiler.tool,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.jsch.core,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.pde.ui.templates,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.source,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.ui,org.eclipse.text,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.log,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.scheduler,org.eclipse.update.ui,org.eclipse.xsd,org.eclipse.xsd.cheatsheets,org.eclipse.xsd.doc,org.eclipse.xsd.ecore.exporter,org.eclipse.xsd.ecore.importer,org.eclipse.xsd.edit,org.eclipse.xsd.editor,org.eclipse.xsd.source,org.junit,org.junit4,org.mortbay.jetty"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.tests.mango.edit,org.eclipse.net4j.buddies,org.eclipse.emf.cdo.examples,org.eclipse.emf.cdo.tests.model1.edit,org.eclipse.net4j.util.ui,org.eclipse.emf.cdo.tests.mango,org.eclipse.net4j.tcp,org.eclipse.emf.cdo.doc,org.eclipse.net4j.ui,org.eclipse.emf.cdo.protocol,org.eclipse.net4j.buddies.ui,org.eclipse.ant.optional.junit,org.eclipse.net4j.chat,org.eclipse.net4j.util,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.ui,org.eclipse.emf.cdo.edit,org.eclipse.net4j.buddies.protocol,org.eclipse.emf.cdo,org.eclipse.emf.cdo.weaver,org.eclipse.net4j.chat.ui,org.eclipse.net4j,org.eclipse.emf.cdo.tests.model1,org.eclipse.emf.cdo.weaver.ui"/>
+<stringAttribute key="selected_target_plugins" value="org.apache.commons.el*1.0.0.v200803061811,org.eclipse.core.runtime*3.4.0.v20080324-1725,org.eclipse.xsd.cheatsheets*2.3.0.v200803041800,org.eclipse.pde.doc.user*3.3.0.v20080323,org.eclipse.emf.importer.ecore*2.4.0.v200803041800,org.eclipse.emf.importer.rose*2.4.0.v200803041800,org.eclipse.core.resources.compatibility*3.4.0.v20071204,org.eclipse.emf.mapping.ecore2ecore.editor*2.4.0.v200803041800,org.eclipse.emf.ecore.change.edit*2.4.0.v200803041800,org.eclipse.pde.core*3.4.0.v20080407-1400,org.eclipse.core.filesystem.win32.x86*1.1.0.v20071126,org.eclipse.ui.views*3.3.0.v20080408-0800,org.eclipse.osgi*3.4.0.v20080407,org.eclipse.update.core*3.2.200.v20080318,org.eclipse.core.runtime.compatibility*3.2.0.v20071008,org.eclipse.debug.core*3.4.0.v20080407,org.eclipse.help.appserver*3.1.200.v20070510,org.eclipse.xsd.doc*2.4.0.v200803041800,org.eclipse.emf.cheatsheets*2.4.0.v200803041800,org.eclipse.core.net*1.0.100.I20080322,org.eclipse.emf.ant*2.4.0.v200803041800,org.eclipse.core.boot*3.1.100.v20080218,org.eclipse.emf.ecore.sdo.edit*2.4.0.v200803041800,org.eclipse.equinox.http.registry*1.0.100.v20080303,org.eclipse.ui.workbench.texteditor*3.4.0.v20080408-0800,org.eclipse.pde.ui*3.4.0.v20080407-1400,org.eclipse.update.ui*3.2.100.v20080318,org.eclipse.equinox.launcher.win32.win32.x86*1.0.100.v20080407,org.eclipse.ui.console*3.3.0.v20080407,org.eclipse.emf*2.4.0.v200803041800,org.eclipse.emf.edit*2.4.0.v200803041800,org.eclipse.equinox.launcher*1.0.100.v20080303,org.eclipse.jdt.doc.isv*3.4.0.v20080408-0800,org.eclipse.core.runtime.compatibility.registry*3.2.200.v20070717,org.eclipse.core.runtime.compatibility.auth*3.2.100.v20070502,org.eclipse.equinox.jsp.jasper*1.0.100.v20080201,org.eclipse.ui.intro*3.2.200.v20080303,org.eclipse.jface.text*3.4.0.v20080408-0800,org.eclipse.team.cvs.ui*3.3.100.I20080304,org.eclipse.team.ui*3.4.0.I20080328,org.eclipse.ui.views.properties.tabbed*3.4.0.I20080324-1800,org.eclipse.ui.navigator*3.3.100.v20080408-0800,org.eclipse.ui.intro.universal*3.2.200.v20080225,org.eclipse.osgi.services*3.1.200.v20071203,org.eclipse.ui.presentations.r21*3.2.100.v20080408-0800,org.eclipse.emf.commonj.sdo*2.4.0.v200803041800,org.eclipse.emf.ecore.edit*2.4.0.v200803041800,org.eclipse.pde.junit.runtime*3.4.0.v20070115-0800,org.eclipse.platform.source*3.3.100.v20080403,org.eclipse.ui.ide*3.4.0.v20080408-0800,org.eclipse.ui.editors*3.4.0.v20080408-0800,org.eclipse.help.base*3.3.100.v20080331,org.eclipse.jdt.compiler.tool*1.0.100.v_852,org.eclipse.core.contenttype*3.3.0.v20080407,org.eclipse.search*3.4.0.v20080408-0800,org.eclipse.help.ui*3.3.100.v20080407,org.eclipse.pde.ui.templates*3.4.0.v20080331-2030,org.eclipse.xsd.editor*2.4.0.v200803041800,org.junit*3.8.2.v200711021030,org.eclipse.jdt.junit.runtime*3.3.0.v20080408-0800,org.eclipse.equinox.jsp.jasper.registry*1.0.0.v20080303,org.eclipse.text*3.4.0.v20080408-0800,org.eclipse.ui.browser*3.2.200.v20080407,org.eclipse.emf.common.ui*2.4.0.v200803041800,org.eclipse.debug.ui*3.4.0.v20080407,org.eclipse.emf.source*2.4.0.v200803041800,org.eclipse.ltk.ui.refactoring*3.4.0.v20080408-0800,javax.servlet*2.4.0.v200803061910,org.eclipse.ui.ide.application*1.0.0.v20080408-0800,org.eclipse.equinox.app*1.0.100.v20080331,org.eclipse.jface.databinding*1.2.0.v20080408-0800,org.apache.ant*1.7.0.v200803061910,org.eclipse.core.databinding*1.1.0.v20080408-0800,org.eclipse.ui.externaltools*3.2.0.v20080407,org.eclipse.jdt.junit4.runtime*1.0.200.v20080408-0800,org.eclipse.core.databinding.beans*1.1.0.v20080408-0800,org.eclipse.emf.ecore.change*2.4.0.v200803041800,org.eclipse.core.expressions*3.4.0.v20080408-0800,javax.servlet.jsp*2.0.0.v200803061910,org.eclipse.emf.codegen.ecore*2.4.0.v200803041800,org.eclipse.xsd*2.4.0.v200803041800,org.eclipse.equinox.registry*3.4.0.v20080316,org.eclipse.emf.importer.java*2.4.0.v200803041800,org.eclipse.core.variables*3.2.100.v20080324-1600,org.eclipse.emf.ecore.sdo*2.4.0.v200803041800,org.eclipse.platform.doc.isv*3.4.0.v20080408-0800,org.eclipse.xsd.ecore.importer*2.4.0.v200803041800,org.eclipse.emf.mapping*2.4.0.v200803041800,org.eclipse.xsd.source*2.4.0.v200803041800,org.eclipse.emf.edit.ui*2.4.0.v200803041800,org.eclipse.emf.importer*2.4.0.v200803041800,org.apache.commons.logging*1.0.4.v200803061811,org.apache.lucene.analysis*1.9.1.v200803061811,org.eclipse.xsd.edit*2.4.0.v200803041800,org.eclipse.help*3.3.100.v20080407,org.eclipse.emf.converter*2.4.0.v200803041800,org.eclipse.emf.ecore*2.4.0.v200803041800,org.eclipse.team.core*3.3.100.I20080326,org.apache.jasper*5.5.17.v200803061811,org.eclipse.jdt.core*3.4.0.v_852,org.eclipse.jface*3.4.0.v20080408-0800,org.apache.lucene*1.9.1.v200803061811,org.eclipse.pde*3.4.0.v20080326-1300,org.eclipse.emf.ecore.xmi*2.4.0.v200803041800,org.eclipse.emf.mapping.ui*2.4.0.v200803041800,org.eclipse.update.scheduler*3.2.100.v20080404,org.eclipse.core.commands*3.4.0.v20080408-0800,org.eclipse.emf.mapping.ecore2ecore*2.4.0.v200803041800,org.eclipse.emf.mapping.xsd2ecore.editor*2.4.0.v200803041800,org.eclipse.jdt.source*3.4.0.v20080408-0800,org.eclipse.pde.source*3.4.0.v20080326-1300,org.eclipse.emf.ecore.sdo.doc*2.4.0.v200803041800,org.eclipse.emf.mapping.xsd2ecore*2.4.0.v200803041800,org.eclipse.rcp.source*3.4.0.v20080402,org.eclipse.help.webapp*3.3.100.v20080407,org.eclipse.emf.common*2.4.0.v200803041800,org.eclipse.core.jobs*3.4.0.v20080310,org.eclipse.update.configurator*3.2.200.v20080404,org.eclipse.compare*3.4.0.I20080322,org.eclipse.jdt.core.manipulation*1.2.0.v20080408-0800,org.eclipse.jdt.junit*3.3.100.v20080408-0800,org.eclipse.emf.doc*2.4.0.v200803041800,org.eclipse.emf.mapping.ecore2xml.ui*2.4.0.v200803041800,org.eclipse.jdt.compiler.apt*1.0.100.v20080407-1345,org.eclipse.equinox.http.servlet*1.0.100.v20080201,org.eclipse.cvs.source*1.0.100.v20080324,org.eclipse.ant.core*3.2.0.v20080319,org.eclipse.ui.workbench*3.4.0.v20080408-0800,org.eclipse.jsch.core*1.1.100.I20080226,org.eclipse.jdt.ui*3.4.0.v20080408-0800,org.eclipse.xsd.ecore.exporter*2.4.0.v200803041800,org.eclipse.ui.views.log*1.0.0.v20080324-0900,org.eclipse.ui.forms*3.3.100.v20080407,com.jcraft.jsch*0.1.37.v200803061811,org.eclipse.ltk.core.refactoring*3.4.0.v20080408-0800,org.eclipse.pde.build*3.4.0.v20080323,org.junit4*4.3.1,org.eclipse.equinox.launcher*1.0.100.v20080407,org.eclipse.core.filesystem*1.2.0.v20080407,org.eclipse.emf.ecore.sdo.source*2.4.0.v200803041800,org.eclipse.swt.win32.win32.x86*3.4.0.v3438,org.eclipse.jdt*3.4.0.v20080408-0800,org.eclipse.team.cvs.core*3.3.100.I20080326,org.eclipse.osgi*3.4.0.v20080331,org.eclipse.core.resources*3.4.0.v20080407,org.eclipse.emf.codegen*2.4.0.v200803041800,org.eclipse.ui.cheatsheets*3.3.100.v20080303,org.eclipse.sdk*3.4.0.v20080403,org.eclipse.equinox.common*3.4.0.v20080407,com.ibm.icu*3.8.1.v20080304,org.eclipse.team.cvs.ssh2*3.2.200.I20071113,org.eclipse.emf.mapping.ecore2xml*2.4.0.v200803041800,org.eclipse.emf.codegen.ecore.ui*2.4.0.v200803041800,org.eclipse.rcp*3.4.0.v20080402,org.eclipse.ant.ui*3.3.0.v20080407,org.eclipse.equinox.preferences*3.2.200.v20080201,org.eclipse.ui.workbench.compatibility*3.2.0.v20080408-0800,org.eclipse.jdt.debug.ui*3.3.0.v20080407,org.eclipse.jdt.launching*3.4.0.v20080407,org.eclipse.team.cvs.ssh*3.2.100.I20080322,org.eclipse.pde.runtime*3.4.0.v20080324-0900,org.eclipse.equinox.common*3.4.0.v20080320,org.eclipse.jdt.doc.user*3.4.0.v20080408-0800,org.eclipse.core.resources.win32.x86*3.4.0.v20071204,org.eclipse.emf.codegen.ui*2.4.0.v200803041800,org.eclipse.emf.ecore.sdo.editor*2.4.0.v200803041800,org.eclipse.platform*3.3.100.v20080403,org.eclipse.ui*3.4.0.v20080408-1602,org.mortbay.jetty*5.1.11.v200803061811,org.eclipse.update.core.win32*3.2.100.v20080107,org.eclipse.osgi.util*3.1.300.v20080303,org.eclipse.ui.win32*3.2.100.v20080408-0800,org.eclipse.emf.ecore.editor*2.4.0.v200803041800,org.eclipse.ui.navigator.resources*3.3.100.v20080408-0800,org.eclipse.core.filebuffers*3.4.0.v20080408-0800,org.eclipse.jdt.debug*3.4.0.v20080407,org.eclipse.swt*3.4.0.v3438,org.eclipse.cvs*1.0.100.v20080324,org.eclipse.equinox.http.jetty*1.0.100.v20080303,org.eclipse.emf.exporter*2.4.0.v200803041800"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.tests.mango.edit*0.8.0.qualifer,org.eclipse.net4j.buddies*0.8.0.qualifier,org.eclipse.emf.cdo.examples*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model1.edit*0.8.0.qualifier,org.eclipse.net4j.util.ui*0.8.0.qualifier,org.eclipse.emf.cdo.tests.mango*0.8.0.qualifier,org.eclipse.net4j.tcp*0.8.0.qualifier,org.eclipse.emf.cdo.doc*0.8.0.qualifier,org.eclipse.net4j.ui*0.8.0.qualifier,org.eclipse.emf.cdo.protocol*0.8.0.qualifier,org.eclipse.net4j.buddies.ui*0.8.0.qualifier,org.eclipse.ant.optional.junit*1.0.0,org.eclipse.net4j.chat*0.8.0.qualifier,org.eclipse.net4j.util*0.8.0.qualifier,org.eclipse.emf.cdo.server*0.8.0.qualifier,org.eclipse.emf.cdo.edit*0.8.0.qualifier,org.eclipse.emf.cdo.ui*0.8.0.qualifier,org.eclipse.net4j.buddies.protocol*0.8.0.qualifier,org.eclipse.emf.cdo*0.8.0.qualifier,org.eclipse.emf.cdo.weaver*0.8.0.qualifier,org.eclipse.net4j.chat.ui*0.8.0.qualifier,org.eclipse.net4j*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model1*0.8.0.qualifier,org.eclipse.emf.cdo.weaver.ui*0.8.0.qualifier"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="true"/>
@@ -41,8 +40,8 @@
<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
<mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
<mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
@@ -55,8 +54,8 @@
<mapEntry key="org.eclipse.emf.cdo/debug.util" value="true"/>
<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
+<mapEntry key="org.eclipse.ui/debug" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
@@ -66,11 +65,11 @@
<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
<mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
<mapEntry key="org.eclipse.team.core/threading" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/debug.protocol" value="true"/>
<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.protocol/debug.protocol" value="true"/>
<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
<mapEntry key="org.eclipse.net4j.db/debug" value="true"/>
@@ -80,15 +79,15 @@
<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
+<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
<mapEntry key="org.eclipse.net4j.buddies.protocol/debug" value="true"/>
<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
@@ -100,8 +99,8 @@
<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
<mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
+<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
@@ -117,11 +116,11 @@
<mapEntry key="org.eclipse.net4j/debug.buffer" value="false"/>
<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
<mapEntry key="org.eclipse.emf.cdo/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
@@ -130,17 +129,17 @@
<mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/>
<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
<mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="false"/>
<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
+<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
@@ -152,27 +151,27 @@
<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
<mapEntry key="org.eclipse.update.core/debug" value="true"/>
<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
-<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/>
<mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
<mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/>
+<mapEntry key="org.eclipse.core.resources/history" value="false"/>
<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
<mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.protocol/perf.revision" value="true"/>
<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
@@ -184,11 +183,11 @@
<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
<mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
+<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
<mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/>
@@ -215,8 +214,8 @@
<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
<mapEntry key="org.eclipse.help/debug/context" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
<mapEntry key="org.eclipse.emf.cdo/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/>
<mapEntry key="org.eclipse.net4j.examples/debug" value="true"/>
<mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
@@ -228,12 +227,12 @@
<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
<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.core.resources/save" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
@@ -247,49 +246,49 @@
<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
<mapEntry key="org.eclipse.emf.cdo.protocol/perf.revision.reading" value="true"/>
+<mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/>
<mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/>
+<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/>
<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
<mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/>
<mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
<mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
+<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
+<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
<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.fileshare.ui/debug" value="true"/>
<mapEntry key="org.eclipse.net4j.util/debug.concurrency" value="true"/>
+<mapEntry key="org.eclipse.net4j.fileshare.ui/debug" 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.net4j.jms.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
<mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.help/debug/search" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
+<mapEntry key="org.eclipse.help/debug/search" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
+<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
<mapEntry key="org.eclipse.team.core/streams" value="false"/>
<mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
<mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
<mapEntry key="org.eclipse.emf.cdo.protocol/perf.revision.writing" value="true"/>
+<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
<mapEntry key="org.eclipse.emf.cdo/debug.session" value="true"/>
@@ -306,16 +305,16 @@
<mapEntry key="org.eclipse.net4j.chat/debug" value="true"/>
<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.emf.cdo.protocol/debug.model" value="true"/>
+<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.emf.cdo.server/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
+<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
<mapEntry key="org.eclipse.help/debug" value="true"/>
<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
@@ -327,10 +326,10 @@
<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
+<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
+<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.protocol/debug" value="true"/>
<mapEntry key="org.eclipse.emf.cdo/debug.resource" value="true"/>
<mapEntry key="org.eclipse.emf.cdo.protocol/perf" value="true"/>
@@ -349,8 +348,8 @@
<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
</mapAttribute>
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java
index 24cf937..d73923a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java
@@ -47,9 +47,25 @@ public final class OpenSessionAction extends LongRunningAction
if (dialog.open() == OpenSessionDialog.OK)
{
description = dialog.getServerDescription() + "/" + dialog.getRepositoryName();
- if (!dialog.isLegacySupport())
+ StringBuilder builder = new StringBuilder();
+ if (dialog.isAutomaticPackageRegistry())
{
- description += "?disableLegacyObjects=true";
+ builder.append("automaticPackageRegistry=true");
+ }
+
+ if (!dialog.isLegacyModelSupport())
+ {
+ if (builder.length() != 0)
+ {
+ builder.append("&");
+ }
+
+ builder.append("disableLegacyObjects=true");
+ }
+
+ if (builder.length() != 0)
+ {
+ description += "?" + builder;
}
}
else
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
index 8f04197..f5e0ada 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
@@ -57,8 +57,11 @@ public abstract class OM
public static final OMPreference<String[]> PREF_HISTORY_REPOSITORIES = //
PREFS.initArray("PREF_HISTORY_REPOSITORIES"); //$NON-NLS-1$
- public static final OMPreference<Boolean> PREF_LEGACY_SUPPORT = //
- PREFS.init("PREF_LEGACY_SUPPORT", false); //$NON-NLS-1$
+ public static final OMPreference<Boolean> PREF_AUTOMATIC_PACKAGE_REGISTY = //
+ PREFS.init("PREF_AUTOMATIC_PACKAGE_REGISTY", true); //$NON-NLS-1$
+
+ public static final OMPreference<Boolean> PREF_LEGACY_MODEL_SUPPORT = //
+ PREFS.init("PREF_LEGACY_MODEL_SUPPORT", false); //$NON-NLS-1$
static void start()
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java
index 76687c8..a91f2a9 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java
@@ -46,19 +46,28 @@ public class OpenSessionDialog extends TitleAreaDialog
private IHistory<String> repositoryHistory = new PreferenceHistory(OM.PREF_HISTORY_REPOSITORIES);
- private HistoryText connector;
+ private HistoryText connectorText;
- private Label example;
+ private Label exampleLabel;
- private HistoryText repository;
+ private HistoryText repositoryText;
- private PreferenceButton legacy;
+ private PreferenceButton automaticButton;
+
+ private PreferenceButton legacyButton;
private String serverDescription;
private String repositoryName;
- private boolean legacySupport;
+ private boolean automaticPackageRegistry;
+
+ private boolean legacyModelSupport;
+
+ static
+ {
+ OM.PREF_LEGACY_MODEL_SUPPORT.setValue(FSMUtil.isLegacySystemAvailable());
+ }
public OpenSessionDialog(IWorkbenchPage page)
{
@@ -82,9 +91,14 @@ public class OpenSessionDialog extends TitleAreaDialog
return repositoryName;
}
- public boolean isLegacySupport()
+ public boolean isAutomaticPackageRegistry()
{
- return legacySupport;
+ return automaticPackageRegistry;
+ }
+
+ public boolean isLegacyModelSupport()
+ {
+ return legacyModelSupport;
}
@Override
@@ -105,41 +119,45 @@ public class OpenSessionDialog extends TitleAreaDialog
setTitleImage(SharedIcons.getImage(SharedIcons.WIZBAN_PACKAGE_MANAGER));
new Label(composite, SWT.NONE).setText("Server Description:");
- connector = new HistoryText(composite, SWT.BORDER | SWT.SINGLE, connectorHistory);
- connector.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
+ connectorText = new HistoryText(composite, SWT.BORDER | SWT.SINGLE, connectorHistory);
+ connectorText.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
if (connectorHistory.isEmpty())
{
new Label(composite, SWT.NONE);
- example = new Label(composite, SWT.NONE);
- example.setText("for example 'tcp://estepper@dev.eclipse.org:2036'");
- example.setForeground(getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
+ exampleLabel = new Label(composite, SWT.NONE);
+ exampleLabel.setText("for exampleLabel 'tcp://estepper@dev.eclipse.org:2036'");
+ exampleLabel.setForeground(getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
}
new Label(composite, SWT.NONE).setText("Repository Name:");
- repository = new HistoryText(composite, SWT.BORDER | SWT.SINGLE, repositoryHistory);
- repository.getCombo().setLayoutData(new GridData(150, SWT.DEFAULT));
+ repositoryText = new HistoryText(composite, SWT.BORDER | SWT.SINGLE, repositoryHistory);
+ repositoryText.getCombo().setLayoutData(new GridData(150, SWT.DEFAULT));
new Label(composite, SWT.NONE);
- legacy = new PreferenceButton(composite, SWT.CHECK, "Legacy Support", OM.PREF_LEGACY_SUPPORT);
- legacy.getButton().setEnabled(FSMUtil.isLegacySystemAvailable());
+ automaticButton = new PreferenceButton(composite, SWT.CHECK, "Automatic Package Registry",
+ OM.PREF_AUTOMATIC_PACKAGE_REGISTY);
- connector.setFocus();
- connector.getCombo().addFocusListener(new FocusListener()
+ new Label(composite, SWT.NONE);
+ legacyButton = new PreferenceButton(composite, SWT.CHECK, "Legacy Model Support", OM.PREF_LEGACY_MODEL_SUPPORT);
+ legacyButton.getButton().setEnabled(FSMUtil.isLegacySystemAvailable());
+
+ connectorText.setFocus();
+ connectorText.getCombo().addFocusListener(new FocusListener()
{
public void focusGained(FocusEvent e)
{
- if (example != null)
+ if (exampleLabel != null)
{
- example.setVisible(true);
+ exampleLabel.setVisible(true);
}
}
public void focusLost(FocusEvent e)
{
- if (example != null)
+ if (exampleLabel != null)
{
- example.setVisible(false);
+ exampleLabel.setVisible(false);
}
}
});
@@ -150,13 +168,10 @@ public class OpenSessionDialog extends TitleAreaDialog
@Override
protected void okPressed()
{
- serverDescription = connector.getText();
- repositoryName = repository.getText();
- legacySupport = legacy.getSelection();
-
- connectorHistory.add(serverDescription);
- repositoryHistory.add(repositoryName);
- OM.PREF_LEGACY_SUPPORT.setValue(legacySupport);
+ serverDescription = connectorText.getText(true);
+ repositoryName = repositoryText.getText(true);
+ automaticPackageRegistry = automaticButton.getSelection(true);
+ legacyModelSupport = legacyButton.getSelection(true);
super.okPressed();
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageManagerDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageManagerDialog.java
index f84a268..e0ec0f3 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageManagerDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageManagerDialog.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.cdo.internal.ui.actions.RegisterGeneratedPackagesAction;
import org.eclipse.emf.cdo.internal.ui.actions.RegisterWorkspacePackagesAction;
import org.eclipse.emf.cdo.protocol.model.CDOPackage;
import org.eclipse.emf.cdo.ui.CDOItemProvider;
+import org.eclipse.emf.cdo.util.CDOPackageRegistry;
import org.eclipse.emf.cdo.util.CDOPackageType;
import org.eclipse.emf.cdo.util.CDOUtil;
@@ -169,9 +170,9 @@ public class PackageManagerDialog extends TitleAreaDialog
protected String getEPackageText(Object ePackage)
{
- if (ePackage instanceof EPackage.Descriptor)
+ if (ePackage == EcorePackage.eINSTANCE)
{
- return "?";
+ return "ECORE";
}
if (ePackage.getClass() == EPackageImpl.class)
@@ -179,13 +180,30 @@ public class PackageManagerDialog extends TitleAreaDialog
return "DYNAMIC";
}
- if (ePackage == EcorePackage.eINSTANCE)
+ String uri = EMPTY;
+ if (ePackage instanceof EPackage.Descriptor)
{
- return "ECORE";
+ CDOPackageRegistry registry = session.getPackageRegistry();
+ for (Map.Entry<String, Object> entry : registry.entrySet())
+ {
+ if (entry.getValue() == ePackage)
+ {
+ uri = entry.getKey();
+ break;
+ }
+ }
+ }
+ else
+ {
+ uri = ((EPackage)ePackage).getNsURI();
}
- String uri = ((EPackage)ePackage).getNsURI();
CDOPackageType packageType = CDOUtil.getPackageTypes().get(uri);
+ if (packageType == null)
+ {
+ return "?";
+ }
+
return packageType.toString();
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOPackageRegistryImpl.java
index 7572533..bad9675 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOPackageRegistryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOPackageRegistryImpl.java
@@ -197,17 +197,6 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements CDOP
session.addListener(sessionListener);
}
- public void putPackageDescriptor(String uri)
- {
- EPackage.Descriptor descriptor = new LocalPackageDescriptor(uri);
- if (TRACER.isEnabled())
- {
- TRACER.format("Registering package descriptor for {0}", uri);
- }
-
- put(uri, descriptor);
- }
-
protected void populate()
{
Map<String, CDOPackageType> packageTypes = CDOUtil.getPackageTypes();
@@ -217,48 +206,21 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements CDOP
if (packageType != CDOPackageType.LEGACY)
{
String uri = entry.getKey();
- if (containsKey(uri))
+ if (!containsKey(uri))
{
-
+ try
+ {
+ EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(uri);
+ putEPackage(ePackage);
+ }
+ catch (RuntimeException ex)
+ {
+ OM.LOG.error(ex);
+ }
}
}
}
}
- /**
- * @author Eike Stepper
- */
- private final class LocalPackageDescriptor implements EPackage.Descriptor
- {
- private String uri;
-
- private LocalPackageDescriptor(String uri)
- {
- this.uri = uri;
- }
-
- public String getURI()
- {
- return uri;
- }
-
- public EFactory getEFactory()
- {
- // TODO Implement method LocalPackageDescriptor.getEFactory()
- throw new UnsupportedOperationException("Not yet implemented");
- }
-
- public EPackage getEPackage()
- {
- return EPackage.Registry.INSTANCE.getEPackage(uri);
- }
-
- @Override
- public String toString()
- {
- return MessageFormat.format("LocalPackageDescriptor[{0}]", uri);
- }
- }
-
}
}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java
index f015e4b..be57e64 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java
@@ -130,9 +130,20 @@ public class HistoryText
return combo.getTextHeight();
}
+ public String getText(boolean addHistory)
+ {
+ String text = combo.getText();
+ if (addHistory)
+ {
+ history.add(text);
+ }
+
+ return text;
+ }
+
public String getText()
{
- return combo.getText();
+ return getText(false);
}
public void setText(String string)
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/PreferenceButton.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/PreferenceButton.java
index 2ea6833..09c3837 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/PreferenceButton.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/PreferenceButton.java
@@ -64,9 +64,20 @@ public class PreferenceButton
return button.getImage();
}
+ public boolean getSelection(boolean setPreference)
+ {
+ boolean selection = button.getSelection();
+ if (setPreference)
+ {
+ preference.setValue(selection);
+ }
+
+ return selection;
+ }
+
public boolean getSelection()
{
- return button.getSelection();
+ return getSelection(false);
}
public String getText()