[236313] IllegalArgumentException due to null value where a default was specified

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

16 files changed, 967 insertions, 109 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server/CDOServer.launch b/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
index ef53f5ed19..feb2e2a588 100644
--- a/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
+++ b/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
@@ -25,8 +25,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <stringAttribute key="selectedPlugin" value="org.eclipse.net4j.http.server"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.registry,org.eclipse.osgi.services,org.apache.derby,org.eclipse.equinox.http.servlet,org.eclipse.core.runtime,org.eclipse.equinox.http.registry,org.eclipse.osgi,org.eclipse.core.contenttype,org.eclipse.equinox.common,org.eclipse.core.jobs,org.mortbay.jetty*5.1.14.v200804221617,org.apache.commons.logging*1.1.1.v200803061910,org.eclipse.equinox.app,org.eclipse.equinox.http.jetty,javax.servlet*2.4.0.v200803061910,org.eclipse.equinox.preferences,org.eclipse.core.runtime.compatibility.auth"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.http.common,org.eclipse.emf.cdo.server.db,org.eclipse.net4j.buddies.server,org.eclipse.emf.cdo.common,org.eclipse.net4j.db,org.eclipse.net4j.tcp,org.eclipse.net4j.db.hsqldb,org.eclipse.net4j.util,org.eclipse.emf.cdo.server,org.eclipse.net4j.db.mysql,org.eclipse.net4j.buddies.common,org.eclipse.net4j.db.derby,org.eclipse.net4j,org.eclipse.net4j.http.server"/>
+<stringAttribute key="selected_target_plugins" value="org.apache.commons.logging*1.1.1.v20080605-1935,org.eclipse.core.jobs,org.eclipse.core.runtime.compatibility.auth,org.mortbay.jetty*5.1.14.v200806031611,org.eclipse.equinox.common,org.eclipse.equinox.registry,org.eclipse.osgi.services,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.http.registry,org.eclipse.core.contenttype,javax.servlet*2.5.0.v200806031605,org.eclipse.equinox.app,org.eclipse.equinox.http.jetty,org.apache.derby,org.eclipse.equinox.http.servlet,org.eclipse.equinox.preferences,org.eclipse.osgi,org.eclipse.core.runtime"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.server.db,org.eclipse.emf.cdo.common,org.eclipse.net4j.db,org.eclipse.net4j.tcp,org.eclipse.net4j.db.hsqldb,org.eclipse.net4j.util,org.eclipse.emf.cdo.server,org.eclipse.net4j.db.mysql,org.eclipse.net4j.db.derby,org.eclipse.net4j"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
 <booleanAttribute key="tracing" value="true"/>
@@ -34,7 +34,6 @@
 <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.emf.cdo.common/debug.revision" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
 <mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
@@ -42,22 +41,23 @@
 <mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
 <mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
 <mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
 <mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
 <mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
 <mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
 <mapEntry key="org.eclipse.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"/>
@@ -67,10 +67,9 @@
 <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.common/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
 <mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
@@ -81,15 +80,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"/>
@@ -101,8 +100,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"/>
@@ -118,11 +117,11 @@
 <mapEntry key="org.eclipse.net4j/debug.buffer" value="true"/>
 <mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.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"/>
@@ -131,17 +130,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="true"/>
 <mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.object" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="true"/>
 <mapEntry key="org.eclipse.core.resources/strings" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
 <mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
+<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
 <mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
@@ -153,31 +152,33 @@
 <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.common/perf.revision" value="true"/>
 <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug.model" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
+<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
 <mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
@@ -185,11 +186,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"/>
@@ -216,8 +217,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"/>
@@ -227,14 +228,15 @@
 <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.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"/>
@@ -249,48 +251,49 @@
 <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.common/perf.revision.reading" 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.emf.cdo.common/perf" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
 <mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
+<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
 <mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
 <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.emf.cdo.common/perf.revision.writing" value="true"/>
 <mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.help/debug/search" value="false"/>
 <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
+<mapEntry key="org.eclipse.help/debug/search" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
+<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
 <mapEntry key="org.eclipse.team.core/streams" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug" value="true"/>
 <mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
 <mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
 <mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.writing" value="true"/>
 <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"/>
@@ -308,15 +311,14 @@
 <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.common/debug.model" value="true"/>
 <mapEntry key="org.eclipse.debug.core/debug" value="false"/>
 <mapEntry key="org.eclipse.core.resources/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
+<mapEntry key="org.eclipse.net4j.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"/>
@@ -328,13 +330,11 @@
 <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.emf.cdo.common/debug" value="true"/>
+<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.common/perf" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
 <mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
@@ -350,8 +350,8 @@
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
 <mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.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.tests.mango/model/mango.ecore b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore
index 21bc2a26c6..fec4918639 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore
@@ -11,4 +11,12 @@
   <eClassifiers xsi:type="ecore:EClass" name="Value">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="ParameterPassing">
+    <eLiterals name="ByValue"/>
+    <eLiterals name="ByReference" value="1"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Parameter">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="passing" eType="#//ParameterPassing"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java
index 964dde69dd..e9e61d0372 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: MangoFactory.java,v 1.2 2008-02-23 10:00:33 estepper Exp $
+ * $Id: MangoFactory.java,v 1.3 2008-06-12 17:22:17 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.mango;
 
@@ -41,6 +41,14 @@ public interface MangoFactory extends EFactory
   Value createValue();
 
   /**
+   * Returns a new object of class '<em>Parameter</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>Parameter</em>'.
+   * @generated
+   */
+  Parameter createParameter();
+
+  /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @return the package supported by this factory.
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 406750744c..e264b68c02 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,12 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: MangoPackage.java,v 1.4 2008-06-03 06:41:27 estepper Exp $
+ * $Id: MangoPackage.java,v 1.5 2008-06-12 17:22:17 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.mango;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
@@ -116,6 +117,50 @@ public interface MangoPackage extends EPackage
   int VALUE_FEATURE_COUNT = 1;
 
   /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl <em>Parameter</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl
+   * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getParameter()
+   * @generated
+   */
+  int PARAMETER = 2;
+
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int PARAMETER__NAME = 0;
+
+  /**
+   * The feature id for the '<em><b>Passing</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int PARAMETER__PASSING = 1;
+
+  /**
+   * The number of structural features of the '<em>Parameter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int PARAMETER_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing <em>Parameter Passing</em>}'
+   * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing
+   * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getParameterPassing()
+   * @generated
+   */
+  int PARAMETER_PASSING = 3;
+
+  /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.ValueList <em>Value List</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
    * 
@@ -169,6 +214,48 @@ public interface MangoPackage extends EPackage
   EAttribute getValue_Name();
 
   /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.Parameter <em>Parameter</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Parameter</em>'.
+   * @see org.eclipse.emf.cdo.tests.mango.Parameter
+   * @generated
+   */
+  EClass getParameter();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.Parameter#getName <em>Name</em>}
+   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Name</em>'.
+   * @see org.eclipse.emf.cdo.tests.mango.Parameter#getName()
+   * @see #getParameter()
+   * @generated
+   */
+  EAttribute getParameter_Name();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.Parameter#getPassing
+   * <em>Passing</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Passing</em>'.
+   * @see org.eclipse.emf.cdo.tests.mango.Parameter#getPassing()
+   * @see #getParameter()
+   * @generated
+   */
+  EAttribute getParameter_Passing();
+
+  /**
+   * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing
+   * <em>Parameter Passing</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for enum '<em>Parameter Passing</em>'.
+   * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing
+   * @generated
+   */
+  EEnum getParameterPassing();
+
+  /**
    * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @return the factory that creates the instances of the model.
@@ -234,6 +321,42 @@ public interface MangoPackage extends EPackage
      */
     EAttribute VALUE__NAME = eINSTANCE.getValue_Name();
 
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl <em>Parameter</em>}'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl
+     * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getParameter()
+     * @generated
+     */
+    EClass PARAMETER = eINSTANCE.getParameter();
+
+    /**
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute PARAMETER__NAME = eINSTANCE.getParameter_Name();
+
+    /**
+     * The meta object literal for the '<em><b>Passing</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute PARAMETER__PASSING = eINSTANCE.getParameter_Passing();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing
+     * <em>Parameter Passing</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing
+     * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getParameterPassing()
+     * @generated
+     */
+    EEnum PARAMETER_PASSING = eINSTANCE.getParameterPassing();
+
   }
 
 } // MangoPackage
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/Parameter.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/Parameter.java
new file mode 100644
index 0000000000..5a79a20734
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/Parameter.java
@@ -0,0 +1,84 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Parameter.java,v 1.1 2008-06-12 17:22:17 estepper Exp $
+ */
+package org.eclipse.emf.cdo.tests.mango;
+
+import org.eclipse.emf.cdo.CDOObject;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Parameter</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.mango.Parameter#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.mango.Parameter#getPassing <em>Passing</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getParameter()
+ * @model
+ * @extends CDOObject
+ * @generated
+ */
+public interface Parameter extends CDOObject
+{
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getParameter_Name()
+   * @model
+   * @generated
+   */
+  String getName();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.Parameter#getName <em>Name</em>}' attribute. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
+
+  /**
+   * Returns the value of the '<em><b>Passing</b></em>' attribute. The literals are from the enumeration
+   * {@link org.eclipse.emf.cdo.tests.mango.ParameterPassing}. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Passing</em>' attribute isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Passing</em>' attribute.
+   * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing
+   * @see #setPassing(ParameterPassing)
+   * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getParameter_Passing()
+   * @model
+   * @generated
+   */
+  ParameterPassing getPassing();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.Parameter#getPassing <em>Passing</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Passing</em>' attribute.
+   * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing
+   * @see #getPassing()
+   * @generated
+   */
+  void setPassing(ParameterPassing value);
+
+} // Parameter
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java
new file mode 100644
index 0000000000..e42fa73bae
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java
@@ -0,0 +1,219 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ParameterPassing.java,v 1.1 2008-06-12 17:22:17 estepper Exp $
+ */
+package org.eclipse.emf.cdo.tests.mango;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Parameter Passing</b></em>', and
+ * utility methods for working with them. <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getParameterPassing()
+ * @model
+ * @generated
+ */
+public enum ParameterPassing implements Enumerator
+{
+  /**
+   * The '<em><b>By Value</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #BY_VALUE_VALUE
+   * @generated
+   * @ordered
+   */
+  BY_VALUE(0, "ByValue", "ByValue"),
+
+  /**
+   * The '<em><b>By Reference</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #BY_REFERENCE_VALUE
+   * @generated
+   * @ordered
+   */
+  BY_REFERENCE(1, "ByReference", "ByReference");
+
+  /**
+   * The '<em><b>By Value</b></em>' literal value. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>By Value</b></em>' literal object isn't clear, there really should be more of a
+   * description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @see #BY_VALUE
+   * @model name="ByValue"
+   * @generated
+   * @ordered
+   */
+  public static final int BY_VALUE_VALUE = 0;
+
+  /**
+   * The '<em><b>By Reference</b></em>' literal value. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>By Reference</b></em>' literal object isn't clear, there really should be more of a
+   * description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @see #BY_REFERENCE
+   * @model name="ByReference"
+   * @generated
+   * @ordered
+   */
+  public static final int BY_REFERENCE_VALUE = 1;
+
+  /**
+   * An array of all the '<em><b>Parameter Passing</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private static final ParameterPassing[] VALUES_ARRAY = new ParameterPassing[] { BY_VALUE, BY_REFERENCE, };
+
+  /**
+   * A public read-only list of all the '<em><b>Parameter Passing</b></em>' enumerators. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   */
+  public static final List<ParameterPassing> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+  /**
+   * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified literal value. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public static ParameterPassing get(String literal)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      ParameterPassing result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   */
+  public static ParameterPassing getByName(String name)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      ParameterPassing result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified integer value. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public static ParameterPassing get(int value)
+  {
+    switch (value)
+    {
+    case BY_VALUE_VALUE:
+      return BY_VALUE;
+    case BY_REFERENCE_VALUE:
+      return BY_REFERENCE;
+    }
+    return null;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private final int value;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private final String name;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private final String literal;
+
+  /**
+   * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private ParameterPassing(int value, String name, String literal)
+  {
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getValue()
+  {
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getLiteral()
+  {
+    return literal;
+  }
+
+  /**
+   * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    return literal;
+  }
+
+} // ParameterPassing
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 1118249e0d..05566921c6 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,16 +2,19 @@
  * <copyright>
  * </copyright>
  *
- * $Id: MangoFactoryImpl.java,v 1.3 2008-04-27 08:57:26 estepper Exp $
+ * $Id: MangoFactoryImpl.java,v 1.4 2008-06-12 17:22:17 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.mango.impl;
 
 import org.eclipse.emf.cdo.tests.mango.MangoFactory;
 import org.eclipse.emf.cdo.tests.mango.MangoPackage;
+import org.eclipse.emf.cdo.tests.mango.Parameter;
+import org.eclipse.emf.cdo.tests.mango.ParameterPassing;
 import org.eclipse.emf.cdo.tests.mango.Value;
 import org.eclipse.emf.cdo.tests.mango.ValueList;
 
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
@@ -71,6 +74,8 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
       return (EObject)createValueList();
     case MangoPackage.VALUE:
       return (EObject)createValue();
+    case MangoPackage.PARAMETER:
+      return (EObject)createParameter();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -81,6 +86,40 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
    * 
    * @generated
    */
+  @Override
+  public Object createFromString(EDataType eDataType, String initialValue)
+  {
+    switch (eDataType.getClassifierID())
+    {
+    case MangoPackage.PARAMETER_PASSING:
+      return createParameterPassingFromString(eDataType, initialValue);
+    default:
+      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public String convertToString(EDataType eDataType, Object instanceValue)
+  {
+    switch (eDataType.getClassifierID())
+    {
+    case MangoPackage.PARAMETER_PASSING:
+      return convertParameterPassingToString(eDataType, instanceValue);
+    default:
+      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public ValueList createValueList()
   {
     ValueListImpl valueList = new ValueListImpl();
@@ -103,6 +142,41 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
    * 
    * @generated
    */
+  public Parameter createParameter()
+  {
+    ParameterImpl parameter = new ParameterImpl();
+    return parameter;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public ParameterPassing createParameterPassingFromString(EDataType eDataType, String initialValue)
+  {
+    ParameterPassing result = ParameterPassing.get(initialValue);
+    if (result == null)
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
+          + eDataType.getName() + "'");
+    return result;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String convertParameterPassingToString(EDataType eDataType, Object instanceValue)
+  {
+    return instanceValue == null ? null : instanceValue.toString();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public MangoPackage getMangoPackage()
   {
     return (MangoPackage)getEPackage();
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
index c23d4976d5..e974ef2a8e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
@@ -2,17 +2,20 @@
  * <copyright>
  * </copyright>
  *
- * $Id: MangoPackageImpl.java,v 1.3 2008-06-03 06:41:27 estepper Exp $
+ * $Id: MangoPackageImpl.java,v 1.4 2008-06-12 17:22:17 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.mango.impl;
 
 import org.eclipse.emf.cdo.tests.mango.MangoFactory;
 import org.eclipse.emf.cdo.tests.mango.MangoPackage;
+import org.eclipse.emf.cdo.tests.mango.Parameter;
+import org.eclipse.emf.cdo.tests.mango.ParameterPassing;
 import org.eclipse.emf.cdo.tests.mango.Value;
 import org.eclipse.emf.cdo.tests.mango.ValueList;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
@@ -39,6 +42,20 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
   private EClass valueEClass = null;
 
   /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass parameterEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EEnum parameterPassingEEnum = null;
+
+  /**
    * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry
    * EPackage.Registry} by the package package URI value.
    * <p>
@@ -159,6 +176,46 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
    * 
    * @generated
    */
+  public EClass getParameter()
+  {
+    return parameterEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getParameter_Name()
+  {
+    return (EAttribute)parameterEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getParameter_Passing()
+  {
+    return (EAttribute)parameterEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EEnum getParameterPassing()
+  {
+    return parameterPassingEEnum;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public MangoFactory getMangoFactory()
   {
     return (MangoFactory)getEFactoryInstance();
@@ -189,6 +246,13 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
     valueEClass = createEClass(VALUE);
     createEAttribute(valueEClass, VALUE__NAME);
+
+    parameterEClass = createEClass(PARAMETER);
+    createEAttribute(parameterEClass, PARAMETER__NAME);
+    createEAttribute(parameterEClass, PARAMETER__PASSING);
+
+    // Create enums
+    parameterPassingEEnum = createEEnum(PARAMETER_PASSING);
   }
 
   /**
@@ -232,6 +296,17 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
     initEAttribute(getValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, Value.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+    initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, Parameter.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getParameter_Passing(), this.getParameterPassing(), "passing", null, 0, 1, Parameter.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    // Initialize enums and add enum literals
+    initEEnum(parameterPassingEEnum, ParameterPassing.class, "ParameterPassing");
+    addEEnumLiteral(parameterPassingEEnum, ParameterPassing.BY_VALUE);
+    addEEnumLiteral(parameterPassingEEnum, ParameterPassing.BY_REFERENCE);
+
     // Create resource
     createResource(eNS_URI);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/ParameterImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/ParameterImpl.java
new file mode 100644
index 0000000000..3c4f976eda
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/ParameterImpl.java
@@ -0,0 +1,103 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ParameterImpl.java,v 1.1 2008-06-12 17:22:17 estepper Exp $
+ */
+package org.eclipse.emf.cdo.tests.mango.impl;
+
+import org.eclipse.emf.cdo.tests.mango.MangoPackage;
+import org.eclipse.emf.cdo.tests.mango.Parameter;
+import org.eclipse.emf.cdo.tests.mango.ParameterPassing;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Parameter</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl#getPassing <em>Passing</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class ParameterImpl extends CDOObjectImpl implements Parameter
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected ParameterImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return MangoPackage.Literals.PARAMETER;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected int eStaticFeatureCount()
+  {
+    return 0;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getName()
+  {
+    return (String)eGet(MangoPackage.Literals.PARAMETER__NAME, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setName(String newName)
+  {
+    eSet(MangoPackage.Literals.PARAMETER__NAME, newName);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public ParameterPassing getPassing()
+  {
+    return (ParameterPassing)eGet(MangoPackage.Literals.PARAMETER__PASSING, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setPassing(ParameterPassing newPassing)
+  {
+    eSet(MangoPackage.Literals.PARAMETER__PASSING, newPassing);
+  }
+
+} // ParameterImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java
index ff73d3ec51..d7138e6ce9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java
@@ -2,11 +2,12 @@
  * <copyright>
  * </copyright>
  *
- * $Id: MangoAdapterFactory.java,v 1.3 2008-06-03 06:41:27 estepper Exp $
+ * $Id: MangoAdapterFactory.java,v 1.4 2008-06-12 17:22:17 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.mango.util;
 
 import org.eclipse.emf.cdo.tests.mango.MangoPackage;
+import org.eclipse.emf.cdo.tests.mango.Parameter;
 import org.eclipse.emf.cdo.tests.mango.Value;
 import org.eclipse.emf.cdo.tests.mango.ValueList;
 
@@ -86,6 +87,12 @@ public class MangoAdapterFactory extends AdapterFactoryImpl
     }
 
     @Override
+    public Adapter caseParameter(Parameter object)
+    {
+      return createParameterAdapter();
+    }
+
+    @Override
     public Adapter defaultCase(EObject object)
     {
       return createEObjectAdapter();
@@ -135,6 +142,20 @@ public class MangoAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.Parameter <em>Parameter</em>}
+   * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
+   * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.tests.mango.Parameter
+   * @generated
+   */
+  public Adapter createParameterAdapter()
+  {
+    return null;
+  }
+
+  /**
    * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
    * 
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
index 207a0df8cb..4e308b2766 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
@@ -2,11 +2,12 @@
  * <copyright>
  * </copyright>
  *
- * $Id: MangoSwitch.java,v 1.3 2008-06-03 06:41:27 estepper Exp $
+ * $Id: MangoSwitch.java,v 1.4 2008-06-12 17:22:17 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.mango.util;
 
 import org.eclipse.emf.cdo.tests.mango.MangoPackage;
+import org.eclipse.emf.cdo.tests.mango.Parameter;
 import org.eclipse.emf.cdo.tests.mango.Value;
 import org.eclipse.emf.cdo.tests.mango.ValueList;
 
@@ -103,6 +104,13 @@ public class MangoSwitch<T>
       if (result == null) result = defaultCase(theEObject);
       return result;
     }
+    case MangoPackage.PARAMETER:
+    {
+      Parameter parameter = (Parameter)theEObject;
+      T result = caseParameter(parameter);
+      if (result == null) result = defaultCase(theEObject);
+      return result;
+    }
     default:
       return defaultCase(theEObject);
     }
@@ -139,6 +147,21 @@ public class MangoSwitch<T>
   }
 
   /**
+   * Returns the result of interpreting the object as an instance of '<em>Parameter</em>'. <!-- begin-user-doc --> This
+   * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+   * 
+   * @param object
+   *          the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Parameter</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseParameter(Parameter object)
+  {
+    return null;
+  }
+
+  /**
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
index d8f1ad0402..93f1c5584e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
@@ -15,7 +15,9 @@ import org.eclipse.emf.cdo.CDOTransaction;
 import org.eclipse.emf.cdo.CDOView;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.tests.model1.Model1Factory;
+import org.eclipse.emf.cdo.tests.model1.Product;
 import org.eclipse.emf.cdo.tests.model1.Supplier;
+import org.eclipse.emf.cdo.tests.model1.VAT;
 
 /**
  * @author Eike Stepper
@@ -34,10 +36,8 @@ public class AttributeTest extends AbstractCDOTest
       CDOResource resource = transaction.createResource("/my/resource");
       resource.getContents().add(supplier);
       assertEquals(true, supplier.isPreferred());
-
       transaction.commit();
       assertEquals(true, supplier.isPreferred());
-
       session.close();
     }
 
@@ -47,7 +47,34 @@ public class AttributeTest extends AbstractCDOTest
       CDOResource resource = view.getResource("/my/resource");
       Supplier supplier = (Supplier)resource.getContents().get(0);
       assertEquals(true, supplier.isPreferred());
+      view.close();
+      session.close();
+    }
+  }
+
+  public void testEnumDefaults() throws Exception
+  {
+    {
+      Product product = Model1Factory.eINSTANCE.createProduct();
+      product.setName("Test Product");
+      assertEquals(VAT.VAT15, product.getVat());
+
+      CDOSession session = openModel1Session();
+      CDOTransaction transaction = session.openTransaction();
+      CDOResource resource = transaction.createResource("/my/resource");
+      resource.getContents().add(product);
+      assertEquals(VAT.VAT15, product.getVat());
+      transaction.commit();
+      assertEquals(VAT.VAT15, product.getVat());
+      session.close();
+    }
 
+    {
+      CDOSession session = openModel1Session();
+      CDOView view = session.openView();
+      CDOResource resource = view.getResource("/my/resource");
+      Product product = (Product)resource.getContents().get(0);
+      assertEquals(VAT.VAT15, product.getVat());
       view.close();
       session.close();
     }
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
index 9b5132c0ec..dc9c1bf9a6 100644
--- a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
+++ b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
@@ -23,7 +23,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <stringAttribute key="selectedPlugin" value="org.eclipse.net4j.http.common"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.xsd.source,org.eclipse.core.runtime.compatibility.registry,org.eclipse.ui,org.eclipse.emf.exporter,org.eclipse.jface.databinding,org.eclipse.core.resources.win32.x86,org.eclipse.update.ui,org.eclipse.jdt.junit4.runtime,org.eclipse.xsd.edit,org.eclipse.emf.ecore.sdo,org.eclipse.jdt.doc.isv,org.eclipse.emf.mapping,org.eclipse.equinox.registry,org.eclipse.sdk,org.eclipse.jdt.launching,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.ant.core,org.eclipse.emf.ecore.xmi,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.jface,org.eclipse.xsd.doc,org.apache.jasper,org.eclipse.xsd.cheatsheets,org.eclipse.emf.ecore.sdo.editor,org.eclipse.emf.mapping.ecore2xml,org.eclipse.core.resources.compatibility,org.eclipse.team.core,org.eclipse.emf.edit.ui,org.eclipse.emf.codegen.ecore.ui,org.eclipse.search,org.eclipse.jdt.compiler.tool,org.eclipse.ui.ide.application,org.eclipse.help.appserver,org.eclipse.ui.editors,org.eclipse.ui.views.properties.tabbed,org.eclipse.equinox.security.win32.x86,com.ibm.icu,org.eclipse.equinox.jsp.jasper,org.eclipse.pde,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi.services,org.eclipse.ltk.core.refactoring,org.eclipse.equinox.http.servlet,org.eclipse.jdt.doc.user,org.eclipse.swt,org.eclipse.equinox.security,org.eclipse.emf.converter,org.eclipse.jface.text,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.pde.core,org.eclipse.jdt.core.manipulation,org.eclipse.core.runtime,org.junit4,org.eclipse.debug.ui,org.eclipse.core.variables,org.eclipse.ui.workbench.texteditor,org.eclipse.ui.forms,org.eclipse.emf.ecore.sdo.doc,org.eclipse.update.core.win32,org.eclipse.emf.codegen,org.apache.ant*1.7.0.v200803061910,org.eclipse.team.ui,org.apache.lucene.analysis,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.ui.cheatsheets,org.eclipse.emf.ecore.sdo.edit,org.eclipse.core.resources,com.jcraft.jsch*0.1.37.v200803061811,org.eclipse.jdt.debug.ui,org.eclipse.emf.importer.rose,org.eclipse.ui.externaltools,org.eclipse.emf.source,org.eclipse.equinox.http.registry,org.eclipse.emf.ecore.edit,org.eclipse.emf.edit,org.eclipse.xsd.editor,org.eclipse.swt.win32.win32.x86,org.eclipse.cvs,org.eclipse.emf.mapping.ui,org.eclipse.emf.doc,org.eclipse.ui.win32,org.eclipse.core.filebuffers,org.eclipse.emf.codegen.ui,org.eclipse.core.databinding,org.eclipse.emf.common,org.eclipse.rcp.source,org.eclipse.help.ui,javax.servlet.jsp*2.0.0.v200803061910,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.pde.ui.templates,org.eclipse.xsd,org.apache.commons.httpclient*3.1.0.v200803061910,org.eclipse.osgi,org.eclipse.jdt.junit.runtime,org.eclipse.ui.ide,org.eclipse.jdt.ui,org.eclipse.core.boot,org.eclipse.emf.ecore,org.eclipse.ui.workbench,org.eclipse.update.configurator,org.eclipse.core.net.win32.x86,org.eclipse.pde.ui,org.eclipse.jsch.core,org.eclipse.platform.source,org.eclipse.core.contenttype,org.eclipse.text,org.eclipse.emf.ecore.sdo.source,org.eclipse.ui.console,org.eclipse.equinox.common,org.junit*3.8.2.v20080327,org.eclipse.emf.ecore.change.edit,org.eclipse.xsd.ecore.importer,org.eclipse.ui.navigator,org.eclipse.help,org.eclipse.emf.cheatsheets,org.eclipse.ui.intro.universal,org.eclipse.emf.common.ui,org.eclipse.jdt.compiler.apt,org.eclipse.core.jobs,org.eclipse.pde.junit.runtime,org.eclipse.team.cvs.core,org.eclipse.ant.ui,org.eclipse.core.expressions,org.eclipse.ui.presentations.r21,org.apache.commons.el,org.eclipse.core.net,org.mortbay.jetty*5.1.14.v200804221617,org.eclipse.ui.browser,org.eclipse.emf.ecore.change,org.eclipse.debug.core,org.apache.lucene*1.9.1.v200803061811,org.eclipse.jdt.core,org.eclipse.core.runtime.compatibility,org.eclipse.ui.views,org.eclipse.update.core,org.eclipse.equinox.launcher,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.emf.importer.java,org.eclipse.equinox.app,org.eclipse.platform.doc.isv,org.eclipse.ui.navigator.resources,org.apache.commons.logging*1.0.4.v200803061811,org.eclipse.equinox.http.jetty,org.eclipse.pde.source,org.eclipse.jdt.junit,javax.servlet*2.4.0.v200803061910,org.eclipse.equinox.preferences,org.eclipse.xsd.ecore.exporter,org.eclipse.emf.importer,org.eclipse.emf.codegen.ecore,org.eclipse.pde.runtime,org.eclipse.core.commands,org.eclipse.pde.doc.user,org.eclipse.cvs.source,org.eclipse.compare,org.eclipse.core.databinding.beans,org.eclipse.emf.importer.ecore,org.eclipse.ui.workbench.compatibility,org.eclipse.osgi.util,org.eclipse.jdt.source,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ssh,org.eclipse.pde.build,org.eclipse.help.base,org.eclipse.emf.ecore.editor,org.eclipse.emf.commonj.sdo,org.eclipse.ui.intro,org.eclipse.jdt.debug,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.core.filesystem.win32.x86,org.eclipse.team.cvs.ui,org.eclipse.core.runtime.compatibility.auth,org.eclipse.emf.ant,org.eclipse.core.filesystem,org.eclipse.help.webapp,org.eclipse.ui.views.log,org.eclipse.update.scheduler,org.apache.commons.codec*1.3.0.v200803061910"/>
+<stringAttribute key="selected_target_plugins" value="org.apache.lucene*1.9.1.v20080530-1600,org.eclipse.team.cvs.core,org.eclipse.emf.common,org.eclipse.jdt.source,org.eclipse.team.core,org.eclipse.help,org.eclipse.core.resources.compatibility,org.apache.commons.el,org.eclipse.pde.ui.templates,org.eclipse.core.resources.win32.x86,org.apache.commons.logging*1.1.1.v20080605-1935,org.eclipse.equinox.security.win32.x86,org.eclipse.update.core,org.eclipse.team.cvs.ui,org.eclipse.emf.converter,org.eclipse.emf.cheatsheets,org.apache.ant*1.7.0.v200803061910,org.eclipse.ui.win32,org.junit4,org.eclipse.emf.ant,org.eclipse.team.cvs.ssh,org.eclipse.jface.databinding,org.eclipse.help.base,org.eclipse.jdt.junit,org.eclipse.ant.core,org.eclipse.emf.importer,org.eclipse.update.ui,org.eclipse.emf.codegen.ecore.ui,org.eclipse.cvs,org.eclipse.ui.editors,org.eclipse.core.filesystem.win32.x86,org.eclipse.jdt.ui,org.eclipse.jdt.debug.ui,org.eclipse.core.net.win32.x86,org.eclipse.debug.ui,org.eclipse.core.jobs,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.core.runtime.compatibility.auth,org.eclipse.emf.ecore.change,org.eclipse.emf.mapping,org.eclipse.pde.doc.user,org.eclipse.emf.exporter,org.eclipse.pde.build,org.mortbay.jetty*5.1.14.v200806031611,org.eclipse.compare,org.eclipse.emf.doc,org.eclipse.text,org.eclipse.jface,org.apache.jasper,org.eclipse.emf.codegen.ecore,org.eclipse.core.filebuffers,org.eclipse.cvs.source,org.eclipse.help.webapp,org.eclipse.help.appserver,org.eclipse.swt.win32.win32.x86,org.eclipse.equinox.common,org.eclipse.core.variables,org.eclipse.xsd.ecore.exporter,org.eclipse.jdt.compiler.tool,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.equinox.registry,org.eclipse.team.cvs.ssh2,org.eclipse.core.expressions,org.apache.lucene.analysis,org.eclipse.core.databinding.beans,org.eclipse.core.databinding,org.eclipse.osgi.services,org.eclipse.emf.codegen.ui,org.eclipse.jdt.launching,org.eclipse.core.runtime.compatibility.registry,org.eclipse.ltk.core.refactoring,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit.ui,org.eclipse.pde.core,org.eclipse.emf.mapping.ui,org.eclipse.emf.importer.rose,org.eclipse.equinox.http.registry,org.eclipse.pde.runtime,org.eclipse.ant.ui,org.eclipse.core.filesystem,org.eclipse.equinox.jsp.jasper,org.eclipse.search,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.emf.common.ui,org.eclipse.core.contenttype,org.eclipse.ui.workbench.compatibility,org.eclipse.osgi.util,org.eclipse.xsd,org.eclipse.ui.intro.universal,org.eclipse.emf.mapping.ecore2xml,org.eclipse.xsd.ecore.importer,org.eclipse.emf.ecore.editor,org.eclipse.emf.importer.ecore,org.eclipse.emf.edit,org.eclipse.platform.source,org.eclipse.emf.ecore.sdo.source,org.eclipse.ui.browser,org.eclipse.debug.core,org.eclipse.core.commands,org.eclipse.ui.views.log,org.eclipse.update.core.win32,org.eclipse.emf.ecore.edit,org.eclipse.ui.ide,javax.servlet*2.5.0.v200806031605,org.eclipse.ui.workbench,org.eclipse.jdt.junit4.runtime,org.eclipse.emf.ecore.change.edit,org.eclipse.team.ui,org.eclipse.xsd.edit,org.eclipse.jdt.doc.isv,org.eclipse.ui,org.eclipse.equinox.app,org.eclipse.update.scheduler,org.eclipse.pde.source,org.eclipse.equinox.launcher,com.ibm.icu,org.eclipse.core.resources,org.eclipse.swt,org.eclipse.ui.intro,org.eclipse.emf.ecore,org.eclipse.equinox.http.jetty,org.eclipse.jdt.compiler.apt,org.eclipse.update.configurator,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.emf.ecore.sdo.edit,org.eclipse.core.net,org.eclipse.emf.source,org.eclipse.jsch.core,org.eclipse.emf.ecore.sdo,org.eclipse.xsd.source,org.eclipse.ui.ide.application,org.eclipse.ui.views.properties.tabbed,javax.servlet.jsp*2.0.0.v200806031607,org.eclipse.emf.ecore.sdo.editor,org.eclipse.core.boot,org.junit*3.8.2.v20080602-1318,org.eclipse.ui.externaltools,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.equinox.security,org.eclipse.emf.ecore.sdo.doc,org.eclipse.ui.forms,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.doc.user,org.eclipse.jdt.debug,org.eclipse.platform.doc.isv,org.eclipse.ui.cheatsheets,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.jdt.core,org.eclipse.equinox.http.servlet,org.eclipse.ui.navigator.resources,org.eclipse.pde.junit.runtime,org.eclipse.ui.views,org.eclipse.sdk,org.eclipse.pde.ui,org.eclipse.emf.codegen,org.eclipse.emf.commonj.sdo,org.eclipse.xsd.editor,org.eclipse.ltk.ui.refactoring,org.eclipse.core.runtime.compatibility,org.eclipse.xsd.cheatsheets,org.eclipse.xsd.doc,org.eclipse.equinox.preferences,org.eclipse.osgi,org.eclipse.emf.importer.java,org.eclipse.rcp.source,org.eclipse.core.runtime,org.eclipse.ui.presentations.r21,org.eclipse.ui.console,org.eclipse.pde,org.eclipse.help.ui,com.jcraft.jsch*0.1.37.v200803061811,org.eclipse.jdt.core.manipulation,org.eclipse.ui.workbench.texteditor,org.eclipse.ui.navigator,org.eclipse.jface.text"/>
 <stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.tests.mango.edit,org.eclipse.emf.cdo.examples,org.eclipse.emf.cdo.tests.model3.edit,org.eclipse.emf.cdo.tests.model1.edit,org.eclipse.emf.cdo.common,org.eclipse.net4j.util.ui,org.eclipse.emf.cdo.tests.mango,org.eclipse.net4j.tcp,org.eclipse.net4j.ui,org.eclipse.emf.cdo.tests.model3,org.eclipse.emf.cdo.tests.model2,org.eclipse.ant.optional.junit,org.eclipse.net4j.util,org.eclipse.emf.cdo.edit,org.eclipse.emf.cdo.ui,org.eclipse.emf.cdo,org.eclipse.emf.cdo.tests.model2.edit,org.eclipse.net4j,org.eclipse.emf.cdo.tests.model1"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
@@ -32,7 +32,6 @@
 <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.emf.cdo.common/debug.revision" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
 <mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
@@ -40,22 +39,23 @@
 <mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
 <mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
 <mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
 <mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
 <mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
 <mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
 <mapEntry key="org.eclipse.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"/>
@@ -65,10 +65,9 @@
 <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.common/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
 <mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
@@ -79,15 +78,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"/>
@@ -99,8 +98,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"/>
@@ -116,11 +115,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"/>
@@ -129,17 +128,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"/>
@@ -151,31 +150,33 @@
 <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.common/perf.revision" value="true"/>
 <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug.model" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
+<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
 <mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
@@ -183,11 +184,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"/>
@@ -214,8 +215,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"/>
@@ -225,14 +226,15 @@
 <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.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,50 +249,51 @@
 <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.common/perf.revision.reading" value="true"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/>
 <mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/>
+<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/>
 <mapEntry key="org.eclipse.pde.core/cache" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.ui/test" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
 <mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
+<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.common/perf" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
 <mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
+<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
 <mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
 <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.emf.cdo.common/perf.revision.writing" value="true"/>
 <mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.help/debug/search" value="false"/>
 <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
+<mapEntry key="org.eclipse.help/debug/search" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
+<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
 <mapEntry key="org.eclipse.team.core/streams" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.ui/test.bulk_add" value="true"/>
 <mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
 <mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
 <mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.writing" value="true"/>
 <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"/>
@@ -308,15 +311,14 @@
 <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.common/debug.model" value="true"/>
 <mapEntry key="org.eclipse.debug.core/debug" value="false"/>
 <mapEntry key="org.eclipse.core.resources/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
+<mapEntry key="org.eclipse.net4j.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"/>
@@ -328,13 +330,11 @@
 <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.emf.cdo.common/debug" value="true"/>
+<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.common/perf" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
 <mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
@@ -350,8 +350,8 @@
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
 <mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.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/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
index cc76599b02..094596335b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
@@ -202,16 +202,18 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
     revision.setContainerID(eContainer == null ? CDOID.NULL : ((CDOObjectImpl)eContainer).cdoID());
     revision.setContainingFeatureID(eContainerFeatureID);
 
-    if (eSettings != null)
+    if (eSettings == null)
     {
-      EClass eClass = eClass();
-      for (int i = 0; i < eClass.getFeatureCount(); i++)
+      eSettings();
+    }
+
+    EClass eClass = eClass();
+    for (int i = 0; i < eClass.getFeatureCount(); i++)
+    {
+      EStructuralFeature eFeature = cdoInternalDynamicFeature(i);
+      if (!eFeature.isTransient())
       {
-        EStructuralFeature eFeature = cdoInternalDynamicFeature(i);
-        if (!eFeature.isTransient())
-        {
-          populateRevisionFeature(view, revision, eFeature, eSettings, i);
-        }
+        populateRevisionFeature(view, revision, eFeature, eSettings, i);
       }
     }
   }
@@ -227,7 +229,11 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
     }
 
     Object setting = eSettings[i];
-    boolean isReference = cdoFeature.isReference();
+    if (setting == null)
+    {
+      setting = eFeature.getDefaultValue();
+    }
+
     if (cdoFeature.isMany())
     {
       if (setting != null)
@@ -236,7 +242,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
         EList<Object> list = (EList<Object>)setting;
         for (Object value : list)
         {
-          if (isReference)
+          if (cdoFeature.isReference())
           {
             value = view.convertObjectToID(value);
           }
@@ -247,7 +253,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
     }
     else
     {
-      if (isReference)
+      if (cdoFeature.isReference())
       {
         setting = view.convertObjectToID(setting);
       }
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
index bf98fb219a..e9d9e57cb9 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
@@ -263,7 +263,6 @@ public abstract class DBAdapter implements IDBAdapter
       TRACER.trace(sql);
     }
 
-    System.out.println(sql);
     statement.execute(sql);
 
     DBIndex[] indices = table.getIndices();
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
index 85b79f0e49..fc2c2f9ffd 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
@@ -74,6 +74,8 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
 
   private TableViewer iterableViewer;
 
+  private TableViewer arrayViewer;
+
   private TableViewer mapViewer;
 
   private Stack<Object> elements = new Stack<Object>();
@@ -166,6 +168,13 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
     iterableViewer.setLabelProvider(new IterableLabelProvider());
     iterableViewer.setInput(getViewSite());
 
+    arrayViewer = createViewer(stacked);
+    createArrayColmuns();
+    arrayViewer.addDoubleClickListener(this);
+    arrayViewer.setContentProvider(new ArrayContentProvider());
+    arrayViewer.setLabelProvider(new ArrayLabelProvider());
+    arrayViewer.setInput(getViewSite());
+
     mapViewer = createViewer(stacked);
     createMapColmuns();
     mapViewer.addDoubleClickListener(this);
@@ -266,6 +275,11 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
       {
         setObject(element);
       }
+      else if (currentViewer == arrayViewer && element instanceof Pair)
+      {
+        Pair<Integer, Object> pair = (Pair<Integer, Object>)element;
+        setObject(pair.getElement2());
+      }
     }
   }
 
@@ -343,6 +357,10 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
     {
       setCurrentViewer(iterableViewer);
     }
+    else if (object != null && object.getClass().isArray())
+    {
+      setCurrentViewer(arrayViewer);
+    }
     else
     {
       setCurrentViewer(objectViewer);
@@ -375,6 +393,14 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
     createColumns(table, columnNames, columnWidths);
   }
 
+  private void createArrayColmuns()
+  {
+    Table table = arrayViewer.getTable();
+    String[] columnNames = { "Index", "Element", "Type" };
+    int[] columnWidths = { 50, 400, 300 };
+    createColumns(table, columnNames, columnWidths);
+  }
+
   private void createColumns(Table table, String[] columnNames, int[] columnWidths)
   {
     TableColumn[] columns = new TableColumn[columnNames.length];
@@ -588,6 +614,68 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
   /**
    * @author Eike Stepper
    */
+  class ArrayContentProvider extends AbstractContentProvider
+  {
+    @SuppressWarnings("unchecked")
+    public Object[] getElements(Object parent)
+    {
+      if (!elements.isEmpty())
+      {
+        Object element = elements.peek();
+        if (element.getClass().isArray())
+        {
+          Object[] array = (Object[])element;
+          Pair<Integer, Object>[] result = new Pair[array.length];
+          for (int i = 0; i < array.length; i++)
+          {
+            result[i] = new Pair<Integer, Object>(i, array[i]);
+          }
+
+          return result;
+        }
+      }
+
+      return NO_ELEMENTS;
+    }
+  }
+
+  /**
+   * @author Eike Stepper
+   */
+  class ArrayLabelProvider extends AbstractLabelProvider
+  {
+    @SuppressWarnings("unchecked")
+    public String getColumnText(Object obj, int index)
+    {
+      if (obj instanceof Pair)
+      {
+        try
+        {
+          Pair<Integer, Object> pair = (Pair<Integer, Object>)obj;
+          int i = pair.getElement1();
+          Object value = pair.getElement2();
+          switch (index)
+          {
+          case 0:
+            return String.valueOf(i);
+          case 1:
+            return value == null ? "null" : value.toString();
+          case 2:
+            return value == null ? "" : value.getClass().getName();
+          }
+        }
+        catch (RuntimeException ex)
+        {
+          OM.LOG.error(ex);
+        }
+      }
+      return "";
+    }
+  }
+
+  /**
+   * @author Eike Stepper
+   */
   class MapContentProvider extends AbstractContentProvider
   {
     public Object[] getElements(Object parent)