*** empty log message ***

76 files changed, 208 insertions, 184 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
index b06232b260..399a239d24 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
@@ -10,5 +10,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.cdo.server;visibility:=reexport
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.emf.cdo.server.db;version="0.8.0",
- org.eclipse.emf.cdo.server.internal.db;version="0.8.0",
- org.eclipse.emf.cdo.server.internal.db.bundle;version="0.8.0"
+ org.eclipse.emf.cdo.server.internal.db;version="0.8.0"
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java
index 0d9655ac07..080a1f0ca9 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java
@@ -32,7 +32,7 @@ public abstract class OM
   /**
    * @author Eike Stepper
    */
-  static final class Activator extends OSGiActivator
+  public static final class Activator extends OSGiActivator
   {
     public Activator()
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
index 8a76a89101..00e8d6d33b 100644
--- a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@ Bundle-Activator: org.eclipse.emf.cdo.internal.server.bundle.OM$Activator
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.emf.cdo.internal.server;version="0.8.0",
- org.eclipse.emf.cdo.internal.server.bundle;version="0.8.0",
  org.eclipse.emf.cdo.internal.server.protocol;version="0.8.0",
  org.eclipse.emf.cdo.internal.server.store;version="0.8.0",
  org.eclipse.emf.cdo.server;version="0.8.0"
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
index 6508322874..0ff262737c 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
@@ -54,7 +54,7 @@ public abstract class OM
   /**
    * @author Eike Stepper
    */
-  static final class Activator extends OSGiActivator
+  public static final class Activator extends OSGiActivator
   {
     public Activator()
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
index 115bf1c56c..d334058bc2 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
@@ -11,10 +11,10 @@
 package org.eclipse.emf.cdo.internal.server.protocol;
 
 import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
 import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageManagerImpl;
 import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
 import org.eclipse.emf.cdo.internal.server.RevisionManager;
+import org.eclipse.emf.cdo.internal.server.bundle.OM;
 import org.eclipse.emf.cdo.protocol.CDOID;
 import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java
index baade02a0e..7a60fae161 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java
@@ -11,8 +11,8 @@
 package org.eclipse.emf.cdo.internal.server.protocol;
 
 import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
 import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
+import org.eclipse.emf.cdo.internal.server.bundle.OM;
 import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
 
 import org.eclipse.net4j.IChannel;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java
index 2f8b594b23..e5ba5d5426 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java
@@ -11,9 +11,9 @@
 package org.eclipse.emf.cdo.internal.server.protocol;
 
 import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
 import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
 import org.eclipse.emf.cdo.internal.server.RevisionManager;
+import org.eclipse.emf.cdo.internal.server.bundle.OM;
 import org.eclipse.emf.cdo.protocol.CDOID;
 import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java
index f4195fb088..bd35da9ec0 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java
@@ -10,11 +10,11 @@
  **************************************************************************/
 package org.eclipse.emf.cdo.internal.server.protocol;
 
-import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
 import org.eclipse.emf.cdo.internal.server.Repository;
 import org.eclipse.emf.cdo.internal.server.RepositoryManager;
 import org.eclipse.emf.cdo.internal.server.Session;
 import org.eclipse.emf.cdo.internal.server.SessionManager;
+import org.eclipse.emf.cdo.internal.server.bundle.OM;
 import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
 import org.eclipse.emf.cdo.protocol.model.CDOPackage;
 import org.eclipse.emf.cdo.protocol.model.CDOPackageManager;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
index e9bf726984..d6344c82c3 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
@@ -11,7 +11,7 @@
 package org.eclipse.emf.cdo.internal.server.protocol;
 
 import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
+import org.eclipse.emf.cdo.internal.server.bundle.OM;
 import org.eclipse.emf.cdo.protocol.CDOID;
 import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch b/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch
index 6e95bc2742..130e1220da 100644
--- a/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch
+++ b/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch
@@ -2,7 +2,7 @@
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
 <booleanAttribute key="askclear" value="true"/>
 <booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
+<booleanAttribute key="automaticValidate" value="true"/>
 <stringAttribute key="bootstrap" value=""/>
 <stringAttribute key="checked" value="org.eclipse.emf.cdo,org.eclipse.emf.cdo.protocol,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.ui,org.eclipse.net4j,org.eclipse.net4j.jvm,org.eclipse.net4j.tcp,org.eclipse.net4j.ui"/>
 <booleanAttribute key="clearConfig" value="true"/>
@@ -10,8 +10,8 @@
 <booleanAttribute key="clearwslog" value="false"/>
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/CDO UI"/>
 <booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../cdo.ui"/>
+<booleanAttribute key="includeOptional" value="false"/>
+<stringAttribute key="location" value="${workspace_loc}.rt"/>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nosplash"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
@@ -19,8 +19,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <stringAttribute key="selectedPlugin" value="org.eclipse.net4j"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,com.jcraft.jsch,javax.servlet,javax.servlet.jsp,org.apache.ant,org.apache.commons.el,org.apache.commons.logging,org.apache.jasper,org.apache.lucene,org.apache.lucene.analysis,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.databinding.beans,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.net,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.cvs,org.eclipse.cvs.source,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.emf,org.eclipse.emf.ant,org.eclipse.emf.cheatsheets,org.eclipse.emf.codegen,org.eclipse.emf.codegen.ecore,org.eclipse.emf.codegen.ecore.ui,org.eclipse.emf.codegen.ui,org.eclipse.emf.common,org.eclipse.emf.common.ui,org.eclipse.emf.commonj.sdo,org.eclipse.emf.converter,org.eclipse.emf.doc,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.change.edit,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.editor,org.eclipse.emf.ecore.sdo,org.eclipse.emf.ecore.sdo.doc,org.eclipse.emf.ecore.sdo.edit,org.eclipse.emf.ecore.sdo.editor,org.eclipse.emf.ecore.sdo.source,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.edit.ui,org.eclipse.emf.exporter,org.eclipse.emf.importer,org.eclipse.emf.importer.ecore,org.eclipse.emf.importer.java,org.eclipse.emf.importer.rose,org.eclipse.emf.mapping,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.emf.mapping.ecore2xml,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.emf.mapping.ui,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.emf.source,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.registry,org.eclipse.equinox.http.servlet,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.jdt,org.eclipse.jdt.apt.core,org.eclipse.jdt.apt.ui,org.eclipse.jdt.compiler.apt,org.eclipse.jdt.compiler.tool,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.jsch.core,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.pde.ui.templates,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.source,org.eclipse.platform.source.win32.win32.x86,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.rcp.source.win32.win32.x86,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.ui,org.eclipse.text,org.eclipse.tomcat,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.scheduler,org.eclipse.update.ui,org.eclipse.xsd,org.eclipse.xsd.cheatsheets,org.eclipse.xsd.doc,org.eclipse.xsd.ecore.exporter,org.eclipse.xsd.ecore.importer,org.eclipse.xsd.edit,org.eclipse.xsd.editor,org.eclipse.xsd.source,org.junit,org.junit4,org.mortbay.jetty"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.protocol,org.eclipse.net4j.util,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.ui,org.eclipse.emf.cdo.edit,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server.db,org.eclipse.emf.cdo.tests.model1.edit,org.eclipse.net4j.db.derby,org.eclipse.net4j.db,org.eclipse.net4j,org.eclipse.emf.cdo.tests.model1,org.eclipse.net4j.tcp,org.eclipse.net4j.ui"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu,com.jcraft.jsch,javax.servlet,javax.servlet.jsp,org.apache.ant,org.apache.commons.el,org.apache.commons.logging,org.apache.jasper,org.apache.lucene,org.apache.lucene.analysis,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.databinding.beans,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.net,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.cvs,org.eclipse.cvs.source,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.emf,org.eclipse.emf.ant,org.eclipse.emf.cheatsheets,org.eclipse.emf.codegen,org.eclipse.emf.codegen.ecore,org.eclipse.emf.codegen.ecore.ui,org.eclipse.emf.codegen.ui,org.eclipse.emf.common,org.eclipse.emf.common.ui,org.eclipse.emf.commonj.sdo,org.eclipse.emf.converter,org.eclipse.emf.doc,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.change.edit,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.editor,org.eclipse.emf.ecore.sdo,org.eclipse.emf.ecore.sdo.doc,org.eclipse.emf.ecore.sdo.edit,org.eclipse.emf.ecore.sdo.editor,org.eclipse.emf.ecore.sdo.source,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.edit.ui,org.eclipse.emf.exporter,org.eclipse.emf.importer,org.eclipse.emf.importer.ecore,org.eclipse.emf.importer.java,org.eclipse.emf.importer.rose,org.eclipse.emf.mapping,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.emf.mapping.ecore2xml,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.emf.mapping.ui,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.emf.source,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.registry,org.eclipse.equinox.http.servlet,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.jdt,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.jsch.core,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.pde.ui.templates,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.source,org.eclipse.platform.source.win32.win32.x86,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.rcp.source.win32.win32.x86,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.ui,org.eclipse.text,org.eclipse.tomcat,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.scheduler,org.eclipse.update.ui,org.eclipse.xsd,org.eclipse.xsd.cheatsheets,org.eclipse.xsd.doc,org.eclipse.xsd.ecore.exporter,org.eclipse.xsd.ecore.importer,org.eclipse.xsd.edit,org.eclipse.xsd.editor,org.eclipse.xsd.source,org.junit,org.junit4,org.mortbay.jetty"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.protocol,org.eclipse.net4j.util,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.edit,org.eclipse.emf.cdo.ui,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server.db,org.eclipse.emf.cdo.tests.model1.edit,org.eclipse.net4j.db.derby,org.eclipse.net4j.db,org.eclipse.net4j,org.eclipse.emf.cdo.tests.model1,org.eclipse.net4j.tcp,org.eclipse.net4j.ui"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
 <booleanAttribute key="tracing" value="true"/>
 <mapAttribute key="tracingOptions">
diff --git a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
index 79aad52d79..e9c38542d5 100644
--- a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
@@ -15,8 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.cdo;visibility:=reexport,
  org.eclipse.emf.cdo.edit,
  org.eclipse.emf.cdo.server.db
-Export-Package: org.eclipse.emf.cdo.internal.ui.bundle;version="0.8.0",
- org.eclipse.emf.cdo.internal.ui.editor;version="0.8.0",
+Export-Package: org.eclipse.emf.cdo.internal.ui.editor;version="0.8.0",
  org.eclipse.emf.cdo.internal.ui.views;version="0.8.0",
  org.eclipse.emf.cdo.internal.ui.wizards;version="0.8.0",
  org.eclipse.emf.cdo.internal.ui.wizards.steps;version="0.8.0"
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
index 3d200dc857..a6e5a425c3 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
@@ -57,7 +57,7 @@ public abstract class OM
   /**
    * @author Eike Stepper
    */
-  static class Activator extends OSGiActivator
+  public static final class Activator extends OSGiActivator
   {
     public Activator()
     {
diff --git a/plugins/org.eclipse.emf.cdo/.options b/plugins/org.eclipse.emf.cdo/.options
index cc70f6d19a..e7a0bb765a 100644
--- a/plugins/org.eclipse.emf.cdo/.options
+++ b/plugins/org.eclipse.emf.cdo/.options
@@ -1,6 +1,7 @@
 org.eclipse.emf.cdo/debug = true
 org.eclipse.emf.cdo/debug.util = true
 org.eclipse.emf.cdo/debug.model = true
+org.eclipse.emf.cdo/debug.protocol = true
 org.eclipse.emf.cdo/debug.repository = true
 org.eclipse.emf.cdo/debug.session = true
 org.eclipse.emf.cdo/debug.adapter = true
diff --git a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
index 62c47957d0..cfb886b05c 100644
--- a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Export-Package: org.eclipse.emf.cdo;version="0.8.0",
  org.eclipse.emf.cdo.eresource.util;version="0.8.0",
  org.eclipse.emf.cdo.util;version="0.8.0",
  org.eclipse.emf.internal.cdo;version="0.8.0",
- org.eclipse.emf.internal.cdo.bundle;version="0.8.0",
  org.eclipse.emf.internal.cdo.protocol;version="0.8.0",
  org.eclipse.emf.internal.cdo.util;version="0.8.0"
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java
index d512011e01..a11da14843 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java
@@ -30,6 +30,8 @@ public abstract class OM
 
   public static final OMTracer DEBUG_MODEL = DEBUG.tracer("model"); //$NON-NLS-1$
 
+  public static final OMTracer DEBUG_PROTOCOL = DEBUG.tracer("protocol"); //$NON-NLS-1$
+
   public static final OMTracer DEBUG_REPOSITORY = DEBUG.tracer("repository"); //$NON-NLS-1$
 
   public static final OMTracer DEBUG_SESSION = DEBUG.tracer("session"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java
index 97208685ac..7cf3e6024d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.internal.cdo.protocol;
 
 import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
 import org.eclipse.emf.cdo.internal.protocol.revision.CDOReferenceConverter;
 import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
 import org.eclipse.emf.cdo.protocol.CDOID;
@@ -25,6 +24,7 @@ import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
 import org.eclipse.emf.internal.cdo.CDOObjectImpl;
 import org.eclipse.emf.internal.cdo.CDOStore;
 import org.eclipse.emf.internal.cdo.CDOTransactionImpl;
+import org.eclipse.emf.internal.cdo.bundle.OM;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java
index 23642a11e4..bf1c3742e3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.internal.cdo.protocol;
 
 import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
 import org.eclipse.emf.cdo.protocol.CDOID;
 import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
 
@@ -20,6 +19,7 @@ import org.eclipse.net4j.signal.Indication;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
 
 import org.eclipse.emf.internal.cdo.CDOSessionImpl;
+import org.eclipse.emf.internal.cdo.bundle.OM;
 
 import java.io.IOException;
 import java.util.HashSet;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadObjectRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadObjectRequest.java
index c6764432b0..e6c80dcfc8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadObjectRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadObjectRequest.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.internal.cdo.protocol;
 
 import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
 import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
 import org.eclipse.emf.cdo.protocol.CDOID;
 import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
@@ -21,6 +20,8 @@ import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
 
+import org.eclipse.emf.internal.cdo.bundle.OM;
+
 import java.io.IOException;
 
 /**
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java
index 5c3ec1ab30..78c497f606 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java
@@ -10,7 +10,6 @@
  **************************************************************************/
 package org.eclipse.emf.internal.cdo.protocol;
 
-import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
 import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
 import org.eclipse.emf.cdo.util.ServerException;
 
@@ -20,6 +19,8 @@ import org.eclipse.net4j.signal.RequestWithConfirmation;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
 
+import org.eclipse.emf.internal.cdo.bundle.OM;
+
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.HashSet;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java
index 4718447b33..bab7655003 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.internal.cdo.protocol;
 
 import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
 import org.eclipse.emf.cdo.protocol.CDOID;
 import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
 
@@ -20,6 +19,8 @@ import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
 
+import org.eclipse.emf.internal.cdo.bundle.OM;
+
 import java.io.IOException;
 
 /**
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java
index ed6a5728ec..b85d8a1e95 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.internal.cdo.protocol;
 
 import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
 import org.eclipse.emf.cdo.protocol.CDOID;
 import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
 
@@ -20,6 +19,8 @@ import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
 
+import org.eclipse.emf.internal.cdo.bundle.OM;
+
 import java.io.IOException;
 
 /**
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/EMFUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/EMFUtil.java
index 868ce0c05c..c8314dbb85 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/EMFUtil.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.internal.cdo.util;
 
 import org.eclipse.emf.cdo.eresource.EresourcePackage;
-import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
 import org.eclipse.emf.cdo.internal.protocol.model.CDOClassImpl;
 import org.eclipse.emf.cdo.internal.protocol.model.CDOClassProxy;
 import org.eclipse.emf.cdo.internal.protocol.model.CDOClassRefImpl;
@@ -27,8 +26,6 @@ import org.eclipse.emf.cdo.protocol.model.CDOFeature;
 import org.eclipse.emf.cdo.protocol.model.CDOPackage;
 import org.eclipse.emf.cdo.protocol.util.ImplementationError;
 
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
@@ -45,9 +42,6 @@ import java.util.List;
  */
 public final class EMFUtil
 {
-  @SuppressWarnings("unused")
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_MODEL, EMFUtil.class);
-
   private EMFUtil()
   {
   }
diff --git a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
index 5577ec62f7..5ca740f7bc 100644
--- a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
@@ -34,7 +34,7 @@ public abstract class OM
   /**
    * @author Eike Stepper
    */
-  static final class Activator extends OSGiActivator
+  public static final class Activator extends OSGiActivator
   {
     public Activator()
     {
diff --git a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
index a65aba119e..dc55ad9ed1 100644
--- a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
@@ -9,5 +9,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.net4j.util;visibility:=reexport
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.net4j.db;version="0.8.0",
- org.eclipse.net4j.internal.db;version="0.8.0",
- org.eclipse.net4j.internal.db.bundle;version="0.8.0"
+ org.eclipse.net4j.internal.db;version="0.8.0"
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java
index 9c38298524..5b935718be 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java
@@ -74,7 +74,7 @@ public abstract class OM
   /**
    * @author Eike Stepper
    */
-  static final class Activator extends OSGiActivator
+  public static final class Activator extends OSGiActivator
   {
     public Activator()
     {
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java
index aaac1c64c0..e8357b774d 100644
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java
@@ -43,7 +43,7 @@ public abstract class OM
   /**
    * @author Eike Stepper
    */
-  static final class Activator extends OSGiActivator
+  public static final class Activator extends OSGiActivator
   {
     public Activator()
     {
diff --git a/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
index a1126a3633..1c188ad57a 100644
--- a/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
@@ -11,5 +11,4 @@ Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.net4j.jms.admin;version="0.8.0",
  org.eclipse.net4j.jms.internal.admin;version="0.8.0",
- org.eclipse.net4j.jms.internal.admin.bundle;version="0.8.0",
  org.eclipse.net4j.jms.internal.admin.protocol;version="0.8.0"
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
index 151787f468..83647da954 100644
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
@@ -34,7 +34,7 @@ public abstract class OM
   /**
    * @author Eike Stepper
    */
-  static final class Activator extends OSGiActivator
+  public static final class Activator extends OSGiActivator
   {
     public Activator()
     {
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF
index c7519b8876..0b53295a5a 100644
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF
@@ -12,6 +12,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.net4j.db;visibility:=reexport
 Import-Package: javax.jms;version="1.1.0"
 Export-Package: org.eclipse.net4j.jms.server.internal.jdbc;version="0.8.0",
- org.eclipse.net4j.jms.server.internal.jdbc.bundle;version="0.8.0",
  org.eclipse.net4j.jms.server.jdbc;version="0.8.0"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
index f4ccdbee2f..1e193d1104 100644
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
@@ -32,7 +32,7 @@ public abstract class OM
   /**
    * @author Eike Stepper
    */
-  static final class Activator extends OSGiActivator
+  public static final class Activator extends OSGiActivator
   {
     public Activator()
     {
diff --git a/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
index 9f75d77c28..1c41980c87 100644
--- a/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@ Require-Bundle: org.eclipse.core.runtime,
 Import-Package: javax.jms;version="1.1.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.net4j.jms.internal.server;version="0.8.0",
- org.eclipse.net4j.jms.internal.server.bundle;version="0.8.0",
  org.eclipse.net4j.jms.internal.server.protocol;version="0.8.0",
  org.eclipse.net4j.jms.internal.server.protocol.admin;version="0.8.0",
  org.eclipse.net4j.jms.internal.server.store;version="0.8.0",
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
index 199004fbc6..1540fdd6dc 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
@@ -47,7 +47,7 @@ public abstract class OM
   /**
    * @author Eike Stepper
    */
-  static final class Activator extends OSGiActivator
+  public static final class Activator extends OSGiActivator
   {
     public Activator()
     {
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
index 6b7f803ace..0f43e8ec5b 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
@@ -11,11 +11,11 @@
 package org.eclipse.net4j.jms.internal.server.protocol;
 
 import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.internal.jms.bundle.OM;
 import org.eclipse.net4j.internal.jms.util.MessageUtil;
 import org.eclipse.net4j.jms.JMSProtocolConstants;
 import org.eclipse.net4j.jms.internal.server.ServerConnection;
 import org.eclipse.net4j.jms.internal.server.ServerSession;
+import org.eclipse.net4j.jms.internal.server.bundle.OM;
 import org.eclipse.net4j.signal.IndicationWithResponse;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
index 771b32479f..016e86fbab 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
@@ -10,10 +10,10 @@
  **************************************************************************/
 package org.eclipse.net4j.jms.internal.server.protocol;
 
-import org.eclipse.net4j.internal.jms.bundle.OM;
 import org.eclipse.net4j.jms.JMSProtocolConstants;
 import org.eclipse.net4j.jms.internal.server.ServerConnection;
 import org.eclipse.net4j.jms.internal.server.ServerSession;
+import org.eclipse.net4j.jms.internal.server.bundle.OM;
 import org.eclipse.net4j.signal.IndicationWithResponse;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
index 2fe3ecc421..69d5ca4e14 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
@@ -10,10 +10,10 @@
  **************************************************************************/
 package org.eclipse.net4j.jms.internal.server.protocol;
 
-import org.eclipse.net4j.internal.jms.bundle.OM;
 import org.eclipse.net4j.jms.JMSProtocolConstants;
 import org.eclipse.net4j.jms.internal.server.ServerConnection;
 import org.eclipse.net4j.jms.internal.server.ServerSession;
+import org.eclipse.net4j.jms.internal.server.bundle.OM;
 import org.eclipse.net4j.signal.IndicationWithResponse;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
diff --git a/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
index 1d52c5dbcc..517f29a52e 100644
--- a/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.net4j;visibility:=reexport
 Import-Package: javax.jms;version="1.1.0"
 Export-Package: org.eclipse.net4j.internal.jms;version="0.8.0",
- org.eclipse.net4j.internal.jms.bundle;version="0.8.0",
  org.eclipse.net4j.internal.jms.protocol;version="0.8.0",
  org.eclipse.net4j.internal.jms.util;version="0.8.0",
  org.eclipse.net4j.jms;version="0.8.0"
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
index 908d02cd9b..0ada75d830 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
@@ -41,7 +41,7 @@ public abstract class OM
   /**
    * @author Eike Stepper
    */
-  static final class Activator extends OSGiActivator
+  public static final class Activator extends OSGiActivator
   {
     public Activator()
     {
diff --git a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
index 7f0d37eb99..8c5796ca06 100644
--- a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
@@ -10,6 +10,5 @@ Require-Bundle: org.eclipse.core.runtime;resolution:=optional,
  org.eclipse.net4j;visibility:=reexport
 Import-Package: org.osgi.framework;version="1.3.0";resolution:=optional
 Export-Package: org.eclipse.net4j.internal.jvm;version="0.8.0",
- org.eclipse.net4j.internal.jvm.bundle;version="0.8.0",
  org.eclipse.net4j.jvm;version="0.8.0"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/OM.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/OM.java
index 41129f9184..de673be904 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/OM.java
@@ -32,7 +32,7 @@ public abstract class OM
   /**
    * @author Eike Stepper
    */
-  static class Activator extends OSGiActivator
+  public static final class Activator extends OSGiActivator
   {
     public Activator()
     {
diff --git a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
index cd7e8718ec..2a5be853b2 100644
--- a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
@@ -10,6 +10,5 @@ Require-Bundle: org.eclipse.core.runtime;resolution:=optional,
  org.eclipse.net4j;visibility:=reexport
 Import-Package: org.osgi.framework;version="1.3.0";resolution:=optional
 Export-Package: org.eclipse.net4j.internal.tcp;version="0.8.0",
- org.eclipse.net4j.internal.tcp.bundle;version="0.8.0",
  org.eclipse.net4j.tcp;version="0.8.0"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java
index 44b75024dd..b948ab3dfe 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java
@@ -12,13 +12,13 @@ package org.eclipse.net4j.internal.tcp;
 
 import org.eclipse.net4j.IBuffer;
 import org.eclipse.net4j.IProtocol;
+import org.eclipse.net4j.internal.tcp.bundle.OM;
 import org.eclipse.net4j.internal.util.concurrent.SynchronizingCorrelator;
 import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
 import org.eclipse.net4j.util.concurrent.ISynchronizer;
 
 import org.eclipse.internal.net4j.BufferUtil;
 import org.eclipse.internal.net4j.Channel;
-import org.eclipse.internal.net4j.bundle.OM;
 
 import java.nio.ByteBuffer;
 
@@ -41,7 +41,7 @@ public final class ControlChannel extends Channel
 
   public static final byte FAILURE = 0;
 
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_CHANNEL, ControlChannel.class);
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, ControlChannel.class);
 
   private SynchronizingCorrelator<Short, Boolean> registrations = new SynchronizingCorrelator();
 
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java
index 521a5d6f66..d2794b87a9 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java
@@ -10,10 +10,9 @@
  **************************************************************************/
 package org.eclipse.net4j.internal.tcp;
 
+import org.eclipse.net4j.internal.tcp.bundle.OM;
 import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
 
-import org.eclipse.internal.net4j.bundle.OM;
-
 import java.nio.channels.SelectionKey;
 
 /**
@@ -21,7 +20,7 @@ import java.nio.channels.SelectionKey;
  */
 public final class SelectorUtil
 {
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SELECTOR, SelectorUtil.class);
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, SelectorUtil.class);
 
   private SelectorUtil()
   {
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java
index 08be346007..4394ba45bf 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java
@@ -10,6 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.internal.tcp;
 
+import org.eclipse.net4j.internal.tcp.bundle.OM;
 import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
 import org.eclipse.net4j.tcp.ITCPAcceptor;
 import org.eclipse.net4j.tcp.ITCPSelector;
@@ -17,7 +18,6 @@ import org.eclipse.net4j.tcp.ITCPSelectorListener;
 import org.eclipse.net4j.util.StringUtil;
 
 import org.eclipse.internal.net4j.Acceptor;
-import org.eclipse.internal.net4j.bundle.OM;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -34,7 +34,7 @@ import java.util.concurrent.CountDownLatch;
  */
 public class TCPAcceptor extends Acceptor implements ITCPAcceptor, ITCPSelectorListener.Passive
 {
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_ACCEPTOR, TCPAcceptor.class);
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, TCPAcceptor.class);
 
   private TCPSelector selector;
 
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java
index 2d27a5f852..8e00085015 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java
@@ -11,8 +11,7 @@
 package org.eclipse.net4j.internal.tcp;
 
 import org.eclipse.net4j.ConnectorLocation;
-
-import org.eclipse.internal.net4j.bundle.OM;
+import org.eclipse.net4j.internal.tcp.bundle.OM;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
index 9bd5ee9312..fb0dcc9152 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
@@ -15,6 +15,7 @@ import org.eclipse.net4j.ConnectorState;
 import org.eclipse.net4j.IBuffer;
 import org.eclipse.net4j.IChannel;
 import org.eclipse.net4j.IProtocol;
+import org.eclipse.net4j.internal.tcp.bundle.OM;
 import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
 import org.eclipse.net4j.tcp.ITCPConnector;
 import org.eclipse.net4j.tcp.ITCPConstants;
@@ -23,7 +24,6 @@ import org.eclipse.net4j.tcp.ITCPSelectorListener;
 
 import org.eclipse.internal.net4j.Channel;
 import org.eclipse.internal.net4j.Connector;
-import org.eclipse.internal.net4j.bundle.OM;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedChannelException;
@@ -37,7 +37,7 @@ import java.util.Queue;
  */
 public abstract class TCPConnector extends Connector implements ITCPConnector, ITCPSelectorListener.Active
 {
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_CONNECTOR, TCPConnector.class);
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, TCPConnector.class);
 
   private SocketChannel socketChannel;
 
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java
index 34600e5e08..cc5024b6ac 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java
@@ -10,6 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.internal.tcp;
 
+import org.eclipse.net4j.internal.tcp.bundle.OM;
 import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
 import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
 import org.eclipse.net4j.tcp.ITCPSelector;
@@ -17,8 +18,6 @@ import org.eclipse.net4j.tcp.ITCPSelectorListener;
 import org.eclipse.net4j.tcp.ITCPSelectorListener.Active;
 import org.eclipse.net4j.tcp.ITCPSelectorListener.Passive;
 
-import org.eclipse.internal.net4j.bundle.OM;
-
 import java.io.IOException;
 import java.nio.channels.CancelledKeyException;
 import java.nio.channels.ClosedChannelException;
@@ -37,7 +36,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
  */
 public class TCPSelector extends Lifecycle implements ITCPSelector, Runnable
 {
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SELECTOR, TCPSelector.class);
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, TCPSelector.class);
 
   private Selector selector;
 
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java
index fbc67d6ac3..859e3bdd4e 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java
@@ -13,14 +13,12 @@ package org.eclipse.net4j.internal.tcp;
 import org.eclipse.net4j.internal.util.factory.Factory;
 import org.eclipse.net4j.tcp.ITCPConstants;
 
-import org.eclipse.internal.net4j.bundle.OM;
-
 /**
  * @author Eike Stepper
  */
 public class TCPSelectorFactory extends Factory<TCPSelector>
 {
-  public static final String SELECTOR_GROUP = OM.BUNDLE_ID + ".selectors";
+  public static final String SELECTOR_GROUP = "org.eclipse.net4j.selectors";
 
   public TCPSelectorFactory()
   {
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
index b68b4dae10..135f54bd8d 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
@@ -32,7 +32,7 @@ public abstract class OM
   /**
    * @author Eike Stepper
    */
-  static class Activator extends OSGiActivator
+  public static final class Activator extends OSGiActivator
   {
     public Activator()
     {
diff --git a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
index cc5f0ff2d5..e620497d7c 100644
--- a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.ide
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.net4j.internal.ui;version="0.8.0",
- org.eclipse.net4j.internal.ui.bundle;version="0.8.0",
  org.eclipse.net4j.internal.ui.views;version="0.8.0",
  org.eclipse.net4j.internal.ui.wizards;version="0.8.0",
  org.eclipse.net4j.internal.ui.wizards.steps;version="0.8.0",
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java
index 2cb45b5f80..16779a310b 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java
@@ -33,12 +33,12 @@ public abstract class OM
 
   public static final OMPreferences PREFS = BUNDLE.preferences();
 
-  public static final OMPreference<Boolean> PREF_ACTIVE = PREFS.init("active", false);
+  public static final OMPreference<String> PREF_TEXT = PREFS.initString("text");
 
   /**
    * @author Eike Stepper
    */
-  static class Activator extends OSGiActivator
+  public static final class Activator extends OSGiActivator
   {
     public Activator()
     {
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java
index 138bc77b5b..fb4f205016 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java
@@ -3,13 +3,16 @@ package org.eclipse.net4j.internal.ui.views;
 import org.eclipse.net4j.IConnector;
 import org.eclipse.net4j.IPluginTransportContainer;
 import org.eclipse.net4j.ITransportContainer;
+import org.eclipse.net4j.internal.ui.bundle.OM;
 import org.eclipse.net4j.ui.actions.SafeAction;
 import org.eclipse.net4j.ui.views.ContainerItemProvider;
 import org.eclipse.net4j.ui.views.ContainerView;
 import org.eclipse.net4j.ui.views.IElementFilter;
+import org.eclipse.net4j.util.om.pref.OMPreference;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.dialogs.InputDialog;
 
 public class ConnectorsView extends ContainerView
 {
@@ -48,6 +51,20 @@ public class ConnectorsView extends ContainerView
   protected void fillLocalToolBar(IToolBarManager manager)
   {
     manager.add(addConnectorAction);
+    manager.add(new SafeAction("PREFS")
+    {
+      @Override
+      protected void doRun() throws Exception
+      {
+        OMPreference<String> pref = OM.PREF_TEXT;
+        InputDialog dlg = new InputDialog(getSite().getShell(), "PREFS", "Enter a text:", pref.getValue(), null);
+        if (dlg.open() == InputDialog.OK)
+        {
+          pref.setValue(dlg.getValue());
+        }
+      }
+    });
+
     super.fillLocalToolBar(manager);
   }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/LongRunningAction.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/LongRunningAction.java
index d57cbd3e73..50ecae9691 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/LongRunningAction.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/LongRunningAction.java
@@ -10,12 +10,13 @@
  **************************************************************************/
 package org.eclipse.net4j.ui.actions;
 
+import org.eclipse.net4j.internal.ui.bundle.OM;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.internal.net4j.bundle.OM;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IWorkbenchPage;
 
diff --git a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
index c4712ec474..41e1243f03 100644
--- a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Import-Package: org.eclipse.core.runtime;resolution:=optional,
  org.osgi.service.log;version="1.3.0";resolution:=optional,
  org.osgi.util.tracker;version="1.3.0";resolution:=optional
 Export-Package: org.eclipse.net4j.internal.util;version="0.8.0",
- org.eclipse.net4j.internal.util.bundle;version="0.8.0",
  org.eclipse.net4j.internal.util.concurrent;version="0.8.0",
  org.eclipse.net4j.internal.util.container;version="0.8.0",
  org.eclipse.net4j.internal.util.container.delegate;version="0.8.0",
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java
index b2dd75e1f9..4dbf86259d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java
@@ -38,9 +38,9 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * @author Eike Stepper
  */
-public abstract class AbstractOMBundle implements OMBundle
+public abstract class AbstractBundle implements OMBundle
 {
-  private AbstractOMPlatform platform;
+  private AbstractPlatform platform;
 
   private String bundleID;
 
@@ -68,7 +68,7 @@ public abstract class AbstractOMBundle implements OMBundle
 
   private boolean shouldTranslate = true;
 
-  public AbstractOMBundle(AbstractOMPlatform platform, String bundleID, Class accessor)
+  public AbstractBundle(AbstractPlatform platform, String bundleID, Class accessor)
   {
     this.platform = platform;
     this.bundleID = bundleID;
@@ -319,6 +319,18 @@ public abstract class AbstractOMBundle implements OMBundle
 
   public void stop() throws Exception
   {
+    try
+    {
+      if (preferences != null)
+      {
+        preferences.save();
+      }
+    }
+    catch (RuntimeException ex)
+    {
+      OM.LOG.error(ex);
+    }
+
     invokeMethod("stop");
   }
 
@@ -339,28 +351,28 @@ public abstract class AbstractOMBundle implements OMBundle
 
   private void invokeMethod(String name) throws Exception
   {
-    Method method = accessor.getMethod(name, ReflectUtil.NO_PARAMETERS);
-    if (method != null)
+    try
+    {
+      Method method = accessor.getMethod(name, ReflectUtil.NO_PARAMETERS);
+      method.invoke(null, ReflectUtil.NO_ARGUMENTS);
+    }
+    catch (NoSuchMethodException ignore)
     {
-      try
+    }
+    catch (InvocationTargetException ex)
+    {
+      Throwable targetException = ex.getTargetException();
+      if (targetException instanceof Exception)
       {
-        method.invoke(null, ReflectUtil.NO_ARGUMENTS);
+        throw (Exception)targetException;
       }
-      catch (InvocationTargetException ex)
+      else if (targetException instanceof Error)
       {
-        Throwable targetException = ex.getTargetException();
-        if (targetException instanceof Exception)
-        {
-          throw (Exception)targetException;
-        }
-        else if (targetException instanceof Error)
-        {
-          throw (Error)targetException;
-        }
-        else
-        {
-          OM.LOG.error(targetException);
-        }
+        throw (Error)targetException;
+      }
+      else
+      {
+        OM.LOG.error(targetException);
       }
     }
   }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java
index d0f71e22b2..66e0023907 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java
@@ -10,6 +10,8 @@
  **************************************************************************/
 package org.eclipse.net4j.internal.util.bundle;
 
+import org.eclipse.net4j.internal.util.om.LegacyPlatform;
+import org.eclipse.net4j.internal.util.om.OSGiPlatform;
 import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
 import org.eclipse.net4j.util.io.IOUtil;
 import org.eclipse.net4j.util.om.OMBundle;
@@ -32,7 +34,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 /**
  * @author Eike Stepper
  */
-public abstract class AbstractOMPlatform implements OMPlatform
+public abstract class AbstractPlatform implements OMPlatform
 {
   public static final String SYSTEM_PROPERTY_NET4J_CONFIG = "net4j.config"; //$NON-NLS-1$
 
@@ -40,7 +42,7 @@ public abstract class AbstractOMPlatform implements OMPlatform
 
   private static ContextTracer __TRACER__;
 
-  private Map<String, AbstractOMBundle> bundles = new ConcurrentHashMap(0);
+  private Map<String, AbstractBundle> bundles = new ConcurrentHashMap(0);
 
   private Queue<OMLogHandler> logHandlers = new ConcurrentLinkedQueue();
 
@@ -48,7 +50,7 @@ public abstract class AbstractOMPlatform implements OMPlatform
 
   private boolean debugging;
 
-  protected AbstractOMPlatform()
+  protected AbstractPlatform()
   {
     debugging = Boolean.parseBoolean(System.getProperty("debug", "false")); //$NON-NLS-1$ //$NON-NLS-2$
   }
@@ -196,7 +198,7 @@ public abstract class AbstractOMPlatform implements OMPlatform
     }
   }
 
-  protected Map<String, AbstractOMBundle> getBundles()
+  protected Map<String, AbstractBundle> getBundles()
   {
     return bundles;
   }
@@ -236,7 +238,7 @@ public abstract class AbstractOMPlatform implements OMPlatform
   {
     if (__TRACER__ == null)
     {
-      __TRACER__ = new ContextTracer(OM.DEBUG_OM, AbstractOMPlatform.class);
+      __TRACER__ = new ContextTracer(OM.DEBUG_OM, AbstractPlatform.class);
     }
 
     return __TRACER__;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
index 2cbce9500f..0230d671c3 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
@@ -54,16 +54,16 @@ public abstract class OM
   {
     public void start(BundleContext context) throws Exception
     {
-      AbstractOMPlatform.systemContext = context;
+      AbstractPlatform.systemContext = context;
       OM.BUNDLE.setBundleContext(context);
 
       PrintTraceHandler.CONSOLE.setPattern("{6} [{0}] {5}");
-      AbstractOMPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE);
-      AbstractOMPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE);
+      AbstractPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE);
+      AbstractPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE);
 
       try
       {
-        AbstractOMPlatform.INSTANCE.addLogHandler(EclipseLoggingBridge.INSTANCE);
+        AbstractPlatform.INSTANCE.addLogHandler(EclipseLoggingBridge.INSTANCE);
       }
       catch (Exception ignore)
       {
@@ -76,7 +76,7 @@ public abstract class OM
     {
       traceStop(context);
       OM.BUNDLE.setBundleContext(null);
-      AbstractOMPlatform.systemContext = null;
+      AbstractPlatform.systemContext = null;
     }
 
     public static void traceStart(BundleContext context)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
index c0487c07bd..14cd66398c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
@@ -8,8 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  **************************************************************************/
-package org.eclipse.net4j.internal.util.bundle;
+package org.eclipse.net4j.internal.util.om;
 
+import org.eclipse.net4j.internal.util.bundle.AbstractBundle;
+import org.eclipse.net4j.internal.util.bundle.AbstractPlatform;
 import org.eclipse.net4j.util.ReflectUtil;
 import org.eclipse.net4j.util.StringUtil;
 import org.eclipse.net4j.util.io.IOUtil;
@@ -25,11 +27,11 @@ import java.util.Map.Entry;
 /**
  * @author Eike Stepper
  */
-public class LegacyBundle extends AbstractOMBundle
+public class LegacyBundle extends AbstractBundle
 {
   private URL baseURL;
 
-  public LegacyBundle(AbstractOMPlatform platform, String bundleID, Class accessor)
+  public LegacyBundle(AbstractPlatform platform, String bundleID, Class accessor)
   {
     super(platform, bundleID, accessor);
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java
index d3f1ab2217..cf90340087 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java
@@ -8,9 +8,9 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  **************************************************************************/
-package org.eclipse.net4j.internal.util.bundle;
+package org.eclipse.net4j.internal.util.om;
 
-import org.eclipse.net4j.internal.util.om.pref.Preferences;
+import org.eclipse.net4j.internal.util.bundle.AbstractPlatform;
 import org.eclipse.net4j.util.om.OMBundle;
 
 import java.util.Map;
@@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * @author Eike Stepper
  */
-public class LegacyPlatform extends AbstractOMPlatform
+public class LegacyPlatform extends AbstractPlatform
 {
   private Map<String, String> debugOptions = new ConcurrentHashMap(0);
 
@@ -27,26 +27,6 @@ public class LegacyPlatform extends AbstractOMPlatform
   {
   }
 
-  public synchronized void start()
-  {
-  }
-
-  public synchronized void stop()
-  {
-    for (AbstractOMBundle bundle : getBundles().values())
-    {
-      try
-      {
-        Preferences preferences = bundle.preferences();
-        preferences.save();
-      }
-      catch (RuntimeException ex)
-      {
-        OM.LOG.error(ex);
-      }
-    }
-  }
-
   @Override
   protected OMBundle createBundle(String bundleID, Class accessor)
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiBundle.java
index f1d16e1208..2f03ff8f94 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiBundle.java
@@ -8,8 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  **************************************************************************/
-package org.eclipse.net4j.internal.util.bundle;
+package org.eclipse.net4j.internal.util.om;
 
+import org.eclipse.net4j.internal.util.bundle.AbstractBundle;
+import org.eclipse.net4j.internal.util.bundle.AbstractPlatform;
 import org.eclipse.net4j.util.io.IOUtil;
 
 import org.eclipse.core.runtime.FileLocator;
@@ -24,9 +26,9 @@ import java.net.URL;
 /**
  * @author Eike Stepper
  */
-public class OSGiBundle extends AbstractOMBundle
+public class OSGiBundle extends AbstractBundle
 {
-  public OSGiBundle(AbstractOMPlatform platform, String bundleID, Class accessor)
+  public OSGiBundle(AbstractPlatform platform, String bundleID, Class accessor)
   {
     super(platform, bundleID, accessor);
   }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java
index b8de43c32f..22bb95fde6 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java
@@ -8,8 +8,9 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  **************************************************************************/
-package org.eclipse.net4j.internal.util.bundle;
+package org.eclipse.net4j.internal.util.om;
 
+import org.eclipse.net4j.internal.util.bundle.AbstractPlatform;
 import org.eclipse.net4j.util.om.OMBundle;
 
 import org.eclipse.core.runtime.Platform;
@@ -21,7 +22,7 @@ import org.osgi.framework.ServiceReference;
 /**
  * @author Eike Stepper
  */
-public class OSGiPlatform extends AbstractOMPlatform
+public class OSGiPlatform extends AbstractPlatform
 {
   BundleContext systemContext;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/EclipseLoggingBridge.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/EclipseLoggingBridge.java
index c2f069d724..25aa90804c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/EclipseLoggingBridge.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/EclipseLoggingBridge.java
@@ -11,7 +11,7 @@
 package org.eclipse.net4j.internal.util.om.log;
 
 import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.bundle.OSGiBundle;
+import org.eclipse.net4j.internal.util.om.OSGiBundle;
 import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
 import org.eclipse.net4j.util.om.log.OMLogHandler;
 import org.eclipse.net4j.util.om.log.OMLogger;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/Logger.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/Logger.java
index 014c1ba2ce..9acfaf16b9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/Logger.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/Logger.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.internal.util.om.log;
 
-import org.eclipse.net4j.internal.util.bundle.AbstractOMPlatform;
+import org.eclipse.net4j.internal.util.bundle.AbstractPlatform;
 import org.eclipse.net4j.util.om.OMBundle;
 import org.eclipse.net4j.util.om.log.OMLogger;
 
@@ -33,7 +33,7 @@ public class Logger implements OMLogger
 
   public void log(Level level, String msg, Throwable t)
   {
-    ((AbstractOMPlatform)bundle.getPlatform()).log(this, level, msg, t);
+    ((AbstractPlatform)bundle.getPlatform()).log(this, level, msg, t);
   }
 
   public void error(String msg, Throwable t)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/OSGiLoggingBridge.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/OSGiLoggingBridge.java
index 5d49accdb4..4feb9c91f8 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/OSGiLoggingBridge.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/OSGiLoggingBridge.java
@@ -11,7 +11,7 @@
 package org.eclipse.net4j.internal.util.om.log;
 
 import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.bundle.OSGiBundle;
+import org.eclipse.net4j.internal.util.om.OSGiBundle;
 import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
 import org.eclipse.net4j.util.om.log.OMLogHandler;
 import org.eclipse.net4j.util.om.log.OMLogger;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java
index 1781aff73b..bd39e16cd4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.internal.util.om.pref;
 
-import org.eclipse.net4j.internal.util.bundle.AbstractOMBundle;
+import org.eclipse.net4j.internal.util.bundle.AbstractBundle;
 import org.eclipse.net4j.internal.util.event.Notifier;
 import org.eclipse.net4j.util.io.IORunnable;
 import org.eclipse.net4j.util.io.IORuntimeException;
@@ -43,7 +43,7 @@ public class Preferences extends Notifier implements OMPreferences
 
   public static final String DEFAULT_STRING = "";
 
-  private AbstractOMBundle bundle;
+  private AbstractBundle bundle;
 
   private Map<String, Preference> prefs = new HashMap();
 
@@ -51,13 +51,12 @@ public class Preferences extends Notifier implements OMPreferences
 
   private boolean dirty;
 
-  public Preferences(AbstractOMBundle bundle)
+  public Preferences(AbstractBundle bundle)
   {
     this.bundle = bundle;
-    load();
   }
 
-  public AbstractOMBundle getBundle()
+  public AbstractBundle getBundle()
   {
     return bundle;
   }
@@ -82,10 +81,10 @@ public class Preferences extends Notifier implements OMPreferences
         for (Preference preference : prefs.values())
         {
           String name = preference.getName();
-          String property = properties.getProperty(name);
-          if (property != null)
+          String value = properties.getProperty(name);
+          if (value != null)
           {
-            preference.init(property);
+            preference.init(value);
           }
         }
       }
@@ -97,14 +96,34 @@ public class Preferences extends Notifier implements OMPreferences
     if (dirty)
     {
       final Properties properties = new Properties();
+      for (Preference preference : prefs.values())
+      {
+        if (preference.isSet())
+        {
+          String name = preference.getName();
+          String value = preference.getString();
+          properties.put(name, value);
+        }
+      }
+
       File file = getFile();
-      IOUtil.output(file, new IORunnable<FileOutputStream>()
+      if (properties.isEmpty())
       {
-        public void run(FileOutputStream io) throws IOException
+        if (file.exists())
         {
-          properties.store(io, "Preferences of " + bundle.getBundleID());
+          file.delete();
         }
-      });
+      }
+      else
+      {
+        IOUtil.output(file, new IORunnable<FileOutputStream>()
+        {
+          public void run(FileOutputStream io) throws IOException
+          {
+            properties.store(io, "Preferences of " + bundle.getBundleID());
+          }
+        });
+      }
 
       dirty = false;
     }
@@ -213,7 +232,7 @@ public class Preferences extends Notifier implements OMPreferences
   private File getFile()
   {
     File file = new File(bundle.getStateLocation(), ".prefs");
-    if (!file.isFile())
+    if (file.exists() && !file.isFile())
     {
       throw new IORuntimeException("Not a file: " + file.getAbsolutePath());
     }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java
index d3ec1c9043..9f20a8cac6 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.internal.util.om.trace;
 
-import org.eclipse.net4j.internal.util.bundle.AbstractOMPlatform;
+import org.eclipse.net4j.internal.util.bundle.AbstractPlatform;
 import org.eclipse.net4j.util.om.OMBundle;
 import org.eclipse.net4j.util.om.trace.OMTraceHandlerEvent;
 import org.eclipse.net4j.util.om.trace.OMTracer;
@@ -77,7 +77,7 @@ public class Tracer implements OMTracer
 
   public void trace(OMTraceHandlerEvent event)
   {
-    ((AbstractOMPlatform)bundle.getPlatform()).trace(event);
+    ((AbstractPlatform)bundle.getPlatform()).trace(event);
   }
 
   public OMTraceHandlerEvent trace(Class context, String msg, Throwable t)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java
index 27f32f4a37..62917c3d77 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.util.om;
 
-import org.eclipse.net4j.internal.util.bundle.LegacyPlatform;
+import org.eclipse.net4j.internal.util.om.LegacyBundle;
 
 /**
  * @author Eike Stepper
@@ -21,15 +21,19 @@ public final class LegacyUtil
   {
   }
 
-  public static void startPlatform()
+  public static void start(OMBundle[] bundles) throws Exception
   {
-    LegacyPlatform platform = (LegacyPlatform)OMPlatform.INSTANCE;
-    platform.start();
+    for (int i = 0; i < bundles.length; i++)
+    {
+      ((LegacyBundle)bundles[i]).start();
+    }
   }
 
-  public static void stopPlatform()
+  public static void stop(OMBundle[] bundles) throws Exception
   {
-    LegacyPlatform platform = (LegacyPlatform)OMPlatform.INSTANCE;
-    platform.stop();
+    for (int i = bundles.length - 1; i >= 0; i--)
+    {
+      ((LegacyBundle)bundles[i]).stop();
+    }
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java
index 412f61d9b8..ff38f9672c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.util.om;
 
-import org.eclipse.net4j.internal.util.bundle.AbstractOMPlatform;
+import org.eclipse.net4j.internal.util.bundle.AbstractPlatform;
 import org.eclipse.net4j.util.om.log.OMLogHandler;
 import org.eclipse.net4j.util.om.trace.OMTraceHandler;
 
@@ -23,7 +23,7 @@ import java.util.Properties;
 public interface OMPlatform
 {
   // @Singleton
-  public static final OMPlatform INSTANCE = AbstractOMPlatform.createPlatform();
+  public static final OMPlatform INSTANCE = AbstractPlatform.createPlatform();
 
   public OMBundle bundle(String bundleID, Class accessor);
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java
index b48c562e8b..40a712d751 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.util.om;
 
-import org.eclipse.net4j.internal.util.bundle.AbstractOMBundle;
+import org.eclipse.net4j.internal.util.bundle.AbstractBundle;
 import org.eclipse.net4j.internal.util.bundle.OM;
 
 import org.osgi.framework.BundleActivator;
@@ -36,7 +36,7 @@ public abstract class OSGiActivator implements BundleActivator
   public final void start(BundleContext context) throws Exception
   {
     OM.Activator.traceStart(context);
-    AbstractOMBundle bundle = (AbstractOMBundle)getOMBundle();
+    AbstractBundle bundle = (AbstractBundle)getOMBundle();
     if (bundle == null)
     {
       throw new IllegalStateException("bundle == null");
@@ -62,7 +62,7 @@ public abstract class OSGiActivator implements BundleActivator
   public final void stop(BundleContext context) throws Exception
   {
     OM.Activator.traceStop(context);
-    AbstractOMBundle bundle = (AbstractOMBundle)getOMBundle();
+    AbstractBundle bundle = (AbstractBundle)getOMBundle();
     if (bundle == null)
     {
       throw new IllegalStateException("bundle == null");
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java
index 5d9c8b6af7..33a7267391 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java
@@ -36,6 +36,18 @@ public interface OMPreferences extends INotifier
 
   public OMPreference<String> init(String name, String defaultValue);
 
+  public OMPreference<Boolean> initBoolean(String name);
+
+  public OMPreference<Integer> initInteger(String name);
+
+  public OMPreference<Long> initLong(String name);
+
+  public OMPreference<Float> initFloat(String name);
+
+  public OMPreference<Double> initDouble(String name);
+
+  public OMPreference<String> initString(String name);
+
   public OMPreference<Boolean> getBoolean(String name);
 
   public OMPreference<Integer> getInteger(String name);
diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
index 9cba0c5bf8..f1b75da53b 100644
--- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;resolution:=optional,
  org.eclipse.net4j.util;visibility:=reexport
 Export-Package: org.eclipse.internal.net4j;version="0.8.0",
- org.eclipse.internal.net4j.bundle;version="0.8.0",
  org.eclipse.net4j;version="0.8.0",
  org.eclipse.net4j.signal;version="0.8.0",
  org.eclipse.net4j.stream;version="0.8.0"
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/AcceptorFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/AcceptorFactory.java
index a322c6dca0..c3e0508cbc 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/AcceptorFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/AcceptorFactory.java
@@ -13,14 +13,12 @@ package org.eclipse.internal.net4j;
 import org.eclipse.net4j.IAcceptor;
 import org.eclipse.net4j.internal.util.factory.Factory;
 
-import org.eclipse.internal.net4j.bundle.OM;
-
 /**
  * @author Eike Stepper
  */
 public abstract class AcceptorFactory<PRODUCT extends IAcceptor> extends Factory<PRODUCT>
 {
-  public static final String ACCEPTOR_GROUP = OM.BUNDLE_ID + ".acceptors";
+  public static final String ACCEPTOR_GROUP = "org.eclipse.net4j.acceptors";
 
   public AcceptorFactory(String type)
   {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ClientProtocolFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ClientProtocolFactory.java
index 76395cdb7c..af73a50a16 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ClientProtocolFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ClientProtocolFactory.java
@@ -13,14 +13,12 @@ package org.eclipse.internal.net4j;
 import org.eclipse.net4j.IProtocol;
 import org.eclipse.net4j.internal.util.factory.Factory;
 
-import org.eclipse.internal.net4j.bundle.OM;
-
 /**
  * @author Eike Stepper
  */
 public abstract class ClientProtocolFactory<PRODUCT extends IProtocol> extends Factory<PRODUCT>
 {
-  public static final String CLIENT_PROTOCOL_GROUP = OM.BUNDLE_ID + ".clientProtocols";
+  public static final String CLIENT_PROTOCOL_GROUP = "org.eclipse.net4j.clientProtocols";
 
   public ClientProtocolFactory(String type)
   {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ConnectorFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ConnectorFactory.java
index 26bea5fe24..5c76abb440 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ConnectorFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ConnectorFactory.java
@@ -13,14 +13,12 @@ package org.eclipse.internal.net4j;
 import org.eclipse.net4j.IConnector;
 import org.eclipse.net4j.internal.util.factory.Factory;
 
-import org.eclipse.internal.net4j.bundle.OM;
-
 /**
  * @author Eike Stepper
  */
 public abstract class ConnectorFactory<PRODUCT extends IConnector> extends Factory<PRODUCT>
 {
-  public static final String CONNECTOR_GROUP = OM.BUNDLE_ID + ".connectors";
+  public static final String CONNECTOR_GROUP = "org.eclipse.net4j.connectors";
 
   public ConnectorFactory(String type)
   {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ServerProtocolFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ServerProtocolFactory.java
index 40c100cd73..24b0655111 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ServerProtocolFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ServerProtocolFactory.java
@@ -13,14 +13,12 @@ package org.eclipse.internal.net4j;
 import org.eclipse.net4j.IProtocol;
 import org.eclipse.net4j.internal.util.factory.Factory;
 
-import org.eclipse.internal.net4j.bundle.OM;
-
 /**
  * @author Eike Stepper
  */
 public abstract class ServerProtocolFactory<PRODUCT extends IProtocol> extends Factory<PRODUCT>
 {
-  public static final String SERVER_PROTOCOL_GROUP = OM.BUNDLE_ID + ".serverProtocols";
+  public static final String SERVER_PROTOCOL_GROUP = "org.eclipse.net4j.serverProtocols";
 
   public ServerProtocolFactory(String type)
   {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
index 8785403241..6e8dea3f57 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
@@ -51,7 +51,7 @@ public abstract class OM
   /**
    * @author Eike Stepper
    */
-  static final class Activator extends OSGiActivator
+  public static final class Activator extends OSGiActivator
   {
     public Activator()
     {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ITransportContainer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ITransportContainer.java
index 599fc1927c..e23371225d 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ITransportContainer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ITransportContainer.java
@@ -12,8 +12,6 @@ package org.eclipse.net4j;
 
 import org.eclipse.net4j.util.container.IManagedContainer;
 
-import org.eclipse.internal.net4j.bundle.OM;
-
 import java.util.concurrent.ExecutorService;
 
 /**
@@ -22,9 +20,9 @@ import java.util.concurrent.ExecutorService;
  */
 public interface ITransportContainer extends IManagedContainer
 {
-  public static final String EXECUTOR_SERVICE_GROUP = OM.BUNDLE_ID + ".executorServices";
+  public static final String EXECUTOR_SERVICE_GROUP = "org.eclipse.net4j.executorServices";
 
-  public static final String BUFFER_PROVIDER_GROUP = OM.BUNDLE_ID + ".bufferProviders";
+  public static final String BUFFER_PROVIDER_GROUP = "org.eclipse.net4j.bufferProviders";
 
   public static final short DEFAULT_BUFFER_CAPACITY = 4096;