gastro

3 files changed, 68 insertions, 66 deletions

diff --git a/plugins/org.gastro.server/GastroServer.launch b/plugins/org.gastro.server/GastroServer.launch
index 537558b884..fbc5f814ba 100644
--- a/plugins/org.gastro.server/GastroServer.launch
+++ b/plugins/org.gastro.server/GastroServer.launch
@@ -16,7 +16,6 @@
 <stringAttribute key="location" value="${workspace_loc}/../gastro.server"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="com.yourkit.profiler.launchGroup"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}&#13;&#10;-debug&#13;&#10;-console"/>
@@ -25,8 +24,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <stringAttribute key="selectedPlugin" value="org.eclipse.equinox.registry"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.core.resources@default:default,org.eclipse.emf.ecore.xmi@default:default,org.apache.derby@default:default,org.mortbay.jetty.server@default:true,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.common@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.team.core@default:default,org.eclipse.core.variables@default:default,org.apache.commons.logging@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.osgi.services@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.osgi@:,org.eclipse.core.jobs@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.http.jetty@default:true,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.core.runtime@default:true,javax.servlet@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.gastro.business@default:default,org.eclipse.emf.cdo.common@default:default,org.gastro.server@default:default,org.gastro.inventory@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j.jvm@default:default,org.gastro.server.web@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.db.derby@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.db@default:default,org.eclipse.emf.cdo.server@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.emf.common@default:default,org.eclipse.core.runtime@default:true,org.apache.commons.logging*1.1.1.v200904062255@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.common@2:true,org.mortbay.jetty.server*6.1.7.v200806031612@default:true,org.eclipse.equinox.http.jetty@default:true,org.eclipse.equinox.http.servlet@default:default,org.mortbay.jetty.server*6.1.15.v200905151201@default:true,org.eclipse.equinox.registry@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.equinox.app@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.h2.jdbc@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.http.registry@default:default,org.apache.derby*10.1.2.1_v200803061811@default:default,javax.servlet*2.4.0.v200806031604@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.equinox.preferences@default:default,org.apache.derby*10.5.1.200906261341@default:default,org.mortbay.jetty.util*6.1.7.v200806031612@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.resources@default:default,javax.servlet*2.5.0.v200806031605@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.mortbay.jetty.util*6.1.15.v200905182336@default:default,org.apache.commons.logging*1.0.4.v200904062259@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.team.core@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ant.core@default:default,javax.servlet*2.3.0.v200806031603@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.gastro.server@default:default,org.eclipse.net4j.util@default:default,org.gastro.server.web@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j.db.derby@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.net4j.db@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.emf.cdo.server.db@default:default,org.gastro.business@default:default,org.gastro.inventory@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
 <booleanAttribute key="tracing" value="true"/>
@@ -37,26 +36,26 @@
 <mapEntry key="org.eclipse.emf.transaction/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
 <mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/methods/exiting" value="false"/>
 <mapEntry key="org.eclipse.emf.query.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
 <mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
 <mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.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.gmf.runtime.common.ui.services.action/debug/methods/entering" value="false"/>
 <mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
 <mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/entering" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/entering" value="false"/>
 <mapEntry key="org.eclipse.net4j.jms.server/debug.store" value="true"/>
 <mapEntry key="org.eclipse.ocl/debug/evaluation" value="false"/>
 <mapEntry key="org.eclipse.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.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.emf.transaction/debug/methods/exiting" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
@@ -75,8 +74,8 @@
 <mapEntry key="org.eclipse.emf.cdo/debug.store" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/events/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/builder/stats" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug" value="false"/>
@@ -85,8 +84,8 @@
 <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/plugin/ondemand/loading" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
 <mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.net4j.db.hsqldb/debug.sql" value="true"/>
@@ -94,29 +93,29 @@
 <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/execute" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/model/operations" value="false"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/entering" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/services/config" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/entering" value="false"/>
 <mapEntry key="org.eclipse.net4j/debug.buffer" 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/listeners/IWorkbenchPartReference" value="false"/>
 <mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/run" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/run" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
 <mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="true"/>
 <mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/exiting" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/exiting" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.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.jdt.core/debug/selection" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/methods/entering" value="false"/>
 <mapEntry key="org.eclipse.emf.workspace/debug" value="true"/>
@@ -134,14 +133,14 @@
 <mapEntry key="org.eclipse.emf.transaction/debug/transactions" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/swtdebugglobal" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/exceptions/throwing" 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.gmf.runtime.emf.type.core/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
 <mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/>
+<mapEntry key="org.eclipse.core.resources/history" value="false"/>
 <mapEntry key="org.eclipse.net4j.http.server/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
@@ -161,11 +160,11 @@
 <mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
 <mapEntry key="org.eclipse.ocl/debug/methods/entering" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
 <mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
 <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/dnd/tracing" value="false"/>
 <mapEntry key="org.eclipse.net4j.buddies.ui/debug" value="true"/>
@@ -196,16 +195,16 @@
 <mapEntry key="org.eclipse.emf.validation/debug/xml" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFiles" value="false"/>
+<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
 <mapEntry key="org.eclipse.emf.query/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.emf.ocl/debug/methods/exiting" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
 <mapEntry key="org.eclipse.net4j/open.channel.timeout" value="10000"/>
 <mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
 <mapEntry key="org.eclipse.emf.validation/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/throwing" value="false"/>
@@ -229,8 +228,8 @@
 <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
 <mapEntry key="org.eclipse.jdt.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.emf.query/debug" value="true"/>
 <mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
@@ -253,8 +252,8 @@
 <mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/exiting" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/admin" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/exiting" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
 <mapEntry key="org.eclipse.jdt.apt.core/debug/compilationEnv" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug" value="true"/>
@@ -281,24 +280,24 @@
 <mapEntry key="org.eclipse.emf.cdo/debug.view" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
 <mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
+<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
 <mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.resource" value="true"/>
 <mapEntry key="org.eclipse.net4j.http/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.validation/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug" value="true"/>
 <mapEntry key="org.eclipse.net4j/debug.buffer.stream" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.core/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/undo" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
 <mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
 <mapEntry key="org.eclipse.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug" value="true"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/resource/tracing" value="false"/>
+<mapEntry key="org.eclipse.emf.ocl/debug" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
 <mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
@@ -316,8 +315,8 @@
 <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.jface.text/assert/TextSelection/validConstructorArguments" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
 <mapEntry key="org.eclipse.emf.ocl/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
@@ -333,17 +332,17 @@
 <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/entering" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
+<mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
 <mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/presentationId" value=""/>
 <mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/entering" value="false"/>
+<mapEntry key="org.eclipse.debug.ui/debug/viewers/presentationId" value=""/>
 <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/exiting" value="false"/>
 <mapEntry key="org.eclipse.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/execute" value="false"/>
+<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.ui.ide/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/debug/workingSets" value="false"/>
 <mapEntry key="org.eclipse.emf.query/debug/exceptions/throwing" value="false"/>
@@ -359,12 +358,12 @@
 <mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/methods/exiting" 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.emf.workspace/debug/methods/exiting" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/resources" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
 <mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
@@ -393,10 +392,10 @@
 <mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
-<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
+<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
 <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/events" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/events/tracing" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
@@ -414,8 +413,8 @@
 <mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.ocl/debug/parsing" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/methods/exiting" value="false"/>
@@ -429,8 +428,8 @@
 <mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/redo" value="false"/>
-<mapEntry key="org.eclipse.equinox.security.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/uses" value="false"/>
+<mapEntry key="org.eclipse.equinox.security.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/entering" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.emf.validation/debug/listeners" value="false"/>
@@ -442,8 +441,8 @@
 <mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/dnd/tracing" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/dnd/tracing" value="false"/>
 <mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/entering" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/methods/exiting" value="false"/>
@@ -482,23 +481,23 @@
 <mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
 <mapEntry key="org.eclipse.net4j.util/debug.om" value="true"/>
 <mapEntry key="org.eclipse.net4j.jms.server/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/dnd/tracing" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/dnd/tracing" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.equinox.registry/debug" value="true"/>
 <mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.transaction/debug/locking" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.emf.core/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/methods/entering" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/run" value="false"/>
 <mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/run" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/>
 <mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/>
 <mapEntry key="org.eclipse.emf.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/>
 <mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug" value="true"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/>
 <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/canonical" value="false"/>
 <mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
@@ -514,8 +513,8 @@
 <mapEntry key="org.eclipse.debug.ui/debug/breadcrumb" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/>
 <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/exiting" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/exiting" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
 <mapEntry key="org.eclipse.team.core/streams" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/debug" value="true"/>
@@ -531,26 +530,26 @@
 <mapEntry key="org.eclipse.ui.intro/debug/toolbar" value="false"/>
 <mapEntry key="org.eclipse.net4j.buddies.common/debug" value="true"/>
 <mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
-<mapEntry key="org.eclipse.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"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
 <mapEntry key="org.eclipse.net4j.tests/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/formatter" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.statemachine" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/formatter" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
 <mapEntry key="org.eclipse.ocl/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.net4j.http.common/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/failure" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/failure" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/debug.metaid" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/catching" value="false"/>
 <mapEntry key="org.eclipse.jdt.apt.pluggable.core/debug" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/catching" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/throwing" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
 <mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/exiting" value="false"/>
 <mapEntry key="org.eclipse.emf.validation/debug/constraints/evaluation" value="false"/>
@@ -564,8 +563,8 @@
 <mapEntry key="org.eclipse.emf.validation/debug/methods/exiting" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/admin" value="false"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
+<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/admin" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
 <mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
diff --git a/plugins/org.gastro.server/META-INF/MANIFEST.MF b/plugins/org.gastro.server/META-INF/MANIFEST.MF
index aa5a35f118..d2ae5d761b 100644
--- a/plugins/org.gastro.server/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.server/META-INF/MANIFEST.MF
@@ -8,10 +8,14 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.server;bundle-version="[2.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.server.net4j;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.cdo.server.db;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.net4j.db.derby;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.net4j.db.h2;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[2.0.0,4.0.0)"
 Bundle-Activator: org.gastro.internal.server.OM$Activator
-Import-Package: org.apache.derby.jdbc
+Import-Package: org.h2;version="1.1.114",
+ org.h2.api;version="1.1.114",
+ org.h2.jdbcx;version="1.1.114",
+ org.h2.tools;version="1.1.114",
+ org.h2.util;version="1.1.114"
 Bundle-Vendor: www.gastro.org
 Export-Package: org.gastro.internal.server;version="3.0.0";x-internal:=true,
  org.gastro.server;version="3.0.0"
diff --git a/plugins/org.gastro.server/src/org/gastro/internal/server/OM.java b/plugins/org.gastro.server/src/org/gastro/internal/server/OM.java
index c56a9f2573..2753daa6d9 100644
--- a/plugins/org.gastro.server/src/org/gastro/internal/server/OM.java
+++ b/plugins/org.gastro.server/src/org/gastro/internal/server/OM.java
@@ -24,7 +24,7 @@ import org.eclipse.net4j.acceptor.IAcceptor;
 import org.eclipse.net4j.db.DBUtil;
 import org.eclipse.net4j.db.IDBAdapter;
 import org.eclipse.net4j.db.IDBConnectionProvider;
-import org.eclipse.net4j.db.derby.EmbeddedDerbyAdapter;
+import org.eclipse.net4j.db.h2.H2Adapter;
 import org.eclipse.net4j.util.container.IPluginContainer;
 import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
 import org.eclipse.net4j.util.om.OMBundle;
@@ -33,7 +33,7 @@ import org.eclipse.net4j.util.om.OSGiActivator;
 import org.eclipse.net4j.util.om.log.OMLogger;
 import org.eclipse.net4j.util.om.trace.OMTracer;
 
-import org.apache.derby.jdbc.EmbeddedDataSource;
+import org.h2.jdbcx.JdbcDataSource;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -71,12 +71,11 @@ public abstract class OM
     protected void doStart() throws Exception
     {
       OM.LOG.info("Gastro server starting");
-      EmbeddedDataSource dataSource = new EmbeddedDataSource();
-      dataSource.setDatabaseName("/gastro");
-      dataSource.setCreateDatabase("create");
+      JdbcDataSource dataSource = new JdbcDataSource();
+      dataSource.setURL("jdbc:h2:/temp/gastro");
 
       IMappingStrategy mappingStrategy = CDODBUtil.createHorizontalMappingStrategy(true);
-      IDBAdapter dbAdapter = new EmbeddedDerbyAdapter();
+      IDBAdapter dbAdapter = new H2Adapter();
       IDBConnectionProvider dbConnectionProvider = DBUtil.createConnectionProvider(dataSource);
       IStore store = CDODBUtil.createStore(mappingStrategy, dbAdapter, dbConnectionProvider);