[238242] Enable API Tooling

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

231 files changed, 1171 insertions, 3012 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common/.project b/plugins/org.eclipse.emf.cdo.common/.project
index 0a3ede0bd0..aa3b610b11 100644
--- a/plugins/org.eclipse.emf.cdo.common/.project
+++ b/plugins/org.eclipse.emf.cdo.common/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
index 8027e18644..4d452ec5d8 100644
--- a/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.common
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -9,23 +9,23 @@ Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.emf.cdo.internal.common.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
-Require-Bundle: org.eclipse.net4j;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+Require-Bundle: org.eclipse.net4j;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Import-Package: org.osgi.framework;version="1.3.0";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.common;version="1.0.0",
- org.eclipse.emf.cdo.common.analyzer;version="1.0.0",
- org.eclipse.emf.cdo.common.id;version="1.0.0",
- org.eclipse.emf.cdo.common.model;version="1.0.0",
- org.eclipse.emf.cdo.common.model.core;version="1.0.0",
- org.eclipse.emf.cdo.common.model.resource;version="1.0.0",
- org.eclipse.emf.cdo.common.revision;version="1.0.0",
- org.eclipse.emf.cdo.common.revision.delta;version="1.0.0",
- org.eclipse.emf.cdo.common.util;version="1.0.0",
- org.eclipse.emf.cdo.internal.common;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server",
- org.eclipse.emf.cdo.internal.common.bundle;version="1.0.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.id;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server",
- org.eclipse.emf.cdo.internal.common.model;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server",
- org.eclipse.emf.cdo.internal.common.model.core;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server",
- org.eclipse.emf.cdo.internal.common.model.resource;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server",
- org.eclipse.emf.cdo.internal.common.revision;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server",
- org.eclipse.emf.cdo.internal.common.revision.delta;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server",
- org.eclipse.emf.cdo.spi.common;version="1.0.0"
+Export-Package: org.eclipse.emf.cdo.common;version="2.0.0",
+ org.eclipse.emf.cdo.common.analyzer;version="2.0.0",
+ org.eclipse.emf.cdo.common.id;version="2.0.0",
+ org.eclipse.emf.cdo.common.model;version="2.0.0",
+ org.eclipse.emf.cdo.common.model.core;version="2.0.0",
+ org.eclipse.emf.cdo.common.model.resource;version="2.0.0",
+ org.eclipse.emf.cdo.common.revision;version="2.0.0",
+ org.eclipse.emf.cdo.common.revision.delta;version="2.0.0",
+ org.eclipse.emf.cdo.common.util;version="2.0.0",
+ org.eclipse.emf.cdo.internal.common;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server",
+ org.eclipse.emf.cdo.internal.common.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.id;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server",
+ org.eclipse.emf.cdo.internal.common.model;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server",
+ org.eclipse.emf.cdo.internal.common.model.core;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server",
+ org.eclipse.emf.cdo.internal.common.model.resource;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server",
+ org.eclipse.emf.cdo.internal.common.revision;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server",
+ org.eclipse.emf.cdo.internal.common.revision.delta;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.server",
+ org.eclipse.emf.cdo.spi.common
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocol.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocol.java
index 7dccf792b3..3dcfe20493 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocol.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.protocol.IProtocol;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOProtocol extends IProtocol
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocolConstants.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocolConstants.java
index f849caf4d5..3f20f1ed0e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocolConstants.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocolConstants.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.common;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOProtocolConstants
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocolSession.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocolSession.java
index 6c378a606b..610357cf66 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocolSession.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocolSession.java
@@ -12,13 +12,12 @@ package org.eclipse.emf.cdo.common;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOProtocolSession
 {
   public int getSessionID();
 
-  public CDOProtocol getProtocol();
-
   public CDOProtocolView[] getViews();
 
   public CDOProtocolView getView(int viewID);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocolView.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocolView.java
index 7099da4884..e4bd8299c5 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocolView.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOProtocolView.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.common;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOProtocolView
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOID.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOID.java
index 292f631be8..f772622642 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOID.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOID.java
@@ -14,6 +14,7 @@ import java.io.Serializable;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOID extends Serializable
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDAndVersion.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDAndVersion.java
index 68d56443df..6682faf23d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDAndVersion.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDAndVersion.java
@@ -16,6 +16,7 @@ import java.io.IOException;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOIDAndVersion
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDLibraryDescriptor.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDLibraryDescriptor.java
index 2a1a4f8e9b..8fc3dfd626 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDLibraryDescriptor.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDLibraryDescriptor.java
@@ -16,6 +16,7 @@ import java.io.IOException;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOIDLibraryDescriptor
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDMeta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDMeta.java
index 691e09ac73..8bb2070886 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDMeta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDMeta.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.common.id;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOIDMeta extends CDOID
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDMetaRange.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDMetaRange.java
index 71fd9bd461..4c3fe128b8 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDMetaRange.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDMetaRange.java
@@ -16,6 +16,7 @@ import java.io.Serializable;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOIDMetaRange extends Serializable
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDProvider.java
index cf92f30b74..ffdf79abe8 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDProvider.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.common.id;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOIDProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDTemp.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDTemp.java
index ca9281d6b6..0ffe15fad4 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDTemp.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDTemp.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.common.id;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOIDTemp extends CDOID
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClass.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClass.java
index ec4823b98d..86a41ad434 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClass.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClass.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.common.model;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOClass extends CDOModelElement, Comparable<CDOClass>
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassRef.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassRef.java
index 832f792862..a81951ce4c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassRef.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassRef.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.common.model;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOClassRef
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOFeature.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOFeature.java
index 35c1cfa9c0..1886410f7d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOFeature.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOFeature.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.common.model;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOFeature extends CDOModelElement
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelElement.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelElement.java
index daf5ea6fde..85362dcd1d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelElement.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelElement.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.common.model;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOModelElement
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackage.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackage.java
index a2716512c3..9bba43260c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackage.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackage.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.common.id.CDOIDMetaRange;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOPackage extends CDOModelElement, Comparable<CDOPackage>
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageInfo.java
index b03b2aecba..81b1a8c589 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageInfo.java
@@ -12,9 +12,11 @@ package org.eclipse.emf.cdo.common.model;
 
 import org.eclipse.emf.cdo.common.id.CDOIDMetaRange;
 
-/**
+/*
  * TODO Add read(), write(), ...
- * 
+ */
+
+/**
  * @author Eike Stepper
  */
 public final class CDOPackageInfo
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageManager.java
index bd6d7e3a6b..110b4a134e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageManager.java
@@ -18,6 +18,7 @@ import org.eclipse.net4j.util.container.IContainer;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOPackageManager extends IContainer<CDOPackage>
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOType.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOType.java
index 558ba8253a..657b8004d4 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOType.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOType.java
@@ -19,6 +19,7 @@ import java.io.IOException;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOType
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/core/CDOCorePackage.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/core/CDOCorePackage.java
index 908af68f9b..3fe59cb9f9 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/core/CDOCorePackage.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/core/CDOCorePackage.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackage;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOCorePackage extends CDOPackage
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/core/CDOObjectClass.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/core/CDOObjectClass.java
index ffb3f161bc..2df002bbed 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/core/CDOObjectClass.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/core/CDOObjectClass.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.common.model.CDOClass;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOObjectClass extends CDOClass
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOContentsFeature.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOContentsFeature.java
index d8bfeebdc4..f0658e1e70 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOContentsFeature.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOContentsFeature.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.common.model.CDOFeature;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOContentsFeature extends CDOFeature
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOPathFeature.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOPathFeature.java
index 1438fb1f57..7e43a15189 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOPathFeature.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOPathFeature.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.common.model.CDOFeature;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOPathFeature extends CDOFeature
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOResourceClass.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOResourceClass.java
index dde37970b2..1a303164e9 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOResourceClass.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOResourceClass.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.common.model.CDOClass;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOResourceClass extends CDOClass
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOResourcePackage.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOResourcePackage.java
index 309040391c..baf5e54288 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOResourcePackage.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/resource/CDOResourcePackage.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackage;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOResourcePackage extends CDOPackage
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOReferenceProxy.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOReferenceProxy.java
index d7c466de6e..4840e8896a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOReferenceProxy.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOReferenceProxy.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.common.model.CDOFeature;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOReferenceProxy
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevision.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevision.java
index a38fabb631..48d27771b5 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevision.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevision.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDORevision
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionData.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionData.java
index 06bf2b8384..6775d72f41 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionData.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionData.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.common.model.CDOFeature;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDORevisionData
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionResolver.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionResolver.java
index 540ae82fbb..5591eeee68 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionResolver.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionResolver.java
@@ -19,6 +19,7 @@ import java.util.List;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDORevisionResolver
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.java
index a3617c70fe..361082a640 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.common.revision.delta;
 
 /**
  * @author Simon McDuff
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOAddFeatureDelta extends CDOFeatureDelta
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOClearFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOClearFeatureDelta.java
index 61f22a3d03..6a5fa25d47 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOClearFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOClearFeatureDelta.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.common.revision.delta;
 
 /**
  * @author Simon McDuff
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOClearFeatureDelta extends CDOFeatureDelta
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOContainerFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOContainerFeatureDelta.java
index bfcecf7a91..152682c294 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOContainerFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOContainerFeatureDelta.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.common.id.CDOID;
 
 /**
  * @author Simon McDuff
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOContainerFeatureDelta extends CDOFeatureDelta
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.java
index b6abd5cd21..84b2549060 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.common.revision.CDORevision;
 
 /**
  * @author Simon McDuff
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOFeatureDelta
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaHandler.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaHandler.java
index fe9597452a..04959de3be 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaHandler.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaHandler.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.common.revision.delta;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOFeatureDeltaHandler
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaVisitor.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaVisitor.java
index 17e4b2e980..52bb598cd8 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaVisitor.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaVisitor.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.common.revision.delta;
 
 /**
  * @author Simon McDuff
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOFeatureDeltaVisitor
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOListFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOListFeatureDelta.java
index 8b2eb714d1..56a665ac31 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOListFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOListFeatureDelta.java
@@ -15,6 +15,7 @@ import java.util.List;
 
 /**
  * @author Simon McDuff
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOListFeatureDelta extends CDOFeatureDelta
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOMoveFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOMoveFeatureDelta.java
index 0b76002436..57df35c1cc 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOMoveFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOMoveFeatureDelta.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.common.revision.delta;
 
 /**
  * @author Simon McDuff
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOMoveFeatureDelta extends CDOFeatureDelta
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.java
index 6458bd5ce6..2da94ec392 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.common.revision.delta;
 
 /**
  * @author Simon McDuff
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDORemoveFeatureDelta extends CDOFeatureDelta
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java
index cf543f68fd..ea166d86fd 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java
@@ -22,6 +22,7 @@ import java.util.List;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDORevisionDelta
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.java
index 6d9bff9ca8..21e754910a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.common.revision.delta;
 
 /**
  * @author Simon McDuff
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOSetFeatureDelta extends CDOFeatureDelta
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.java
index eb095cd9ec..57f2f13864 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.common.revision.delta;
 
 /**
  * @author Simon McDuff
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOUnsetFeatureDelta extends CDOFeatureDelta
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOClass.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOClass.java
index b564a5262d..1efcd29c0f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOClass.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOClass.java
@@ -20,6 +20,7 @@ import java.util.List;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface InternalCDOClass extends CDOClass, InternalCDOModelElement
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOFeature.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOFeature.java
index ba48483614..c266716782 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOFeature.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOFeature.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.cdo.common.model.CDOFeature;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface InternalCDOFeature extends CDOFeature, InternalCDOModelElement
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOModelElement.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOModelElement.java
index 3e2ddced61..02d18ec65a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOModelElement.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOModelElement.java
@@ -19,6 +19,7 @@ import java.io.IOException;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface InternalCDOModelElement extends CDOModelElement
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOPackage.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOPackage.java
index d7b8402f67..72b3cb461d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOPackage.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOPackage.java
@@ -19,6 +19,7 @@ import java.util.List;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface InternalCDOPackage extends CDOPackage, InternalCDOModelElement
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDORevisionDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDORevisionDelta.java
index 85081674a1..328c4f83ad 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDORevisionDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDORevisionDelta.java
@@ -19,6 +19,7 @@ import java.util.Map;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface InternalCDORevisionDelta extends CDORevisionDelta
 {
diff --git a/plugins/org.eclipse.emf.cdo.doc/.project b/plugins/org.eclipse.emf.cdo.doc/.project
index 9b22cef109..2de363a1ec 100644
--- a/plugins/org.eclipse.emf.cdo.doc/.project
+++ b/plugins/org.eclipse.emf.cdo.doc/.project
@@ -15,9 +15,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
-	    <nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF
index 550da604c8..9d7c40589d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.doc; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.3.0,4.0.0)"
diff --git a/plugins/org.eclipse.emf.cdo.edit/.project b/plugins/org.eclipse.emf.cdo.edit/.project
index 4cefbd7111..3d47a25f00 100644
--- a/plugins/org.eclipse.emf.cdo.edit/.project
+++ b/plugins/org.eclipse.emf.cdo.edit/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
index df1780d1e1..3752c26b09 100644
--- a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.edit; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.edit;version="1.0.0",
- org.eclipse.emf.cdo.eresource.provider;version="1.0.0"
+ org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.emf.cdo.edit;version="2.0.0",
+ org.eclipse.emf.cdo.eresource.provider;version="2.0.0"
diff --git a/plugins/org.eclipse.emf.cdo.examples/.project b/plugins/org.eclipse.emf.cdo.examples/.project
index e04447b6e5..ac4c556af6 100644
--- a/plugins/org.eclipse.emf.cdo.examples/.project
+++ b/plugins/org.eclipse.emf.cdo.examples/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF
index efbdb8aa8e..8ef1a953dc 100644
--- a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.emf.cdo.internal.examples.bundle.OM$Activator
@@ -9,8 +9,8 @@ Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.net4j.tcp;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.tcp;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.tests.model1;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.emf.cdo.examples,
diff --git a/plugins/org.eclipse.emf.cdo.migrator/.project b/plugins/org.eclipse.emf.cdo.migrator/.project
index 1f3916e520..96663e7f6a 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/.project
+++ b/plugins/org.eclipse.emf.cdo.migrator/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
index 0a0b099943..2430e90847 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.migrator;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)",
  org.eclipse.emf.importer;bundle-version="[2.4.0,3.0.0)"
-Export-Package: org.eclipse.emf.cdo.migrator;version="1.0.0",
- org.eclipse.emf.cdo.migrator.actions;version="1.0.0",
- org.eclipse.emf.cdo.migrator.wizards;version="1.0.0"
+Export-Package: org.eclipse.emf.cdo.internal.migrator;version="2.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.migrator.actions;version="2.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.migrator.wizards;version="2.0.0";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.migrator/plugin.xml b/plugins/org.eclipse.emf.cdo.migrator/plugin.xml
index 6fad0a5dd5..3298a9eb09 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.migrator/plugin.xml
@@ -24,7 +24,7 @@
     	icon="icons/full/obj16/CDOModelFile.gif" 
     	extensions="ecore,emof" 
     	description="%_UI_CDOImporter_description" 
-    	wizard="org.eclipse.emf.cdo.migrator.wizards.CDOImporterWizard" />
+    	wizard="org.eclipse.emf.cdo.internal.migrator.wizards.CDOImporterWizard" />
   </extension>
   
   <extension
@@ -42,7 +42,7 @@
            </separator>
         </menu>
         <action
-              class="org.eclipse.emf.cdo.migrator.actions.MigrateAction"
+              class="org.eclipse.emf.cdo.internal.migrator.actions.MigrateAction"
               enablesFor="1"
               id="org.eclipse.emf.cdo.migrator.MigrateAction"
               label="Migrate EMF Model"
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOImporter.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java
index eb02e6c3c0..4a368a8e9a 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOImporter.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  **************************************************************************/
-package org.eclipse.emf.cdo.migrator;
+package org.eclipse.emf.cdo.internal.migrator;
 
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
 import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
@@ -58,7 +58,7 @@ public class CDOImporter extends ModelImporter
     List<URI> locationURIs = getModelLocationURIs();
     if (locationURIs.isEmpty())
     {
-      diagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.migrator", 0,
+      diagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.internal.migrator", 0,
           "Specify a valid Ecore model and try loading again", null);
     }
     else
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOMigrator.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOMigrator.java
index 06a2490f58..1beb14495a 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOMigrator.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOMigrator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  **************************************************************************/
-package org.eclipse.emf.cdo.migrator;
+package org.eclipse.emf.cdo.internal.migrator;
 
 import org.eclipse.emf.codegen.ecore.genmodel.GenDelegationKind;
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/actions/MigrateAction.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java
index 9a5899283c..b4682e94f4 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/actions/MigrateAction.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java
@@ -8,9 +8,9 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  **************************************************************************/
-package org.eclipse.emf.cdo.migrator.actions;
+package org.eclipse.emf.cdo.internal.migrator.actions;
 
-import org.eclipse.emf.cdo.migrator.CDOMigrator;
+import org.eclipse.emf.cdo.internal.migrator.CDOMigrator;
 
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
 import org.eclipse.emf.common.util.EList;
@@ -101,7 +101,7 @@ public class MigrateAction implements IObjectActionDelegate
         }
         catch (Exception ex)
         {
-          return new Status(IStatus.ERROR, "org.eclipse.emf.cdo.migrator", "Problem while migrating EMF model", ex);
+          return new Status(IStatus.ERROR, "org.eclipse.emf.cdo.internal.migrator", "Problem while migrating EMF model", ex);
         }
 
         return Status.OK_STATUS;
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/wizards/CDOImporterWizard.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java
index 7bef613225..5defc3ad7a 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/wizards/CDOImporterWizard.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java
@@ -8,9 +8,9 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  **************************************************************************/
-package org.eclipse.emf.cdo.migrator.wizards;
+package org.eclipse.emf.cdo.internal.migrator.wizards;
 
-import org.eclipse.emf.cdo.migrator.CDOImporter;
+import org.eclipse.emf.cdo.internal.migrator.CDOImporter;
 
 import org.eclipse.emf.converter.ModelConverter;
 import org.eclipse.emf.importer.ui.contribution.base.ModelImporterDetailPage;
diff --git a/plugins/org.eclipse.emf.cdo.server.db/.project b/plugins/org.eclipse.emf.cdo.server.db/.project
index ae2080773f..4e87cec893 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/.project
+++ b/plugins/org.eclipse.emf.cdo.server.db/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
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 eb6bc44722..0e739318c8 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
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.server.db;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,8 +10,8 @@ Bundle-Activator: org.eclipse.emf.cdo.server.internal.db.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.db;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.server;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.server.db;version="1.0.0",
- org.eclipse.emf.cdo.server.internal.db;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.server.internal.db.bundle;version="1.0.0";x-internal:=true
+ org.eclipse.net4j.db;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.server;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.emf.cdo.server.db;version="2.0.0",
+ org.eclipse.emf.cdo.server.internal.db;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.cdo.server.internal.db.bundle;version="2.0.0";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStore.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStore.java
index c72f6b39ec..b75c2e004f 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStore.java
@@ -18,6 +18,7 @@ import org.eclipse.net4j.db.ddl.IDBSchema;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IDBStore extends IStore
 {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreAccessor.java
index 7cfde937ed..a95eec2463 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreAccessor.java
@@ -18,6 +18,7 @@ import java.sql.Statement;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IDBStoreAccessor extends IStoreAccessor
 {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreChunkReader.java
index fc2699cba5..dd9b946251 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreChunkReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreChunkReader.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.server.IStoreChunkReader;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IDBStoreChunkReader extends IStoreChunkReader
 {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreReader.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreReader.java
index b2bdf5c0c3..19bc0d807c 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreReader.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.server.IStoreReader;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IDBStoreReader extends IDBStoreAccessor, IStoreReader
 {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreWriter.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreWriter.java
index c201385c7a..1a1349b397 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreWriter.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreWriter.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.server.IStoreWriter;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IDBStoreWriter extends IDBStoreReader, IStoreWriter
 {
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.project b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.project
index 96fd1e4a66..c316db8704 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.project
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF
index 236015c956..f9f1113cfa 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.server.hibernate.teneo;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.emf.cdo.server.hibernate;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.cdo.server.hibernate;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Import-Package: org.eclipse.emf.teneo.hibernate.cdo,
  org.hibernate.cfg
-Export-Package: org.eclipse.emf.cdo.server.hibernate.teneo;version="1.0.0"
+Export-Package: org.eclipse.emf.cdo.server.hibernate.teneo;version="2.0.0"
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.project b/plugins/org.eclipse.emf.cdo.server.hibernate/.project
index 79f5f420b3..186aba3e41 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/.project
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF
index 41ce77f2eb..d6c1b3a729 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.server.hibernate;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,11 +10,11 @@ Bundle-Activator: org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM$Activa
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.cdo.server;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.server;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.server.hibernate.libraries;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.server.hibernate.id;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.server.hibernate;version="1.0.0",
- org.eclipse.emf.cdo.server.internal.hibernate;version="1.0.0",
- org.eclipse.emf.cdo.server.internal.hibernate.bundle;version="1.0.0",
- org.eclipse.emf.cdo.server.internal.hibernate.info;version="1.0.0",
- org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;version="1.0.0"
+ org.eclipse.emf.cdo.server.hibernate.id;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.emf.cdo.server.hibernate;version="2.0.0",
+ org.eclipse.emf.cdo.server.internal.hibernate;version="2.0.0",
+ org.eclipse.emf.cdo.server.internal.hibernate.bundle;version="2.0.0",
+ org.eclipse.emf.cdo.server.internal.hibernate.info;version="2.0.0",
+ org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;version="2.0.0"
diff --git a/plugins/org.eclipse.emf.cdo.server/.project b/plugins/org.eclipse.emf.cdo.server/.project
index 9ea6a8ca9c..9d0a3a536e 100644
--- a/plugins/org.eclipse.emf.cdo.server/.project
+++ b/plugins/org.eclipse.emf.cdo.server/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters
new file mode 100644
index 0000000000..5c3ea8d469
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.emf.cdo.server" version="2">
+    <resource path="src/org/eclipse/emf/cdo/internal/server/Transaction.java" type="org.eclipse.emf.cdo.internal.server.Transaction$TransactionPackageManager">
+        <filter id="574619656">
+            <message_arguments>
+                <message_argument value="CDOPackageManager"/>
+                <message_argument value="TransactionPackageManager"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/internal/server/RevisionManager.java" type="org.eclipse.emf.cdo.internal.server.RevisionManager">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="CDORevisionResolverImpl"/>
+                <message_argument value="RevisionManager"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/server/IPackageManager.java" type="org.eclipse.emf.cdo.server.IPackageManager">
+        <filter id="574619656">
+            <message_arguments>
+                <message_argument value="CDOPackageManager"/>
+                <message_argument value="IPackageManager"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/internal/server/SessionManager.java" type="org.eclipse.emf.cdo.internal.server.SessionManager">
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="CDOServerProtocol"/>
+                <message_argument value="SessionManager"/>
+                <message_argument value="openSession(CDOServerProtocol, boolean)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/server/IRevisionManager.java" type="org.eclipse.emf.cdo.server.IRevisionManager">
+        <filter id="574619656">
+            <message_arguments>
+                <message_argument value="CDORevisionResolver"/>
+                <message_argument value="IRevisionManager"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/server/ISessionManager.java" type="org.eclipse.emf.cdo.server.ISessionManager">
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="CDOServerProtocol"/>
+                <message_argument value="ISessionManager"/>
+                <message_argument value="openSession(CDOServerProtocol, boolean)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/server/IView.java" type="org.eclipse.emf.cdo.server.IView">
+        <filter id="574619656">
+            <message_arguments>
+                <message_argument value="CDOProtocolView"/>
+                <message_argument value="IView"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/internal/server/Session.java" type="org.eclipse.emf.cdo.internal.server.Session">
+        <filter id="574619656">
+            <message_arguments>
+                <message_argument value="CDOIDProvider"/>
+                <message_argument value="Session"/>
+            </message_arguments>
+        </filter>
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="CDOServerProtocol"/>
+                <message_argument value="Session"/>
+                <message_argument value="Session(SessionManager, CDOServerProtocol, int, boolean)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/internal/server/PackageManager.java" type="org.eclipse.emf.cdo.internal.server.PackageManager">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="CDOPackageManagerImpl"/>
+                <message_argument value="PackageManager"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/server/ISession.java" type="org.eclipse.emf.cdo.server.ISession">
+        <filter id="574619656">
+            <message_arguments>
+                <message_argument value="CDOProtocolSession"/>
+                <message_argument value="ISession"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
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 905e8adeba..1b0d6948f3 100644
--- a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.server;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,8 +10,8 @@ Bundle-Activator: org.eclipse.emf.cdo.internal.server.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.cdo.common;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.internal.server;version="1.0.0",
- org.eclipse.emf.cdo.internal.server.bundle;version="1.0.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.server.protocol;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.server;version="1.0.0"
+ org.eclipse.emf.cdo.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.emf.cdo.internal.server;version="2.0.0",
+ org.eclipse.emf.cdo.internal.server.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.server.protocol;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.cdo.server;version="2.0.0"
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
index b170267b5e..518b14268c 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
@@ -99,11 +99,6 @@ public class Session extends Container<IView> implements ISession, CDOIDProvider
     return legacySupportEnabled;
   }
 
-  public CDOServerProtocol getProtocol()
-  {
-    return protocol;
-  }
-
   public View[] getElements()
   {
     return getViews();
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
index d75426c8c0..33db7a00c1 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
@@ -386,7 +386,6 @@ public class Transaction extends View implements ITransaction, IStoreWriter.Comm
    */
   public final class TransactionPackageManager implements CDOPackageManager
   {
-
     private List<CDOPackage> newPackages = new ArrayList<CDOPackage>();
 
     public TransactionPackageManager()
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IPackageManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IPackageManager.java
index 7c722cea88..d28d914afd 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IPackageManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IPackageManager.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackageManager;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IPackageManager extends IRepositoryElement, CDOPackageManager
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
index 89c5f7c7f4..beebfb71b0 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
@@ -18,6 +18,7 @@ import java.util.Map;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IRepository extends IContainer<IRepositoryElement>
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryElement.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryElement.java
index 6b9e95f7db..8cf97386a5 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryElement.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryElement.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.server;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IRepositoryElement
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IResourceManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IResourceManager.java
index 1be1de8c18..f8dbb1a5f6 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IResourceManager.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.common.id.CDOID;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IResourceManager extends IRepositoryElement
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRevisionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRevisionManager.java
index 0b35992e37..20a1f54c98 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRevisionManager.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IRevisionManager extends IRepositoryElement, CDORevisionResolver
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISession.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISession.java
index 2440591baa..c53dae5beb 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISession.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISession.java
@@ -12,19 +12,17 @@ package org.eclipse.emf.cdo.server;
 
 import org.eclipse.emf.cdo.common.CDOProtocolSession;
 import org.eclipse.emf.cdo.common.CDOProtocolView;
-import org.eclipse.emf.cdo.internal.server.protocol.CDOServerProtocol;
 
 import org.eclipse.net4j.util.container.IContainer;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ISession extends CDOProtocolSession, IContainer<IView>
 {
   public ISessionManager getSessionManager();
 
-  public CDOServerProtocol getProtocol();
-
   public IView openView(int viewID, CDOProtocolView.Type type);
 
   public IView closeView(int viewID);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISessionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISessionManager.java
index 785b6dbb9b..a1fcd8601e 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISessionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISessionManager.java
@@ -16,6 +16,7 @@ import org.eclipse.net4j.util.container.IContainer;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ISessionManager extends IRepositoryElement, IContainer<ISession>
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java
index ecf12ce77a..d115a31400 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackageManager;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ITransaction extends IView
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java
index d39dd0cdb4..eb25b13075 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.common.CDOProtocolView;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IView extends CDOProtocolView
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerConstants.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerConstants.java
deleted file mode 100644
index f2a429cbca..0000000000
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerConstants.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Eike Stepper - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo.server;
-
-import org.eclipse.emf.cdo.common.CDOProtocolConstants;
-
-/**
- * @author Eike Stepper
- */
-public interface ServerConstants
-{
-  public static final String TYPE = CDOProtocolConstants.PROTOCOL_NAME + "server";
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/.project b/plugins/org.eclipse.emf.cdo.tests.hibernate/.project
index d7664e5c81..733b03fc03 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/.project
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF
index f302a7a6ca..a9ca11b4a6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.hibernate;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,13 +10,14 @@ Bundle-Activator: org.eclipse.emf.cdo.tests.hibernate.Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.db.mysql;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.net4j.db.hsqldb;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.net4j.tcp;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.cdo.server;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.net4j.db.mysql;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.net4j.db.hsqldb;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.net4j.tcp;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.cdo.server;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.cdo.server.hibernate.libraries;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.cdo.server.hibernate;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.cdo.tests;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.cdo.server.hibernate.teneo;bundle-version="[0.8.0,2.0.0)"
-Export-Package: mappings
+ org.eclipse.emf.cdo.server.hibernate;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.cdo.tests;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.cdo.server.hibernate.teneo;bundle-version="[2.0.0,3.0.0)"
+Export-Package: mappings;version="2.0.0",
+ org.eclipse.emf.cdo.tests.hibernate;version="2.0.0"
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/.project b/plugins/org.eclipse.emf.cdo.tests.mango/.project
index dea8e1d798..30cb7ab6a2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/.project
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF
index 3944f40d9d..231470bfb2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.mango; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -9,8 +9,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.tests.mango;version="1.0.0",
- org.eclipse.emf.cdo.tests.mango.impl;version="1.0.0",
- org.eclipse.emf.cdo.tests.mango.util;version="1.0.0"
+ org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.emf.cdo.tests.mango;version="2.0.0",
+ org.eclipse.emf.cdo.tests.mango.impl;version="2.0.0",
+ org.eclipse.emf.cdo.tests.mango.util;version="2.0.0"
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/.project b/plugins/org.eclipse.emf.cdo.tests.model1/.project
index d8ae1b30b8..cc15137286 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/.project
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
index 664e5a7c2a..040281bb6b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model1; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.tests.model1;version="1.0.0",
- org.eclipse.emf.cdo.tests.model1.impl;version="1.0.0",
- org.eclipse.emf.cdo.tests.model1.util;version="1.0.0"
+ org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.emf.cdo.tests.model1;version="2.0.0",
+ org.eclipse.emf.cdo.tests.model1.impl;version="2.0.0",
+ org.eclipse.emf.cdo.tests.model1.util;version="2.0.0"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/.project b/plugins/org.eclipse.emf.cdo.tests.model2/.project
index 6cae536bf7..e77c4dd03c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/.project
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF
index 441bd42478..3d8395bd2b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model2; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -9,8 +9,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.tests.model1;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.tests.model2;version="1.0.0",
- org.eclipse.emf.cdo.tests.model2.impl;version="1.0.0",
- org.eclipse.emf.cdo.tests.model2.util;version="1.0.0"
+ org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.tests.model1;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.emf.cdo.tests.model2;version="2.0.0",
+ org.eclipse.emf.cdo.tests.model2.impl;version="2.0.0",
+ org.eclipse.emf.cdo.tests.model2.util;version="2.0.0"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/.project b/plugins/org.eclipse.emf.cdo.tests.model3/.project
index 302dc15a1a..e178a92dbf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/.project
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF
index 5501ef67a5..5dbd3dba21 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model3; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.tests.model3;version="1.0.0",
- org.eclipse.emf.cdo.tests.model3.impl;version="1.0.0",
- org.eclipse.emf.cdo.tests.model3.subpackage;version="1.0.0",
- org.eclipse.emf.cdo.tests.model3.subpackage.impl;version="1.0.0",
- org.eclipse.emf.cdo.tests.model3.subpackage.util;version="1.0.0",
- org.eclipse.emf.cdo.tests.model3.util;version="1.0.0"
+Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
+ org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.emf.cdo.tests.model3;version="2.0.0",
+ org.eclipse.emf.cdo.tests.model3.impl;version="2.0.0",
+ org.eclipse.emf.cdo.tests.model3.subpackage;version="2.0.0",
+ org.eclipse.emf.cdo.tests.model3.subpackage.impl;version="2.0.0",
+ org.eclipse.emf.cdo.tests.model3.subpackage.util;version="2.0.0",
+ org.eclipse.emf.cdo.tests.model3.util;version="2.0.0"
diff --git a/plugins/org.eclipse.emf.cdo.tests/.project b/plugins/org.eclipse.emf.cdo.tests/.project
index e05af07d91..1b23a00a3a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/.project
+++ b/plugins/org.eclipse.emf.cdo.tests/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.tests/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.tests/.settings/.api_filters
new file mode 100644
index 0000000000..28ac20c701
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/.settings/.api_filters
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.emf.cdo.tests" version="2">
+    <resource path="src/org/eclipse/emf/cdo/tests/RevisionHolderTest.java" type="org.eclipse.emf.cdo.tests.RevisionHolderTest$RevisionStub">
+        <filter id="574619656">
+            <message_arguments>
+                <message_argument value="CDORevision"/>
+                <message_argument value="RevisionStub"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/tests/store/logic/DBStoreTestLogic.java" type="org.eclipse.emf.cdo.tests.store.logic.DBStoreTestLogic">
+        <filter id="627060751">
+            <message_arguments>
+                <message_argument value="DBStore"/>
+                <message_argument value="DBStoreTestLogic"/>
+                <message_argument value="store"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/tests/store/logic/TestLogic.java" type="org.eclipse.emf.cdo.tests.store.logic.TestLogic$CommitTemplate">
+        <filter id="643842064">
+            <message_arguments>
+                <message_argument value="CDOServerProtocol"/>
+                <message_argument value="CommitTemplate"/>
+                <message_argument value="createProtocol()"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/tests/store/logic/TestLogic.java" type="org.eclipse.emf.cdo.tests.store.logic.TestLogic$Revision">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="CDORevisionImpl"/>
+                <message_argument value="Revision"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
index c56ecf7137..9b0cebe868 100644
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
@@ -1,26 +1,27 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.emf.cdo.tests.Activator
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-ClassPath: .
 Bundle-Localization: plugin
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.emf.cdo.tests.Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.net4j.db.hsqldb;bundle-version="[1.0.0,2.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.net4j.jvm;bundle-version="[1.0.0,2.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.net4j.tcp;bundle-version="[1.0.0,2.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.emf.cdo.server;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.server.db;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.tests.mango;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.tests.model1;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.tests.model2;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.tests.model3;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.net4j.db.hsqldb;bundle-version="[2.0.0,3.0.0)";resolution:=optional;visibility:=reexport,
+ org.eclipse.net4j.jvm;bundle-version="[2.0.0,3.0.0)";resolution:=optional;visibility:=reexport,
+ org.eclipse.net4j.tcp;bundle-version="[2.0.0,3.0.0)";resolution:=optional;visibility:=reexport,
+ org.eclipse.emf.cdo.server;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.server.db;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.tests.mango;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.tests.model1;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.tests.model2;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.tests.model3;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.junit;bundle-version="[3.8.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.tests;version="1.0.0",
- org.eclipse.net4j.tests;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests.hibernate,org.eclipse.emf.cdo.tests.hibernate.client"
-Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.emf.cdo.tests;version="2.0.0",
+ org.eclipse.emf.cdo.tests.store.logic;version="2.0.0",
+ org.eclipse.net4j.tests;version="2.0.0"
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/store/logic/DBStoreTestLogic.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/store/logic/DBStoreTestLogic.java
index 64a67373f6..d9fdb20034 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/store/logic/DBStoreTestLogic.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/store/logic/DBStoreTestLogic.java
@@ -11,9 +11,9 @@
 package org.eclipse.emf.cdo.tests.store.logic;
 
 import org.eclipse.emf.cdo.server.IStore;
+import org.eclipse.emf.cdo.server.db.IMappingStrategy;
 import org.eclipse.emf.cdo.server.internal.db.CDODBSchema;
 import org.eclipse.emf.cdo.server.internal.db.DBStore;
-import org.eclipse.emf.cdo.server.internal.db.MappingStrategy;
 
 import org.eclipse.net4j.db.DBUtil;
 import org.eclipse.net4j.db.IDBAdapter;
@@ -41,7 +41,7 @@ public abstract class DBStoreTestLogic extends TestLogic
 {
   public static final String DEFINITION_MODE = "";
 
-  protected MappingStrategy mappingStrategy;
+  protected IMappingStrategy mappingStrategy;
 
   protected IDBAdapter dbAdapter;
 
@@ -87,7 +87,7 @@ public abstract class DBStoreTestLogic extends TestLogic
 
   protected abstract IDBAdapter createDBAdapter();
 
-  protected abstract MappingStrategy createMappingStrategy();
+  protected abstract IMappingStrategy createMappingStrategy();
 
   protected void defineOrCompare(String fileName) throws IOException
   {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/store/logic/HorizontalTestLogic.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/store/logic/HorizontalTestLogic.java
index f0175596cd..4e6db5e1f8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/store/logic/HorizontalTestLogic.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/store/logic/HorizontalTestLogic.java
@@ -11,6 +11,7 @@
 package org.eclipse.emf.cdo.tests.store.logic;
 
 import org.eclipse.emf.cdo.internal.server.Transaction;
+import org.eclipse.emf.cdo.server.db.IMappingStrategy;
 import org.eclipse.emf.cdo.server.internal.db.HorizontalMappingStrategy;
 import org.eclipse.emf.cdo.server.internal.db.MappingStrategy;
 import org.eclipse.emf.cdo.server.internal.db.ToMany;
@@ -29,7 +30,7 @@ public abstract class HorizontalTestLogic extends DBStoreTestLogic
   }
 
   @Override
-  protected HorizontalMappingStrategy createMappingStrategy()
+  protected IMappingStrategy createMappingStrategy()
   {
     Map<String, String> props = new HashMap<String, String>();
     props.put(MappingStrategy.PROP_TO_MANY_REFERENCE_MAPPING, ToMany.PER_CLASS.toString());
diff --git a/plugins/org.eclipse.emf.cdo.ui/.project b/plugins/org.eclipse.emf.cdo.ui/.project
index fb911caaaa..a5d170dfa1 100644
--- a/plugins/org.eclipse.emf.cdo.ui/.project
+++ b/plugins/org.eclipse.emf.cdo.ui/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
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 1702cf4deb..ad347310eb 100644
--- a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.internal.ui.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -14,16 +14,16 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.net4j;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.net4j;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.net4j.util.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.edit;bundle-version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.cdo.internal.ui;version="1.0.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.ui.actions;version="1.0.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.ui.bundle;version="1.0.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.ui.dialogs;version="1.0.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.ui.editor;version="1.0.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.ui.preferences;version="1.0.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.ui.views;version="1.0.0";x-internal:=true,
- org.eclipse.emf.cdo.ui;version="1.0.0"
+ org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.edit;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.emf.cdo.internal.ui;version="2.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.actions;version="2.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.dialogs;version="2.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.editor;version="2.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.preferences;version="2.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.views;version="2.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.ui;version="2.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EntryAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EntryAction.java
index 8eb83a1593..60bfbf4cb1 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EntryAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EntryAction.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.emf.cdo.internal.ui.actions;
 
-import org.eclipse.emf.cdo.internal.ui.views.CDOViewHistory;
+import org.eclipse.emf.cdo.ui.CDOViewHistoryEntry;
 
 import org.eclipse.net4j.util.ui.actions.LongRunningAction;
 
@@ -22,16 +22,16 @@ import org.eclipse.ui.IWorkbenchPage;
  */
 public abstract class EntryAction extends LongRunningAction
 {
-  private CDOViewHistory.Entry entry;
+  private CDOViewHistoryEntry entry;
 
   public EntryAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image,
-      CDOViewHistory.Entry entry)
+      CDOViewHistoryEntry entry)
   {
     super(page, text, toolTipText, image);
     this.entry = entry;
   }
 
-  public CDOViewHistory.Entry getEntry()
+  public CDOViewHistoryEntry getEntry()
   {
     return entry;
   }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
index 0ce2887973..a25ae72179 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.internal.ui.actions;
 
 import org.eclipse.emf.cdo.CDOView;
 import org.eclipse.emf.cdo.internal.ui.editor.CDOEditor;
-import org.eclipse.emf.cdo.internal.ui.views.CDOViewHistory;
+import org.eclipse.emf.cdo.ui.CDOViewHistoryEntry;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IWorkbenchPage;
@@ -27,7 +27,7 @@ public final class OpenResourceEditorAction extends EntryAction
   private static final String TOOL_TIP = "Open a CDO editor for this resource";
 
   public OpenResourceEditorAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image,
-      CDOViewHistory.Entry entry)
+      CDOViewHistoryEntry entry)
   {
     super(page, TITLE, TOOL_TIP, null, entry);
   }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
index 7e150a7ee8..ed4a3a919a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.CDOView;
 import org.eclipse.emf.cdo.internal.ui.actions.OpenSessionAction;
 import org.eclipse.emf.cdo.internal.ui.editor.CDOEditor;
 import org.eclipse.emf.cdo.ui.CDOItemProvider;
+import org.eclipse.emf.cdo.ui.CDOViewHistoryEntry;
 
 import org.eclipse.net4j.util.container.IContainer;
 import org.eclipse.net4j.util.container.IManagedContainer;
@@ -71,9 +72,9 @@ public class CDOSessionsView extends ContainerView
   @Override
   protected void doubleClicked(Object object)
   {
-    if (object instanceof CDOViewHistory.Entry)
+    if (object instanceof CDOViewHistoryEntry)
     {
-      CDOViewHistory.Entry entry = (CDOViewHistory.Entry)object;
+      CDOViewHistoryEntry entry = (CDOViewHistoryEntry)object;
       IWorkbenchPage page = getViewSite().getPage();
       CDOView view = entry.getView();
       String resourcePath = entry.getResourcePath();
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
index 708f37001f..6bc1cc9808 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.cdo.internal.ui.actions.RegisterSinglePackageAction;
 import org.eclipse.emf.cdo.internal.ui.actions.RegisterWorkspacePackagesAction;
 import org.eclipse.emf.cdo.internal.ui.actions.ReloadViewAction;
 import org.eclipse.emf.cdo.internal.ui.actions.RollbackTransactionAction;
-import org.eclipse.emf.cdo.internal.ui.views.CDOViewHistory;
-import org.eclipse.emf.cdo.internal.ui.views.CDOViewHistory.Entry;
 import org.eclipse.emf.cdo.util.CDOPackageType;
 import org.eclipse.emf.cdo.util.CDOPackageTypeRegistry;
 
@@ -93,7 +91,7 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
                 CDOViewHistory history = viewHistories.get(view);
                 if (history != null)
                 {
-                  Entry[] entries = history.getEntries();
+                  CDOViewHistoryEntry[] entries = history.getEntries();
                   if (entries != null && entries.length != 0)
                   {
                     fireLabelProviderChanged(entries);
@@ -123,7 +121,7 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
         CDOView view = e.getViewHistory().getView();
         refreshElement(view, false);
 
-        Entry addedEntry = e.getAddedEntry();
+        CDOViewHistoryEntry addedEntry = e.getAddedEntry();
         if (addedEntry != null)
         {
           revealElement(addedEntry);
@@ -182,9 +180,9 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
   @Override
   public Object getParent(Object element)
   {
-    if (element instanceof CDOViewHistory.Entry)
+    if (element instanceof CDOViewHistoryEntry)
     {
-      return ((CDOViewHistory.Entry)element).getView();
+      return ((CDOViewHistoryEntry)element).getView();
     }
 
     return super.getParent(element);
@@ -203,9 +201,9 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
       return getViewLabel((CDOView)obj);
     }
 
-    if (obj instanceof CDOViewHistory.Entry)
+    if (obj instanceof CDOViewHistoryEntry)
     {
-      return getHistroyEntryLabel((CDOViewHistory.Entry)obj);
+      return getHistroyEntryLabel((CDOViewHistoryEntry)obj);
     }
 
     return super.getText(obj);
@@ -260,7 +258,10 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
     return MessageFormat.format("View [{0}]", view.getViewID());
   }
 
-  public static String getHistroyEntryLabel(CDOViewHistory.Entry entry)
+  /**
+   * @since 2.0
+   */
+  public static String getHistroyEntryLabel(CDOViewHistoryEntry entry)
   {
     return (entry.getView().isDirty() ? "*" : "") + entry.getResourcePath();
   }
@@ -280,9 +281,9 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
       {
         fillView(manager, (CDOView)object);
       }
-      else if (object instanceof CDOViewHistory.Entry)
+      else if (object instanceof CDOViewHistoryEntry)
       {
-        fillHistoryEntry(manager, (CDOViewHistory.Entry)object);
+        fillHistoryEntry(manager, (CDOViewHistoryEntry)object);
       }
     }
   }
@@ -359,7 +360,10 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
     manager.add(new CloseViewAction(page, view));
   }
 
-  protected void fillHistoryEntry(IMenuManager manager, Entry entry)
+  /**
+   * @since 2.0
+   */
+  protected void fillHistoryEntry(IMenuManager manager, CDOViewHistoryEntry entry)
   {
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOViewHistory.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOViewHistory.java
index b6cdc0b7ec..4e8f08307e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOViewHistory.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOViewHistory.java
@@ -8,12 +8,11 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.views;
+package org.eclipse.emf.cdo.ui;
 
 import org.eclipse.emf.cdo.CDOView;
 import org.eclipse.emf.cdo.CDOViewResourcesEvent;
 import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.ui.CDOViewHistoryEvent;
 
 import org.eclipse.net4j.util.event.Event;
 import org.eclipse.net4j.util.event.IEvent;
@@ -28,12 +27,13 @@ import java.util.Set;
 
 /**
  * @author Eike Stepper
+ * @since 2.0
  */
 public final class CDOViewHistory extends Notifier
 {
   private CDOView view;
 
-  private Set<Entry> entries = new HashSet<Entry>();
+  private Set<CDOViewHistoryEntry> entries = new HashSet<CDOViewHistoryEntry>();
 
   private IListener viewListener = new IListener()
   {
@@ -67,11 +67,11 @@ public final class CDOViewHistory extends Notifier
     return view;
   }
 
-  public Entry[] getEntries()
+  public CDOViewHistoryEntry[] getEntries()
   {
     synchronized (entries)
     {
-      return entries.toArray(new Entry[entries.size()]);
+      return entries.toArray(new CDOViewHistoryEntry[entries.size()]);
     }
   }
 
@@ -85,13 +85,13 @@ public final class CDOViewHistory extends Notifier
 
   public void reset()
   {
-    Set<Entry> openResources = new HashSet<Entry>();
+    Set<CDOViewHistoryEntry> openResources = new HashSet<CDOViewHistoryEntry>();
     for (Resource resource : view.getResourceSet().getResources())
     {
       if (resource instanceof CDOResource)
       {
         CDOResource cdoResource = (CDOResource)resource;
-        openResources.add(new Entry(cdoResource.getPath()));
+        openResources.add(new CDOViewHistoryEntry(view, cdoResource.getPath()));
       }
     }
 
@@ -109,7 +109,7 @@ public final class CDOViewHistory extends Notifier
 
   protected void addResource(String resourcePath)
   {
-    Entry entry = new Entry(resourcePath);
+    CDOViewHistoryEntry entry = new CDOViewHistoryEntry(view, resourcePath);
     boolean changed;
     synchronized (entries)
     {
@@ -129,9 +129,9 @@ public final class CDOViewHistory extends Notifier
   {
     private static final long serialVersionUID = 1L;
 
-    Entry addedEntry;
+    CDOViewHistoryEntry addedEntry;
 
-    public ViewHistoryEvent(Entry addedEntry)
+    public ViewHistoryEvent(CDOViewHistoryEntry addedEntry)
     {
       super(CDOViewHistory.this);
       this.addedEntry = addedEntry;
@@ -142,7 +142,7 @@ public final class CDOViewHistory extends Notifier
       return CDOViewHistory.this;
     }
 
-    public Entry getAddedEntry()
+    public CDOViewHistoryEntry getAddedEntry()
     {
       return addedEntry;
     }
@@ -153,66 +153,4 @@ public final class CDOViewHistory extends Notifier
       return MessageFormat.format("CDOViewHistoryEvent[source={0}, addedEntry={1}]", getSource(), getAddedEntry());
     }
   }
-
-  /**
-   * @author Eike Stepper
-   */
-  public final class Entry implements Comparable<Entry>
-  {
-    private String resourcePath;
-
-    public Entry(String resourcePath)
-    {
-      if (resourcePath == null)
-      {
-        throw new IllegalArgumentException("resourcePath == null");
-      }
-
-      this.resourcePath = resourcePath;
-    }
-
-    public CDOView getView()
-    {
-      return view;
-    }
-
-    public String getResourcePath()
-    {
-      return resourcePath;
-    }
-
-    public int compareTo(Entry entry)
-    {
-      return resourcePath.compareTo(entry.resourcePath);
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-      if (obj == this)
-      {
-        return true;
-      }
-
-      if (obj instanceof Entry)
-      {
-        Entry that = (Entry)obj;
-        return view == that.getView() && resourcePath.equals(that.resourcePath);
-      }
-
-      return false;
-    }
-
-    @Override
-    public int hashCode()
-    {
-      return resourcePath.hashCode();
-    }
-
-    @Override
-    public String toString()
-    {
-      return resourcePath;
-    }
-  }
 }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOViewHistoryEntry.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOViewHistoryEntry.java
new file mode 100644
index 0000000000..2490c1a0c7
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOViewHistoryEntry.java
@@ -0,0 +1,74 @@
+package org.eclipse.emf.cdo.ui;
+
+import org.eclipse.emf.cdo.CDOView;
+
+/**
+ * @author Eike Stepper
+ * @since 2.0
+ */
+public final class CDOViewHistoryEntry implements Comparable<CDOViewHistoryEntry>
+{
+  private CDOView view;
+
+  private String resourcePath;
+
+  public CDOViewHistoryEntry(CDOView view, String resourcePath)
+  {
+    if (view == null)
+    {
+      throw new IllegalArgumentException("view == null");
+    }
+
+    if (resourcePath == null)
+    {
+      throw new IllegalArgumentException("resourcePath == null");
+    }
+
+    this.view = view;
+    this.resourcePath = resourcePath;
+  }
+
+  public CDOView getView()
+  {
+    return view;
+  }
+
+  public String getResourcePath()
+  {
+    return resourcePath;
+  }
+
+  public int compareTo(CDOViewHistoryEntry entry)
+  {
+    return resourcePath.compareTo(entry.resourcePath);
+  }
+
+  @Override
+  public boolean equals(Object obj)
+  {
+    if (obj == this)
+    {
+      return true;
+    }
+
+    if (obj instanceof CDOViewHistoryEntry)
+    {
+      CDOViewHistoryEntry that = (CDOViewHistoryEntry)obj;
+      return view == that.getView() && resourcePath.equals(that.resourcePath);
+    }
+
+    return false;
+  }
+
+  @Override
+  public int hashCode()
+  {
+    return resourcePath.hashCode();
+  }
+
+  @Override
+  public String toString()
+  {
+    return resourcePath;
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOViewHistoryEvent.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOViewHistoryEvent.java
index b5a11ef383..2175705c65 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOViewHistoryEvent.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOViewHistoryEvent.java
@@ -10,17 +10,21 @@
  **************************************************************************/
 package org.eclipse.emf.cdo.ui;
 
-import org.eclipse.emf.cdo.internal.ui.views.CDOViewHistory;
-import org.eclipse.emf.cdo.internal.ui.views.CDOViewHistory.Entry;
-
 import org.eclipse.net4j.util.event.IEvent;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOViewHistoryEvent extends IEvent
 {
+  /**
+   * @since 2.0
+   */
   public CDOViewHistory getViewHistory();
 
-  public Entry getAddedEntry();
+  /**
+   * @since 2.0
+   */
+  public CDOViewHistoryEntry getAddedEntry();
 }
diff --git a/plugins/org.eclipse.emf.cdo/.project b/plugins/org.eclipse.emf.cdo/.project
index b582e8aa34..ae3e630a31 100644
--- a/plugins/org.eclipse.emf.cdo/.project
+++ b/plugins/org.eclipse.emf.cdo/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo/.settings/.api_filters b/plugins/org.eclipse.emf.cdo/.settings/.api_filters
new file mode 100644
index 0000000000..58bab210dd
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/.settings/.api_filters
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.emf.cdo" version="2">
+    <resource path="src/org/eclipse/emf/cdo/CDOView.java" type="org.eclipse.emf.cdo.CDOView">
+        <filter id="574619656">
+            <message_arguments>
+                <message_argument value="CDOProtocolView"/>
+                <message_argument value="CDOView"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/internal/cdo/CDOStateMachine.java" type="org.eclipse.emf.internal.cdo.CDOStateMachine">
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="CommitTransactionResult"/>
+                <message_argument value="CDOStateMachine"/>
+                <message_argument value="commit(InternalCDOObject, CommitTransactionResult)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/internal/cdo/CDOViewImpl.java" type="org.eclipse.emf.internal.cdo.CDOViewImpl">
+        <filter id="574619656">
+            <message_arguments>
+                <message_argument value="CDOIDProvider"/>
+                <message_argument value="CDOViewImpl"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/internal/cdo/CDOSessionPackageManagerImpl.java" type="org.eclipse.emf.internal.cdo.CDOSessionPackageManagerImpl">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="CDOPackageManagerImpl"/>
+                <message_argument value="CDOSessionPackageManagerImpl"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/CDOSession.java" type="org.eclipse.emf.cdo.CDOSession">
+        <filter id="574619656">
+            <message_arguments>
+                <message_argument value="CDOProtocolSession"/>
+                <message_argument value="CDOSession"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/CDOSessionPackageManager.java" type="org.eclipse.emf.cdo.CDOSessionPackageManager">
+        <filter id="574619656">
+            <message_arguments>
+                <message_argument value="CDOPackageManager"/>
+                <message_argument value="CDOSessionPackageManager"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/cdo/CDORevisionManager.java" type="org.eclipse.emf.cdo.CDORevisionManager">
+        <filter id="574619656">
+            <message_arguments>
+                <message_argument value="CDORevisionResolver"/>
+                <message_argument value="CDORevisionManager"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java" type="org.eclipse.emf.internal.cdo.CDORevisionManagerImpl">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="CDORevisionResolverImpl"/>
+                <message_argument value="CDORevisionManagerImpl"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java" type="org.eclipse.emf.internal.cdo.CDOObjectMerger">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="CDORevisionMerger"/>
+                <message_argument value="CDOObjectMerger"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
index 014271c9d5..dedf9e1f27 100644
--- a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,16 +11,16 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.common;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo;version="1.0.0",
- org.eclipse.emf.cdo.analyzer;version="1.0.0",
- org.eclipse.emf.cdo.eresource;version="1.0.0",
- org.eclipse.emf.cdo.eresource.impl;version="1.0.0",
- org.eclipse.emf.cdo.eresource.util;version="1.0.0",
- org.eclipse.emf.cdo.util;version="1.0.0",
- org.eclipse.emf.internal.cdo;version="1.0.0",
- org.eclipse.emf.internal.cdo.analyzer;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests",
- org.eclipse.emf.internal.cdo.bundle;version="1.0.0";x-friends:="org.eclipse.emf.cdo.ui",
- org.eclipse.emf.internal.cdo.protocol;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests",
- org.eclipse.emf.internal.cdo.util;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.ui"
+ org.eclipse.emf.cdo.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.emf.cdo;version="2.0.0",
+ org.eclipse.emf.cdo.analyzer;version="2.0.0",
+ org.eclipse.emf.cdo.eresource;version="2.0.0",
+ org.eclipse.emf.cdo.eresource.impl;version="2.0.0",
+ org.eclipse.emf.cdo.eresource.util;version="2.0.0",
+ org.eclipse.emf.cdo.util;version="2.0.0",
+ org.eclipse.emf.internal.cdo;version="2.0.0",
+ org.eclipse.emf.internal.cdo.analyzer;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.internal.cdo.bundle;version="2.0.0";x-friends:="org.eclipse.emf.cdo.ui",
+ org.eclipse.emf.internal.cdo.protocol;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.internal.cdo.util;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.ui"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOAudit.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOAudit.java
index a4bd626428..72a190fad7 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOAudit.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOAudit.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOAudit extends CDOView
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOConstants.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOConstants.java
deleted file mode 100644
index 876e4fb15a..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOConstants.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Eike Stepper - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo;
-
-import org.eclipse.emf.cdo.common.CDOProtocolConstants;
-
-/**
- * @author Eike Stepper
- */
-public interface CDOConstants
-{
-  public static final String TYPE = CDOProtocolConstants.PROTOCOL_NAME + "client";
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOEvent.java
index 0586247e35..d13d60965d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOEvent.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.util.event.IEvent;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOEvent extends IEvent
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOInvalidationNotification.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOInvalidationNotification.java
index e4e8db9ed7..24f6a87a87 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOInvalidationNotification.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOInvalidationNotification.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.common.notify.Notification;
 
 /**
  * @author Simon McDuff
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOInvalidationNotification extends Notification
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDORevisionManager.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDORevisionManager.java
index c3b4d8a0b2..e15b389992 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDORevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDORevisionManager.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDORevisionManager extends CDORevisionResolver
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
index 7626c5ef1e..9c614ff430 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOSession extends CDOProtocolSession, IContainer<CDOView>
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionConfiguration.java
index 9355b4678c..88e2fe640e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionConfiguration.java
@@ -10,13 +10,14 @@
  **************************************************************************/
 package org.eclipse.emf.cdo;
 
-import org.eclipse.emf.internal.cdo.util.CDOPackageRegistryImpl;
+import org.eclipse.emf.cdo.util.CDOPackageRegistry;
 
 import org.eclipse.net4j.connector.IConnector;
 import org.eclipse.net4j.signal.failover.IFailOverStrategy;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOSessionConfiguration
 {
@@ -36,9 +37,15 @@ public interface CDOSessionConfiguration
 
   public void setFailOverStrategy(IFailOverStrategy failOverStrategy);
 
-  public CDOPackageRegistryImpl getPackageRegistry();
+  /**
+   * @since 2.0
+   */
+  public CDOPackageRegistry getPackageRegistry();
 
-  public void setPackageRegistry(CDOPackageRegistryImpl packageRegistry);
+  /**
+   * @since 2.0
+   */
+  public void setPackageRegistry(CDOPackageRegistry packageRegistry);
 
   public void setSelfPopulatingPackageRegistry();
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionEvent.java
index ee555aeab2..3778c27acc 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionEvent.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOSessionEvent extends CDOEvent
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionInvalidationEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionInvalidationEvent.java
index 62198d56d3..08a5c19546 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionInvalidationEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionInvalidationEvent.java
@@ -16,6 +16,7 @@ import java.util.Set;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOSessionInvalidationEvent extends CDOSessionEvent
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionPackageManager.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionPackageManager.java
index 8e8c92c847..374f2cf2de 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionPackageManager.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionPackageManager.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOSessionPackageManager extends CDOPackageManager
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransaction.java
index 0ef2ccf69a..797d5f9d5f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransaction.java
@@ -28,6 +28,7 @@ import java.util.Map;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOTransaction extends CDOView
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionConflictEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionConflictEvent.java
index 953c69e3c7..54816c44da 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionConflictEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionConflictEvent.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOTransactionConflictEvent extends CDOViewEvent
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionFinishedEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionFinishedEvent.java
index 6240ff80b0..464a89fe08 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionFinishedEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionFinishedEvent.java
@@ -17,6 +17,7 @@ import java.util.Map;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOTransactionFinishedEvent extends CDOViewEvent
 {
@@ -24,6 +25,9 @@ public interface CDOTransactionFinishedEvent extends CDOViewEvent
 
   public Map<CDOIDTemp, CDOID> getIDMappings();
 
+  /**
+   * @author Eike Stepper
+   */
   public enum Type
   {
     COMMITTED, ROLLED_BACK
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionHandler.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionHandler.java
index 8be220ae6e..ff63662697 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionHandler.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionHandler.java
@@ -14,8 +14,6 @@ package org.eclipse.emf.cdo;
 import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta;
 
 /**
- * TODO Enhance API: Return exceptions instead of letting them be thrown
- * 
  * @author Eike Stepper
  */
 public interface CDOTransactionHandler
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionStartedEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionStartedEvent.java
index 18ad948235..92ed5cfc1d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionStartedEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionStartedEvent.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOTransactionStartedEvent extends CDOViewEvent
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
index ef88eaa6ed..93d5774d9e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOView extends CDOProtocolView, INotifier
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewEvent.java
index e92d1280ab..312ee61d43 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewEvent.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOViewEvent extends CDOEvent
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewResourcesEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewResourcesEvent.java
index b0d40ecbac..b95b0b97d7 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewResourcesEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewResourcesEvent.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOViewResourcesEvent extends CDOViewEvent
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageTypeRegistry.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageTypeRegistry.java
index e2644fc2cb..4db7071c28 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageTypeRegistry.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageTypeRegistry.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.EPackage;
  * Can only be used with Eclipse running!
  * 
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOPackageTypeRegistry extends IRegistry<String, CDOPackageType>
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java
index 294d9d903f..75a89a7690 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java
@@ -23,7 +23,6 @@ import org.eclipse.emf.internal.cdo.LegacySupportEnabler;
 import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocolFactory;
 import org.eclipse.emf.internal.cdo.util.CDOPackageRegistryImpl;
 import org.eclipse.emf.internal.cdo.util.FSMUtil;
-import org.eclipse.emf.internal.cdo.util.CDOPackageRegistryImpl.SelfPopulating;
 
 import org.eclipse.net4j.util.container.IManagedContainer;
 
@@ -59,12 +58,18 @@ public final class CDOUtil
     return new CDOSessionConfigurationImpl();
   }
 
-  public static SelfPopulating createSelfPopulatingPackageRegistry()
+  /**
+   * @since 2.0
+   */
+  public static CDOPackageRegistry createSelfPopulatingPackageRegistry()
   {
     return new CDOPackageRegistryImpl.SelfPopulating();
   }
 
-  public static CDOPackageRegistryImpl createDemandPopulatingPackageRegistry()
+  /**
+   * @since 2.0
+   */
+  public static CDOPackageRegistry createDemandPopulatingPackageRegistry()
   {
     return new CDOPackageRegistryImpl.DemandPopulating();
   }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
index 094596335b..901a5812d4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.EStoreEObjectImpl;
@@ -593,10 +594,13 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
     return resource;
   }
 
+  /**
+   * Specializing the behaviour of {@link #equals(Object)} is not permitted as per {@link EObject} specification.
+   */
   @Override
-  public boolean equals(Object obj)
+  public final boolean equals(Object obj)
   {
-    return obj == this;
+    return super.equals(obj);
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionConfigurationImpl.java
index e662974c17..15ceb2b467 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionConfigurationImpl.java
@@ -12,10 +12,9 @@ package org.eclipse.emf.internal.cdo;
 
 import org.eclipse.emf.cdo.CDOSession;
 import org.eclipse.emf.cdo.CDOSessionConfiguration;
+import org.eclipse.emf.cdo.util.CDOPackageRegistry;
 import org.eclipse.emf.cdo.util.CDOUtil;
 
-import org.eclipse.emf.internal.cdo.util.CDOPackageRegistryImpl;
-
 import org.eclipse.net4j.connector.IConnector;
 import org.eclipse.net4j.signal.failover.IFailOverStrategy;
 
@@ -34,7 +33,7 @@ public class CDOSessionConfigurationImpl implements CDOSessionConfiguration
 
   private IFailOverStrategy failOverStrategy;
 
-  private CDOPackageRegistryImpl packageRegistry;
+  private CDOPackageRegistry packageRegistry;
 
   private boolean activateOnOpen = true;
 
@@ -86,12 +85,18 @@ public class CDOSessionConfigurationImpl implements CDOSessionConfiguration
     this.failOverStrategy = failOverStrategy;
   }
 
-  public CDOPackageRegistryImpl getPackageRegistry()
+  /**
+   * @since 2.0
+   */
+  public CDOPackageRegistry getPackageRegistry()
   {
     return packageRegistry;
   }
 
-  public void setPackageRegistry(CDOPackageRegistryImpl packageRegistry)
+  /**
+   * @since 2.0
+   */
+  public void setPackageRegistry(CDOPackageRegistry packageRegistry)
   {
     checkNotOpen();
     this.packageRegistry = packageRegistry;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
index 6b8c826be0..34e16184de 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
@@ -33,7 +33,6 @@ import org.eclipse.emf.cdo.util.CDOUtil;
 import org.eclipse.emf.cdo.util.LegacySystemNotAvailableException;
 
 import org.eclipse.emf.internal.cdo.bundle.OM;
-import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol;
 import org.eclipse.emf.internal.cdo.protocol.LoadLibrariesRequest;
 import org.eclipse.emf.internal.cdo.protocol.OpenSessionRequest;
 import org.eclipse.emf.internal.cdo.protocol.OpenSessionResult;
@@ -231,11 +230,6 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD
     return channel;
   }
 
-  public CDOClientProtocol getProtocol()
-  {
-    return (CDOClientProtocol)channel.getReceiveHandler();
-  }
-
   public String getRepositoryName()
   {
     return repositoryName;
@@ -261,7 +255,10 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD
     deactivate();
   }
 
-  public void setPackageRegistry(CDOPackageRegistryImpl packageRegistry)
+  /**
+   * @since 2.0
+   */
+  public void setPackageRegistry(CDOPackageRegistry packageRegistry)
   {
     this.packageRegistry = packageRegistry;
   }
@@ -574,7 +571,10 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD
     return MessageFormat.format("CDOSession[{0}/{1}]", connector, repositoryName);
   }
 
-  protected CDOPackageRegistryImpl createPackageRegistry()
+  /**
+   * @since 2.0
+   */
+  protected CDOPackageRegistry createPackageRegistry()
   {
     return new CDOPackageRegistryImpl();
   }
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/.project b/plugins/org.eclipse.net4j.buddies.chat.ui/.project
index 6ce07fc42e..17894d52e4 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/.project
+++ b/plugins/org.eclipse.net4j.buddies.chat.ui/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
index debe89fb21..59925f9636 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.chat.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.net4j.buddies.chat.internal.ui.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.buddies.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.net4j.buddies.chat;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.buddies.chat.internal.ui;version="1.0.0"
+ org.eclipse.net4j.buddies.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.buddies.chat;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.net4j.buddies.chat.internal.ui;version="2.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.chat/.project b/plugins/org.eclipse.net4j.buddies.chat/.project
index 5fbaef36b3..620f7db346 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/.project
+++ b/plugins/org.eclipse.net4j.buddies.chat/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
index bef732ebde..7b87ecb1e0 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.chat;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.net4j.buddies.internal.chat.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.buddies.common;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.buddies.chat;version="1.0.0",
- org.eclipse.net4j.buddies.internal.chat;version="1.0.0"
+ org.eclipse.net4j.buddies.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.net4j.buddies.chat;version="2.0.0",
+ org.eclipse.net4j.buddies.internal.chat;version="2.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.common/.project b/plugins/org.eclipse.net4j.buddies.common/.project
index 0e5d12fb87..227c9377b6 100644
--- a/plugins/org.eclipse.net4j.buddies.common/.project
+++ b/plugins/org.eclipse.net4j.buddies.common/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.buddies.common/.settings/.api_filters b/plugins/org.eclipse.net4j.buddies.common/.settings/.api_filters
new file mode 100644
index 0000000000..82f488a67a
--- /dev/null
+++ b/plugins/org.eclipse.net4j.buddies.common/.settings/.api_filters
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.net4j.buddies.common" version="2">
+    <resource path="src/org/eclipse/net4j/buddies/spi/common/Facility.java" type="org.eclipse.net4j.buddies.spi.common.Facility">
+        <filter id="643842064">
+            <message_arguments>
+                <message_argument value="Collaboration"/>
+                <message_argument value="Facility"/>
+                <message_argument value="getCollaboration()"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
index f0a664c316..24a2fe18ef 100644
--- a/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.common
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.net4j.buddies.internal.common.bundle.OM$Activator
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+ org.eclipse.net4j;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Import-Package: org.osgi.framework;version="1.3.0";resolution:=optional
-Export-Package: org.eclipse.net4j.buddies.common;version="1.0.0",
- org.eclipse.net4j.buddies.internal.common;version="1.0.0";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server,org.eclipse.net4j.buddies.ui",
- org.eclipse.net4j.buddies.internal.common.bundle;version="1.0.0";x-internal:=true,
- org.eclipse.net4j.buddies.internal.common.protocol;version="1.0.0";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server",
- org.eclipse.net4j.buddies.spi.common;version="1.0.0"
+Export-Package: org.eclipse.net4j.buddies.common;version="2.0.0",
+ org.eclipse.net4j.buddies.internal.common;version="2.0.0";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server,org.eclipse.net4j.buddies.ui",
+ org.eclipse.net4j.buddies.internal.common.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.common.protocol;version="2.0.0";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server",
+ org.eclipse.net4j.buddies.spi.common;version="2.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.server/.project b/plugins/org.eclipse.net4j.buddies.server/.project
index ea1ae5a97c..5ac0231558 100644
--- a/plugins/org.eclipse.net4j.buddies.server/.project
+++ b/plugins/org.eclipse.net4j.buddies.server/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.buddies.server/.settings/.api_filters b/plugins/org.eclipse.net4j.buddies.server/.settings/.api_filters
new file mode 100644
index 0000000000..58e1155fbc
--- /dev/null
+++ b/plugins/org.eclipse.net4j.buddies.server/.settings/.api_filters
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.net4j.buddies.server" version="2">
+    <resource path="src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java" type="org.eclipse.net4j.buddies.internal.server.protocol.ServerBuddyStateIndication">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="BuddyStateIndication"/>
+                <message_argument value="ServerBuddyStateIndication"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java" type="org.eclipse.net4j.buddies.internal.server.ServerBuddy">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="Buddy"/>
+                <message_argument value="ServerBuddy"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java" type="org.eclipse.net4j.buddies.internal.server.BuddyAdmin">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="CollaborationContainer"/>
+                <message_argument value="BuddyAdmin"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java" type="org.eclipse.net4j.buddies.internal.server.protocol.ServerCollaborationLeftIndication">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="CollaborationLeftIndication"/>
+                <message_argument value="ServerCollaborationLeftIndication"/>
+            </message_arguments>
+        </filter>
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="Collaboration"/>
+                <message_argument value="ServerCollaborationLeftIndication"/>
+                <message_argument value="collaborationLeft(Buddy, Collaboration)"/>
+            </message_arguments>
+        </filter>
+        <filter id="643846161">
+            <message_arguments>
+                <message_argument value="Buddy"/>
+                <message_argument value="ServerCollaborationLeftIndication"/>
+                <message_argument value="collaborationLeft(Buddy, Collaboration)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
index f24d81cf13..6a5448e048 100644
--- a/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.server;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.net4j.buddies.internal.server.bundle.OM$Activator
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
- org.eclipse.net4j.buddies.common;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.buddies.internal.server;version="1.0.0",
- org.eclipse.net4j.buddies.internal.server.protocol;version="1.0.0",
- org.eclipse.net4j.buddies.server;version="1.0.0"
+ org.eclipse.net4j.buddies.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.net4j.buddies.internal.server;version="2.0.0",
+ org.eclipse.net4j.buddies.internal.server.protocol;version="2.0.0",
+ org.eclipse.net4j.buddies.server;version="2.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.ui/.project b/plugins/org.eclipse.net4j.buddies.ui/.project
index 9813e0056e..6944e0a266 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/.project
+++ b/plugins/org.eclipse.net4j.buddies.ui/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
index 41ce4f5554..ebe753a753 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.net4j.buddies.internal.ui.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -11,14 +11,14 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
  org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
- org.eclipse.net4j;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.net4j;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.net4j.util.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.net4j.buddies;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.net4j.buddies.chat;bundle-version="[1.0.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.net4j.buddies.internal.ui;version="1.0.0",
- org.eclipse.net4j.buddies.internal.ui.actions;version="1.0.0",
- org.eclipse.net4j.buddies.internal.ui.dnd;version="1.0.0",
- org.eclipse.net4j.buddies.internal.ui.preferences;version="1.0.0",
- org.eclipse.net4j.buddies.internal.ui.views;version="1.0.0",
- org.eclipse.net4j.buddies.ui;version="1.0.0"
+ org.eclipse.net4j.buddies;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.buddies.chat;bundle-version="[2.0.0,3.0.0)";resolution:=optional
+Export-Package: org.eclipse.net4j.buddies.internal.ui;version="2.0.0",
+ org.eclipse.net4j.buddies.internal.ui.actions;version="2.0.0",
+ org.eclipse.net4j.buddies.internal.ui.dnd;version="2.0.0",
+ org.eclipse.net4j.buddies.internal.ui.preferences;version="2.0.0",
+ org.eclipse.net4j.buddies.internal.ui.views;version="2.0.0",
+ org.eclipse.net4j.buddies.ui;version="2.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies/.project b/plugins/org.eclipse.net4j.buddies/.project
index 118149f778..7d498e2c42 100644
--- a/plugins/org.eclipse.net4j.buddies/.project
+++ b/plugins/org.eclipse.net4j.buddies/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.buddies/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies/META-INF/MANIFEST.MF
index 97da18cf13..fc8df89fe1 100644
--- a/plugins/org.eclipse.net4j.buddies/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.net4j.internal.buddies.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.buddies.common;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.buddies;version="1.0.0",
- org.eclipse.net4j.internal.buddies;version="1.0.0";x-friends:="org.eclipse.net4j.buddies.ui",
- org.eclipse.net4j.internal.buddies.bundle;version="1.0.0";x-friends:="org.eclipse.net4j.buddies.ui",
- org.eclipse.net4j.internal.buddies.protocol;version="1.0.0";x-friends:="org.eclipse.net4j.buddies.ui"
+ org.eclipse.net4j.buddies.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.net4j.buddies;version="2.0.0",
+ org.eclipse.net4j.internal.buddies;version="2.0.0";x-friends:="org.eclipse.net4j.buddies.ui",
+ org.eclipse.net4j.internal.buddies.bundle;version="2.0.0";x-friends:="org.eclipse.net4j.buddies.ui",
+ org.eclipse.net4j.internal.buddies.protocol;version="2.0.0";x-friends:="org.eclipse.net4j.buddies.ui"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.db.derby/.project b/plugins/org.eclipse.net4j.db.derby/.project
index 13d4feeb1a..ad400b0a5e 100644
--- a/plugins/org.eclipse.net4j.db.derby/.project
+++ b/plugins/org.eclipse.net4j.db.derby/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
index 2fa078f94d..ca8021c187 100644
--- a/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.db.derby;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.db;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.db.internal.derby;version="1.0.0";x-friends:="org.eclipse.net4j.db.tests",
- org.eclipse.net4j.db.internal.derby.bundle;version="1.0.0";x-internal:=true
-Eclipse-RegisterBuddy: org.eclipse.net4j.db
+ org.eclipse.net4j.db;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Import-Package: org.apache.derby.jdbc
+Export-Package: org.eclipse.net4j.db.internal.derby;version="2.0.0";x-friends:="org.eclipse.net4j.db.tests",
+ org.eclipse.net4j.db.internal.derby.bundle;version="2.0.0";x-internal:=true
+Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/.project b/plugins/org.eclipse.net4j.db.hsqldb/.project
index 1d91938957..dc0f6f82a6 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/.project
+++ b/plugins/org.eclipse.net4j.db.hsqldb/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
index 52e1e54522..6709b60dc6 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.db.hsqldb;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-ClassPath: .,
  lib/hsqldb.jar
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.db;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.db.hsqldb;version="1.0.0",
- org.eclipse.net4j.db.internal.hsqldb;version="1.0.0";x-internal:=true,
- org.eclipse.net4j.db.internal.hsqldb.bundle;version="1.0.0";x-internal:=true,
+ org.eclipse.net4j.db;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.net4j.db.hsqldb;version="2.0.0",
+ org.eclipse.net4j.db.internal.hsqldb;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.db.internal.hsqldb.bundle;version="2.0.0";x-internal:=true,
  org.hsqldb;version="1.8.0",
  org.hsqldb.index;version="1.8.0",
  org.hsqldb.jdbc;version="1.8.0",
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_7_2.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_7_2.txt
deleted file mode 100644
index 453d63ab32..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_7_2.txt
+++ /dev/null
@@ -1,813 +0,0 @@
-Chronological Change List
-
-This file is the accumulated list of changes in the course of development of
-hsqldb 1.7.2 in reverse chronological order. A list of changes by subject 
-area is in changelog_1_7_2.txt.
-
-Fred Toussi (fredt@users.sourceforge.net)
-
-2004.12.24 UPDATED RELEASE 1.7.2.11
-
-Fixed NPE error when functions in subqueries.
-Added support for STDDEV_POP, STDDEV_SAMP, VAR_POP, VAR_SAMP, EVERY and SOME set functions.
-Fixed potential issues with logging DELETE statements for tables with multi-key primary keys.
-
-2004.12.05 UPDATED RELEASE 1.7.2.10
-
-Fixed minor type conversion bugs.
-Fixed JDK 1.1 compile issue
-Fixed minor bug relating to server thread startup
-
-2004.11.25 UPDATED RELEASE 1.7.2.8
-
-Fixed bug LIMIT and TOP with UNION
-Fixed bug running Database Manager as applet
-Enhancement to allow a table with a label used in DELETE and UPDATE
-Enhancement to reduce memory use when restoring long log with too many connections
-Enhancement to persist values set by SET LOGSIZE
-Minor internal enhancements and refactoring
-
-2004.10.28 UPDATED RELEASE 1.7.2.7
-
-Fixed new bug with TEXT TABLES without primary key
-
-2004.10.25 UPDATED RELEASE 1.7.2.6
-
-Fixed new bug with DATETIME literal default values
-
-2004.10.22 UPDATED RELEASE 1.7.2.5
-
-Fixed bugs OUTER support.
-Fixed bug that resulted in slowdown when JDBC metadata calls are called many times.
-Fixed bug related to Statement.setMaxRows(int). The maximum row count will no
-longer apply to result sets returned and used internally.
-Fixed bug to allow ResultSetMetaData methods to be used inside stored procedures.
-Fixed bugs related to some OUTER queries.
-Performance improvements to some operations on CACHED tables.
-Improved compatibility with older database files, allowing old style DEFAULT
-clauses to compile.
-Improvements to startup after a machine crash. The .log file is now read only
-until the first malformed line.
-Corrections to build scripts and #idfef blocks to allow jars to be compiled to
-run under JDK 1.1.
- 
-
-2004.08.26 UPDATED RELEASE 1.7.2.4
-
-Fixed bug in data file enlargement.
-Fixed bug where temp tables were removed after another connection closed.
-
-2004.08.12 UPDATED RELEASE 1.7.2.3
-
-Fixed bug preventing the use of hsqldb.files_read_only property
-Minor enhancements allowing use of SELECT ALL and COUNT(ALL colname) etc.
-Corrections to the documentation
-
-2004.07.25 UPDATED RELEASE 1.7.2.2
-
-Fixed bug that prevented ALTER TABLE ADD FOREIGH KEY, ADD UNIQUE and ADD CHECK
-(unnamed constraints) from executing.
-
-Fixed excessive logging of SEQUENCE values.
-
-
-2004.07.20 UPDATED RELEASE 1.7.2.1
-
-Fixed bug where a foreign key with ON DELETE CASCADE action on a table masked
-other foreign keys on the table and resulted in completion of the 
-cascading action when referential integrity was violated.
-
-2004.07.15 RC_6e INITIAL RELEASE 1.7.2
-
-Enhancements to ALTER TABLE ADD COLUMN and DROP COLUMN.
-Fixed bug with closed HTTP connections.
-Fixed bug with large .data files switching to random access from nio. 
-
-2004.06.28 RC_6d
-
-The implemntation of UNION, EXCEPT and INTERSECT set operations has been 
-rewritten to comply with SQL standards.
-When multiple set operations are present in a query, they are now evaluated
-from left to right, with INTERSECT taking precedence over the rest.
-It is now possible to use parentheses around multiple (or single) select
-statements with set operations to change the order of evalation.E.g.:
-
-((SELECT * FROM A EXCEPT SELECT * FROM B) INTERSECT SELECT * FROM D UNION SELECT * FROM E)
-
-Timestamp, date and time values in TEXT TABLE source files are treated more
-leniently, allowing spaces before values.   
-
-2004.06.19 RC_6c 
-
-Fixed bug in default value definition.
-Fixed bug in getURL() for internal connections
-Fixed bug in evaluation of BOOLEAN values
-Fixed bug in Statement.executeBatch()
-Improvements in CHECKPIONT DEFRAG
-Improvements in nio .data file handling
-Added a procedural language to SqlTool.  Made error handling and control more
-robust.  Implemented several new features.
-Updated documentation
-
-2004.05.31 RC_6b
-
-Fixed CHECKPOINT DEFRAG bug with empty tables
-Fixed ORDER BY with HAVING
-Fixed SELECT .. INTO table issue with outer joins etc.
-Fixed issue with NOT used in WHERE clause of OUTER select
-Fixed issue with DAYOFWEEK() etc. library calls with NULL parameter
-Fixes for TRIGGER thread termination
-Fixes for minor bugs
-Updated documentation
-
-2004.05.18 RC_6a
-
-Fix for two bugs, some doc updates, etc.
-
-2004.05.17 RC_6
-Final Release Candidate
-
-This is the final release candidate for 1.7.2.
-
-More tests are required to verify the improvements. Please perform tests and 
-report any issues. Testers are needed for build scripts with different JVM's 
-using both ANT and batch builds.
-
-Documentation has been updated and is available in HTML and PDF formats.
-
-More bug fixes to engine and JDBC classes.
-
-Bug fixes and minor enhancements to Database Manager and Transfer tools.
-
-Database Manager Swing table view is sortable.
-
-Fixed bug with different values in one row with multiple CURRENT_TIMESTAMP or
-NOW() calls.
-
-Introduction of CURRENT_USER, can be used as column default value as well.
-
-CURRENT_TIMESTAMP, NOW, TODAY etc. should not be quoted when used as column
-default values.
-
-Improvements to PreparedStatement set stream methods.
-
-Improvements to Clob and Blob implementations.
-
-Much of the UNIX init script redesigned.  Now supports TLS and WebServer.
-
-2004.05.01
-
-Small improvements in different areas
-
-CURRENT_TIME, CURRENT_DATE, CURRENT_TIMESTAMP and their aliases can now
-be used in views and prepared statements.
-
-Some bug fixes and updates to utility programs. 
-
-Improvements to cascading update operations, allowing full capability with
-FK's referencing the same table.
-Improved parametric INSERT .... SELECT.
-CHECKPOINT DEFRAG now works with nio mode .data files.
-DATEDIFF function has been added.
-
-
-2004.04.01 RC_5
-
-Some bug fixes.
-
-2004.03.22 RC_4
-
-Included hsqldb.jar has been compiled with JDK 1.4 and will not work with JRE 1.3.x or
-earlier. Please recompile with JDK 1.3 for use with this or earlier JDK's.
-
-Improvements to ALTER TABLE when VIEWS reference the table
-Enhancements to Server
-
-Bug fixes for: 
-BIGINT values in IN predicate value lists.
-Creation of self ref foreign keys.
-Corrupted log file with SET AUTOCOMMIT
-SET LOGSIZE
- 
-
-Bug fixes for LIKE with default local and ALTER TABLE with CHECK
-
-2004.03.13 RC_3
-
-Various bug fixes.
-
-
-2004.02.22 RC_2
-
-Release Candidate 2 for HSQLDB version 1.7.2 includes almost all of the features of the release
-version. It is possible that by the time of the release, a small number of minor features will
-be added or changed.
-
-One area that is likely to change is the SQL_STATE values for errors returned by
-JDBC.
-
-Changes since RC_1
-
-Constraint names must be unique within each database.
-
-Refactoring groups of classes into new packages. This change is internal and does not affect the
-use of hsqldb.
-
-New SqlTool and SqlFile utilities by Blaine Simpson. See hsqlSqlTool.html for details.
-
-Support for new system tables for constraints, views and sequences.
-
-Support for increments in GENERATED BY DEFAULT AS IDENTITY(START WITH <n>, INCREMENT BY <m>>)
-
-Support for table aliases in UPDATE
-
-BOOLEAN is now the default SQL type for boolean values. BIT is treated as an alias
-for BOOLEAN in table definition and queries.
-
-Library function CURTIME() changed to return CURRENT_TIME instead of CURRENT_TIMESTAMP
-
-Added logging for sequence generation
-
-Bug Fixes since RC_1
-
-Values for BOOLEAN expressions containing AND, OR, LIKE and used in columns
-returned by queries are now correct.
-
-Fixed issue with single value selects in UPDATE and SELECT statements.
-
-Fixed issue with Turkish Locale.
-
-Fixed issue with compiled statements.
-
-Added mutable object cloning and serialization on PrepredStatement parameter entry points
-for in-process connections. Isolates the stored objects (DATETIME, BINARY and OTHER) from
-subsequent changes made to the copy used for setting the parameter. To do same for Result.
-
-More extensive error message when internal asserts fail.
-
-Various other bug fixes.
-
-
-2003.12.28 RC_1
-
-Release Candidate 1 for HSQLDB version 1.7.2 includes most of the features of the release
-version. It is likely that by the time of the release, a small number of features will
-be added to the engine.
-
-One area that is likely to change is the SQL_STATE values for errors returned by
-JDBC.
-
-Changes since ALPHA_T
-
-
-Added referential integrity checks when a foreign key is added
-to a populated table.
-
-support for SQL style SEQUENCE objects.
-
-support for DROP INDEX <IDX> IF EXISTS
-
-Changes to SET PROPERTY command with better error checking.
-
-Added support for LIMIT ? ? and TOP ? (prepared statement)
-
-Fixed reported bugs including order by with UNION.
-
-Added support for aggregate functions in CASEWHEN, IFNULL, etc.
-
-Added support for aggregate functions as arguments to non-aggregate functions.
-
-Views and subqueries can appear in a view definition.
-
-
-2003.10.26
-
-HSQLDB 1.7.2 ALPHA_T
-
-Improved index use for multiple key joins.
-
-2003.10.24
-
-Fixed some reported and unreported bugs.
-
-View definitions can now have a column name list:
-
-CREATE VIEW <viewname> [(<colnmae>, ...)] AS SELECT ....
-
-
-2003.10.21
-
-HSQLDB 1.7.2 ALPHA_S
-
-Fixed name resolution issues in some IN (SELECT ...) and EXISTS (SELECT ...)
-queries. Optimisation of these queries when not correlated.
-
-Speed optimisation of joins with views and subqueries.
-
-Fixed LIKE parameter bug.
-
-Support for CHECK constraints that apply to the modified/inserted row only.
-This can be added via ALTER TABLE ADD CHECK() or in table definition.
-
-Fixed the DATETIME normalisation issues.
-Fixed ResultSet.isAfterLast() issue.
-
-Reverted column name case in ResultSet methods to JDBC compliance.
-
-
-2003.10.12
-
-HSQLDB 1.7.2 ALPHA_R
-
-This release features full support for prepared statements with parameters, including
-those in IN lists.
-
-Query processing has been extensively enhanced in this release and better standards
-compliance has been achieved. Major implications of the recent changes are as follows:
-
-- Columns in correlated subqueries are resolved independently first. If there is an
-unresolved column, then the surrounding context is used to resolve it. This is 
-opposite the resolution order previously enforced in the engine.
-
-- Some ambiguities and errors in ORDER BY clauses are now caught.
-
-- UNION and other set queries accept only one ORDER BY clause at the end. In this
-clause, only column indexes are allowed as sort specification e.g.:
-
-SELECT .. UNION SELECT .. ORDER BY 1 DESC, 5, 3
-
-- Outer join conditions can now include most comparison operators, as well as OR
-logical operators , e.g
-
-LEFT OUTER JOIN atable ON a=b AND c>d OR a=2 ...
-
-Illegal forward table references are no longer allowed in join conditions.
-
-There are many other small improvements and fixes, including:
-
-- IN value lists can now contain column values or expressions. See TestSelfQueries.txt
-for an example.
-
-- LIKE has been optimised when possible.
-
-- COALESCE() can now take several arguments
-
-
-2003.09.24
-
-HSQLDB 1.7.2 ALPHA_Q
-
-The problem with PreparedStatement parameters in IN lists still remains to be fixed.
-
-This release includes some bug fixes and improvements. In the /doc directory
-there is a new how-to document on using HSQLDB in OpenOffice.org.
-
-
-HSQLDB 1.7.2 ALPHA_P
-
-Apart from the bugs and limitations of PreparedStatement, all the bugs reported since
-the release of ALPHA_O have been fixed in this alpha version. Some minor enhancements
-have been made to increase compatibility with OpenOffice.org applications.
-
-In addition, it is now possible to execute triggers in the main execution thread.
-This allows uses for triggers that were not possible before.
-
-
-HSQLDB 1.7.2 ALPHA_O
-
-Due to the large number of small bug fixes since the release of ALPHA_N,
-a new ALPHA_0 version is now released. 
-
-Please see the bug tracker for a list of some of the bugs that have been fixed.
-This version does not yet support prepared statements with IN(?,?) parameters.
-
-Please report any bugs or suggestions through the normal channels. Bugs with test
-cases should be posted to the bug tracker on the HSQLDB Sourceforge site.
-
-A new JDBC connection property "toupper_column_name" can be used when the application
-program submits lowercase / mixedcase column names to Result.getXXX(String column)
-methods when the names are in fact UPPERCASE as they were not quoted when the
-table was created. The default value is false. See related documentation in
-hsqldbAdvancedGuide.html on how to set this property value. (this property was 
-subsequently dropped)
-
-The rest of the information for ALPHA_N below applies to this version too.
-
-
-HSQLDB 1.7.2 ALPHA_N
-
-ALPHA_N is the ultimate ALPHA version for the 1.7.2 release cycle. Known
-deficiencies and reported bugs will be addressed for the first Release Candidate
-to be issued in the next few weeks.
-
-Please report any bugs or suggestions through the normal channels. Bugs with test
-cases should be posted to the bug tracker on the HSQLDB Sourceforge site.
-
-The included documentation has been updated. The JavaDoc for the jdbcXXX classes
-covers the JDBC interface. You can make the JavaDoc via the build scripts.
-
-The jar has been compiled with JDK 1.4. To run under earlier JDK's recompile using
-JDK 1.3.x.
-
-Changes since 1.7.2 are listed here in the reverse chronological order.
-
-2003.09.02
-
-ADDED JDBC SUPPORT FOR SAVPOINTS
-
-2003.08.22
-
-FURTHER SPEED IMPROVEMENTS IN ALL LOGGED MODES
-INSERT and UPDATE ops are faster by 5-20% in MEMORY tables, less in CACHED tables.
-
-
-ADDED SUPPORT FOR A RANGE OF SQL STYLE FUNCTIONS:
-
-CASE .. WHEN ... THEN .. ELSE ... END
-CASE WHEN .. THEN .. ELSE ... END
-NULLIF(.. , ..)
-SUBSTRING(.. FROM .. FOR ..)
-POSITION(.. IN ..)
-TRIM( {LEADING | TRAILING .. } FROM ..)
-EXTRACT({DAY | TIME |..} FROM ..)
-COALESCE(.. , ..)
-
-
-2003.08.17
-
-FURTHER IMPROVEMENTS IN PREPARED STATEMENT EXECUTION SPEED
-
-SUPPORT FOR JDBC BATCH EXECUTION
-
-SUPPORT FOR MULTIPLE ROWS WITH NULL FIELDS UNDER UNIQUE CONSTRAINTS
-
-IMPROVEMENTS TO TestSelf
-
-IMPROVEMENTS TO ON UPDATE CASCADE / SET DEFAULT / SET NULL
-
-2003.08.11
-
-REWRITE OF LEFT OUTER JOIN SUPPORT
-
-- Complete rewrite of join processing abolishes the requirement for 
-an index on any joined columns. All expressions with AND are supported
-in the join condition (JOIN atable ON ....)
-
-IMPROVEMENTS TO ON DELETE CASCADE / SET DEFAULT / SET NULL
-
-- Self referencing foreign keys and multiple foreign keys now support
-ON DELETE CASCADE.
-
-2003.08.02
-
-NIO ACCESS FOR .data FILES
-
-New nio access layer for .data files speeds up most CACHED TABLE related
-operations very significantly. 90% speedups in TestCacheSize tests
-have been observed. The program must be compiled with JDK 1.4 and run
-in a 1.4 JRE to use the new access mode.
-
-IMPROVEMENTS TO UPDATE AND INSERT
-
-Certain types of UPDATES and INSERTS that previously failed due to
-blanket application of UNIQUE constraints now work.
-
-Examples include UPDATE ... SET col = col + 1 where col is an identity
-column or INSERT a self referencing row under FOREIGN key constraints.
-
-2003.07.30
-
-IMPORTANT FIX IN SELECT QUERY PROCESSING
-
-Problems with OUTER and INNER joins returning incorrect results 
-have been reported over the last couple of years. A new fix is 
-intended to ensure correct results in all cases.
-
-- When two tables are joined, rows resulting from joining null
-values in the joined columns are no longer returned.
-
-- Use of OUTER requires the existence of an index on a joined OUTER column
-- There are still limitations on the conditions used in OUTER joins.
-
-AGGREGATES
-
-- enhancements to aggregate functions: aggregates of different numeric
-types are now supported
-
-SUM returns a BIGINT for TINYINT, SMALLINT and INTEGER columns. It
-returns a DECIMAL for BIGINT columns (scale 0) and DECIMAL columns 
-scale equals to that of the column).
-
-AVG returns the same type as the column or the expression in its 
-argument.
-
-- aggregates with GROUP BY do not return any rows if table is empty
-
-OLDER ENHANCEMENTS NOT PREVIOUSLY REPORTED
-
-- IDENTITY columns can now be of BIGINT type:
-
-CREATE TABLE <name> (<column> BIGINT IDENTITY, ...)
-
-- With contributed patch, TEXT TABLES encoding of the source file can
-now be specified. UTF-8 and other encodings can be used.
-
-- Two new options for databases: files_readonly and files_in_jar
-were added based on submitted patches.
-
-FILE READ-ONLY
-
-If the property files_readonly=true is set in the database 
-.properties file, no attempt is made to write the changes to data to
-file. Default, memory tables can be read/write but TEXT and CACHED
-tables are treated as read-only.
-
-FILES IN JAR
-
-This option allows database files to be distributed in the 
-application jar. We have changed the original contribution so
-that a special URL is used for this mode in the form of:
-
-jdbc:hsqldb:res:<path in jar>
-
-The URL type 'res' determines that the path that follows is a path
-into the JAR.
-
-The database can be readonly or files_readonly, depending on the
-value set in .properties file.
-
-2003.07.09
-
-SCRIPT FORMAT
-
-- change to command previously named SET LOGTYPE (discussed below for
-earlier alphas) new form is:
-SET SCRIPTFORMAT {TEXT | BINARY | COMPRESSED }
-
-The new binary and compressed formats are not compatible with previous
-ones, so you should change any old 1.7.2 ALPHA_? database to text
-mode with SET LOGTYPE 0 before opening with the new version.
-
-'OTHER' DATA TYPE
-
-- change to handling of OTHER columns. It is no longer required that
-the classes for objects stored in OTHER columns to be available on
-the path of an HSQLDB engine running as a server. Classes must be
-available on the JDBC client's path.
-
-OBJECT POOLING
-
-- the new Object pool has been incorporated. This reduces memory
-usage to varying degrees depending on the contents of database
-tables and speeds up the database in most cases. Currently the
-size of the pool is hard-coded but it will be user adjustable in the
-release version.
-
-CONNECTION PROPERTY
-
-- a new property, ifexists={true|false} can be specified for connections.
-It has an effect only on connections to in-process databases. The default
-is false and corresponds to current behaviour. 
-
-If set true, the connection is opened only if
-the database files have already been created -- otherwise no new database
-is created and the connection attempt will fail. Example:
-
-jdbc:hsqldb:hsql:mydb;ifexists=true
-
-This property is intended to reduce problems resulting from wrong URL's 
-which get translated to unintended new database files. It is recommended
-to use this property for troubleshooting.
-
-2003.07.04
-
-PREPARED STATEMENTS
-
-- support for real PreparedStatements - major speedup. Current limitations
-include lack of support for parameters in IN() predicates of queries.
-
-TRANSACTIONS VIA WEB SERVER
-
-- uniform support for transactions via HSQL and HTTP (WebServer and Servlet)
-protocols
-
-MULTIPLE IN-MEMORY AND SERVERS DATABASES
-
-- support for multiple memory-only databases within the same JVM
-
-- support for simultaneous multiple servers, multiple internal
-connections and multiple databases within the same JVM
-
-
-NEW CONVENTIONS FOR URL'S AND .properties FILES
-
-Each HSQLDB server or webserver can now serve up to 10 different databases.
-
-The server.properties and webserver.properties method for defining the
-databases has changed. The following properties should be used:
-
-server.database.0   path_of_the_first_database
-server.dbname.0 alias_for_the_first_database
-
-Up to 10 databases can be defined but they must start from 0 
-
-The same applies to command line arguments for Server and WebServer.
-
-The urls for connecting to servers should have the alias of the database
-at the end.
-
-For example, to connect to the HSQL protocol server on the localhost use:
-
-jdbc:hsqldb:hsql://localhost/alias_for_the_database
-
-where alias_for_the_database is the same string as defined in
-server.properties as server.dbnam.n
-
-The default for server.dbname.0 is "" (empty string) so that
-old URL types continue to work.
-
-Multiple memory-only database are supported by the use of:
-
-jdbc:hsqldb:mem:alias_for_the_first_database
-jdbc:hsqldb:mem:alias_for_the_second_database
-
-Examples: jdbc:hsqldb:mem:db1 jdbc:hsqldb:mem:mydb
-
-The conneciton type, 'file', can be used for file database
-connections. example below:
-
-jdbc:hsqldb:hsql:file:mydb;ifexists=true
-
-
-The URL for connecting to a Servlet HTTP server must have a 
-forward-slash at the end. Servlet serves only one database.
-
-jdbc:hsqldb:hsql://localhost:8080/servlet/HsqlServlet/
-
-
-
-2003.03.10
-
-DATABASE METADATA
-
--system table support and java.sql.DatabaseMetadate results have been
-overhauled by Campbell.
-
-STRICT FOREIGN KEYS
-
--strict treatment of foreign key index requirements is now enforced.
-A foreign key declaration _requires_ a unique constraint or index to exist
-on the columns of the referenced table. This applies both to old and
-new databases. Duplicate foreign keys (with exactly the same column sets)
-are now disallowed.
-
-TEXT TABLES
-
--further improvements to TEXT table support. Smaller cache sizes are
-now the default and the default properties can be specified in the 
-*.properties file.
-
-
-
-HSQLDB 1.7.2 ALPHA_M
-
-2003.01.23
-
--fixed reported bugs in SHUTDOWN COMPACT
--fixed reported bugs in GRANT statements on system tables
--fixed bug that prevented UPDATE in some circumstances
-
-some enhancements that appeared in previous versions but not reported:
-
--enhanced handling of DATE objects - comparability and normalisation
--support for CLOB methods in ResultSet
--fixed bug in afterLast() followed by previous() in ResultSet
-
-
-HSQLDB 1.7.2 ALPHA_L
-
-2003.01.16
-
-various patches and fixes
-
--fixes new issues reported with ALPHA_K
--fixes old issues related to uncommitted transactions in
-abnormal shutdown
--fixes old issues with SAVEPOINT names
--enhanced TEXT table handling and reporting of errors in
-CSV (source) files
-
-
-HSQLDB 1.7.2 ALPHA_K
-
-2003.01.10
-
-various patches and fixes
-
--OUTER with multiple column joins is now supported while OR is
-disallowed in the join expression. It is now possible to specify
-a range or equality condition on the OUTER columns returned.
-
--submitted patch for exclusion of NULL values from results of
-range queries has been applied. e.g. 
-WHERE columnvalue < 3
-will exclude from the result all rows with NULL in columnvalue.
-
--a number of small enhancements and bug fixes.
-
-further enhancements to logging. 
--The *.script file now contains only the DDL and data that is 
-written at CHECKPOINT or SHUTDOWN.
-The statements logged while the engine is running are stored
-in a *.log file.
--The format of the *.script file can now be one of TEXT,
-BINARY or COMPRESSED. The SET LOGTYPE {0|1|3} will reset the 
-format. A checkpoint is performed at this point if the format
-is different from the existing one.
-The COMPRESSED format has the side benefit of hiding the DDL
-and the admin password.
--The behaviour of SET WRITE_DELAY has changed with the
-introduction of the sync() method to force the log to be
-written out completely to disk at given intervals.
-SET WRITE_DELAY {TRUE | FALSE} is interpreted as synch every
-60 seconds or 1 second. SET WRITE_DELAY <n> where n is an integer
-is interpreted as synch every n seconds. The current default is
-60 seconds which seems to provide the right balance. The
-performance impact of SET WRITE_DELAY 1 is probably about 15% over that
-of SET WRITE_DELAY 300.
-
--The recovery from crash has been modified so that any line in the log
-that is not properly written (and causes an error) ends the redo process.
-A message is reported to the user, instead of stopping engine operation.
-
-HSQLDB 1.7.2 ALPHA_J
-
-2002.12.24
-CVS hsqldb-dev module tag: HSQLDB_1_7_2_ALPHA_J
-
--More work on text tables. See hsqlTextTables.html.
--Some refactoring of Table.java and Parser.java
-
-
-HSQLDB 1.7.2 ALPHA_I
-
-2002.12.16
-CVS hsqldb-dev module tag: HSQLDB_1_7_2_ALPHA_I
-
-More work on core classes to consolidate previous changes
--correction of reported bug with text tables and primary keys
--reducing data file writes esp. with big rows
--preventing Cache related error in ON DELETE CASCADE 
-
-
-HSQLDB 1.7.2 ALPHA_H
-
-2002.12.11
-CVS hsqldb-dev module tag: HSQLDB_1_7_2_ALPHA_H
-
-
-Reduction in JDK / JRE dependencies (see readmebuild.txt)
-Extensive refactoring of some of the larger classes.
-More changes to core classes Node, Row, Index, Cache, Log ...
-Some minor bug fixes and enhancements.
-Enhancements to text table support, including binary columns.
-Bug fixes to User.java and UserManager.java.
-Support for ON UPDATE / DELETE SET NULL / SET DEFAULT
-SSL support for Server mode operation.
-
-2002.10.30
-
-HSQLDB 1.7.2 ALPHA_G
-
-CVS hsqldb-dev module tag: HEAD data: 2002.10.30
-
-New features include:
-
-Tony Lai's enhancements to aggratates and support for HAVING.
-
-Tony's new UnifiedTable class (provisional name) which he kindly wrote
-at my request and provides sorted arrays with minimal storage
-requirements.
-
-My refactoring work on DatabaseRowInput/Output subclasses and Cache.java.
-
-This is still ongoing and has several features aimed at a more robust 
-database engine, including:
-- reduction in object creation;
-- possibility of resizing the cache while the engine is running;
-- possibility of exporting and backing up the DB files while the engine is
-  running.
-
-I have implemented the new feature, CHECKPOINT DEFRAG to defragment a
-*.data file without shutting down the engine, in two different versions,
-taking advantage of the above improvements.
-
-I have implemented binary logging of MEMORY table inserts in the *.script 
-file, resulting in much smaller startup and shutdown times with large 
-memory tables. Use SET LOGTYPE {0|1} to set the log type to text (0) or
-binary (1). This performs a checkpoint if the type needs changing.
-
-Also further performance optimisations resulting in faster CACHED table
-operations have been made.
-
-Sebastian has implemented ON UPDATE CASCADE support for foreign keys.
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_7_3.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_7_3.txt
deleted file mode 100644
index 7c91d928b2..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_7_3.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Chronological Change List
-
-This file is the accumulated list of changes in the course of development of
-hsqldb 1.7.3 in reverse chronological order.
-
-Fred Toussi (fredt@users.sourceforge.net)
-
-2004.02.23 1.7.3.4
-
-Fixed NPE when defining self referencing FK's with no primary key
-
-2004.02.07 1.7.3.3
-
-Fixed bug with loggin of deletes / updates from tables without primary keys. If the a row
-from such tables contained a null value and was deleted / updated, the operation was not 
-logged correctly. Subsequently, if there was an abnormal termination after such changes and
-the database was restarted, the logged delete statement would not have any effect and result
-in duplicate rows. This bug did not affect tables with primary keys or the normal operation
-(without abnormal termination) of other tables.
-
-
-2004.01.31 1.7.3.2
-
-Allow conversion from BIGINT to SAMMLINT and TYNYINT (all other legal conversions worked fine)
-Fixed issue with null values in calls to ResultSet methods with a Calendar
-argument.
-Enhancement to allow INSERT INTO <T> SELECT (....) where no column list
-list for the table T is specified.
-
-2004.12.24 1.7.3.1
-
-Corrected scripting of CHECK constraints with NOT NULL and IS NULL
-Fixed NPE error when functions in subqueries.
-Added support for STDDEV_POP, STDDEV_SAMP, VAR_POP, VAR_SAMP, EVERY and SOME set functions.
-Fixed potential issues with logging DELETE statements for tables with multi-key primary keys.
-
-Apart from the BOOLEAN type, 1.7.3.1 is identical to 1.7.2.11
-
-2004.12.05 First release 1.7.3.0
-
-Changed handling of the BOOLEAN type to allow the undefined state.
-This involves changes to the behariour of NOT and NULL, and also CHECK conditions,
-regarding NULL values.
-
-In all other respects, 1.7.3.0 is identical to 1.7.2.10
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_8_0.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_8_0.txt
deleted file mode 100644
index 439190022f..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_8_0.txt
+++ /dev/null
@@ -1,529 +0,0 @@
-Chronological Change List
-
-This file is the accumulated list of changes in the course of development of
-hsqldb 1.8.0, including point releases, in reverse chronological order.
-
-Fred Toussi (fredt@users.sourceforge.net)
-Maintainer, HSQLDB Project
-
-2007.09.06  1.8.0.8.1
-
-Fixed regression that impacted performance of system table selects and JDBC 
-DatabaseMetaData calls that use system tables.
-
-2007.08.28  1.8.0.8
-
-Fixed issue with some text table sources.
-Fixed issue caused after adding columns to tables used in certain view definitions
-Added sych call before closing .script files.
-Minor bug fixes
-
-New implementation of HsqlTimer to allow proper database shutdown while used 
-within an application server or similar.
-
-Improvements in TEXT TABLE source file handling. If source file is unavailable at
-startup, the source specification is retained but its usage is turned off.
-An SQL warning is added to the first session in the event.
-Added SET TABLE <tablename> SOURCE {ON | OFF} enables/disables the usage of the
-source file.
-
-Some relaxation of use of LIMIT in subqueries
-
-Improvements to SqlTool and DatabaseManager tools by Blaine Simpson.
-
-2006.09.27  1.8.0.7
-
-Fixed regression in 1.8.0.6 that prevented reuse of empty spaces in the .data file.
-Fixed regression that prevented setting the textdb.allow_full_path property
-
-2006.09.22  1.8.0.6
-
-Fixed issue where missing dbname.0 in server properties files was not ignored
-Fixed issue where a crash during logging of an update query may result in
-incomplete logging and recovery
-Fixed issue where a PK defined after another constraint would result in wrong
-constraint name
-Fixed issue with incorrect evaluation of null values in CASE WHEN in certain cases
-Fixed issue where ResultSet column class names were misreported for functions
-returning primitive types
-
-2006.07.27 1.8.0.5
-
-(3 fixed issues affecting durability)
-Fixed serious reported issue in some JVM's zip libraries by adding a workaround.
-Fixed serious issue when cache_scale and cache_size_scale are small but very 
-large rows are inserted in cached tables.
-Fixed bug where an automatic rollback of an UPDATE statement was not logged.
-
-Fixed bug with nested JDBC escapes.
-Fixed bug with logging of schema definition.
-Fixed bug where DROP TABLE was allowed even when a view used the table.
-Fixed bug where DISTINCT together with some GROUP BY lists were not allowed.
-Fixed bug where Server.shutdown() threw spurious NPE.
-
-Improved .data file persistence classes with better errror logging.
- 
-Improved client/server retrieval speed of large result sets.
-Column declarations of TIME(0) are now accepted.
-Named parameter in the form of :name are allowed in prepared statements.
-
-2006.04.16 1.8.0.4
-
-General improvements to all utilities, including SQLTool, DatabaseManager, etc.
-General improvements to build.xml.
-Improvement to fail-safe persistence by saving the .properties file first as a 
-new file, before renaming.
-Fixed bugs with text tables that use quoted source files and have a heading row.
-Fixed bug which prevented dropping a column before an indexed column.
-Fixed bug where DISTINCT was not allowed with SQL functions (BT 1400344)
-Fixed bug where PreparedStatement calls were allowed with some unbound variable
-(Bug Tracker 1399324) but commented out to allow compatibility with earlier 
-versions (see org.hsqldb.jdbc.jdbcPreparedStatement).
-VARCHAR_IGNORECASE size specification is now enforeced.
-Fixed bugs where ORDER BY did not work in some cases (BT 1383218, BT 1344895).
-Fixed bug where IFNULL was used with a function (BT 1315834).
-Fixed bug where creation of a new table was not allowed if the old table with
-the same name had been renamed.
-Fixed bug where SYSTEM_INDEXINFO could not be read.
-Fixed bug to allow running with JDK 1.1 when compiled for this target.
-Fixed bug with COALESCE, et containing an aggregate function (BT 1242448).
-
-Fixed bug with ResultSet.getTimestamp(int, Clandar).
-Fixed bug with access non-admin access to tables was allowed when using 
-PreparedStatement objects.
-Added org.hsqldb.Library function, getDatabaseFullProductVersion to return the 
-full version string, including the 4th digit (e.g 1.8.0.4).
-
-2006.01.08
-
-Fixed bug in WebServer
-Added support for remote startup of databases in Server and WebServer
-
-2005.12.22
-
-Fixed bug where ON DELETE SET DEFAULT was accepted without a matching DEFAULT value
-Fixed bug where column renaming was allowed in tables accessed in views
-Fixed bug where TRUE or FALSE is used as search condition as WHERE .. AND FALSE
-Fixed bug where dropping TEMPORARY tables was not logged
-Fixed bug where negative values for IDENTITY columns were treated as positive
-
-
-2005.11.02 1.8.0.3
-
-Bug fixes
-
-Fixed bug with tables formed with SELECT .. INTO that did not allow creation of indexes
-Fixed bug with scripting of some VIEW definitions with quoted column names
-Fixed bug in generation of some system tables with multi schema databases
-Fixed bug with access to network result set data when UNION with different column
-types is used
-Fixed bug with scripting of some TIMESTAMP values
-
-2005.08.18 1.8.0.2
-
-Bug fixes and enhancements:
-
-Fixed bugs with GLOBAL TEMPORARY tables with PRESERVE ROWS or 
-DELETE ROWS options.
-Fixed bug with DESC ignored in ORDER BY when a correlation name was used to 
-specify the column.
-Fixed ResultSet.getTimestamp() and PreparedStatement.setTimestam() bug with null
-timestamp parameters.
-Enhancement to allow string contatenation in LIKE predicates.
-Fixed two JDK 1.1.x incompatibilities.
-Fixed issue with some SET TABLE <name> SOURCE <source> command.
-Fixed issue with DDL not being logged immediatedly with WRITE_DELAY set to 0.
-Fixed issue with the combination of CASE WHEN (or COALESCE, etc.) with
-aggregate functions when the table contains no rows and the aggregate function
-returns null.
-Fixed issue with ALTER SCHEMA <name> RENAME TO <name>
-
-New features
-
-Support for RIGHT OUTER JOIN and CROSS JOIN in select statements 
-
-ALTER TABLE <name> ALTER COLUMN <name> SET [NOT] NULL
-
-Added DAY_OF_WEEK as an alternative for EXTRACT(XXX FROM <date time>)
- 
-
-2005.07.11 1.8.0.1
-
-Bug fixes and enhancements:
-
-Correlated subqueries with UNION (and other set operators) are allowed.
-LEFT OUTER JOIN join statement can contain NOT expressions.
-Set functions, SOME() and EVERY() implementation corrected.
-Quoted empty strings in TEXT table sources are no-longer interpreted as null.
-CHECKPOINT DEFRAG issued while there are uncommitted transactions works correctly.
-build.xml updated to fix issue with JDK 1.3 build  
-
-2005.07.01 1.8.0.0
-
-First release.
-
-2005.06.16 1.8.0.RC12
-
-Introduced new connection property shutdown, which, if true on the first 
-connection, will cause the engine to perform a SHUTDOWN on the database when
-the last connection is closed.
-
-Enhancements to TEXT table implementation to maintain the commit status of rows 
-during recovery from an abrupt shutdown. Uncommitted rows will not appear in
-TEXT tables.
-
-2005.05.17 1.8.0.RC10
-
-SCHEMAS
-
-Support for SQL schemas. Each database can contain multiple schemas. The 
-following commands have been introduced:
-
-CREATE SCHMEA <schemaname> AUTHORIZATION DBA
-DROP SCHEMA <schemaname> {CASCADE | RESTRICT}
-ALTER SCHEMA <schemaname> RENAME TO <newname>
-SET SCHEMA <schemaname>
-
-Initially, the default user schema will be created with the name PUBLIC. This 
-schema can be renamed or dropped. When the last user schema has been dropped, 
-an empty default schema with the name PUBLIC is created.
-
-System tables all belong to INFORMATION_SCHEMA. To access system tables, either
-SET SCHEMA INFORMATION_SCHEMA should be used once or they should be referred to
-by fully specified names, e.g. 
-INFORMATION_SCHEMA.SYSTEM_TABLES
-
-Similarly all database objects apart from columns can be referenced with fully
-qualified schema names.
-
-The CREATE SCHEMA command can be followed by other CREATE and GRANT commands 
-without an intervening semicolon. All such commands are executed in the context
-of the newly created schema. A semicolon terminates an extended CREATE SCHEMA
-command.
-
-ROLES
-
-Support for SQL standard roles.
-
-CREATE ROLE <role name>
-GRANT ... TO <role name>
-REVOKE ... FROM <role name>
-GRANT <role name> TO <user name>
-DROP ROLE <role name>
-
-The GRANT and REVOKE commands are similar to those used for granting 
-permissions on different objects to USER objects. A role can then be granted to
-or revoked from different users, simplifying permission management.
-
-GLOBAL TEMPORARY TABLES
-
-The implementation of temporary tables has changed to conform to SQL standards.
-
-The definition of a GLOBAL TEMPORARY table persists with the database. When a 
-session (JDBC Connection) is started, an empty instance of the table is created.
-Temporary tables can be created with (the default) ON COMMIT DELETE ROWS or 
-ON COMMIT PRESERVE ROWS added to the end of table definition. 
-With ON COMMIT PRESERVE ROWS, the table contents are not cleared when the 
-session commits. In both cases, the contents are cleared when the session is
-closed.
-
-
-SCHEMA MANIPULATION COMMANDS
-
-Several schema manipulation commands have been enhanced. 
-
-Tables, views and sequences can be dropped with the CASCADE option. This 
-silently drops all tables and views that reference the given database object.
-
-DROP TABLE <table name> [IF EXISTS] [CASCADE];
-DROP VIEW <view name> [IF EXISTS] [CASCADE];
-DROP SEQUENCE <sequence name> [IF EXISTS] [CASCADE];
-
-ALTER TABLE <table name> DROP COLUMN now silently drops any primary key or 
-unique constraint declared on the column (excluding multi-column constraints).
-
-ALTER TABLE <table name> ADD [COLUMN] now accepts primary key and identity 
-attributes.
-
-COLUMN MANIPULATION
-
-Support for converting type, nullability and identity attributes of a column
-
-ALTER TABLE <table name> ALTER COLUMN <column name> <column definition>
-
-<column definition> has the same syntax as normal column definition. The new 
-column definition replaces the old one, so it is possible to add/remove a 
-DEFAULT expression, a NOT NULL constraint, or an IDENTITY definition. 
-No change to the primary key is allowed with this command. 
-
-- The column must be already be a PK column to accept an IDENTITY definition.
-- If the column is already an IDENTITY column and there is no IDENTITY 
-definition, the existing IDENTITY attribute is removed.
-- The default expression will be that of the new definition, meaning an 
-existing default can be dropped by ommission, or a new default added.
-- The NOT NULL attribute will be that of the new definition, similar to above.
-- Depending on the conversion type, the table may have to be empty for the
-command to work. It always works when the conversion is possible in general and
-the individual existing values can all be converted.
-
-A different syntax can be used to change the next value for an IDENTITY column:
-
-ALTER TABLE <table name> ALTER [COLUMN] <column name> RESTART WITH <n>
-
-
-ALL and ANY expressions
-
-Full support for ALL(SELECT ....) and ANY(SELECT ....) with comparison o
-perators: =, >, <, <>, >=, <=
-Example:
-
-SELECT ... WHERE <value expression> >= ALL(SELECT ...)
-
-LIMIT and OFFSET
-
-New alternative syntax for LIMIT at the end of the query:
-
-LIMIT L [OFFSET O]
-
-It is now possible to use LIMIT combined with ORDER BY in subqueries and SELECT
-statements in brackets that are terms of UNION or other set operations.
-
-An ORDER BY or LIMIT clause applies to the complete result of the UNION and 
-other set operations or alternatively to one of its components depending on how 
-parentheses are used. In the first example the scope is the second SELECT, 
-while in the second query, the scope is the result of the UNION.
-
-SELECT ... FROM ... UNION 
-(SELECT ... FROM ... ORDER BY .. LIMIT)
-
-SELECT ... FROM ... UNION 
-SELECT ... FROM ... ORDER BY .. LIMIT
-
-Support for ORDER BY, LIMIT and OFFSET in CREATE VIEW statements
-
-
-COLLATIONS
-
-Added support for collations. Each database can have its own collation. The SQL 
-command below sets the collation from the set of collations in the source 
-for org.hsqldb.Collation:
-
-SET DATABASE COLLATION <double quoted collation name>
-
-Once this command has been issued, the database can be opened in any JVM and 
-will retain its collation.
-
-The property sql.compare_in_locale=true is no longer supported. If the line 
-exists in a .properties file, it will switch the database to the collation for 
-the current default.  
-
-ENHANCEMENTS
-
-Support for the res: connection protocol (database files in a jar) has been
-extended to allow CACHED tables.
-
-Support for correct casting of TIME into TIMESTAMP, using CURRENT_DATE 
-
-Symmetrical handling of setTimestamp() and getTimestamp() with Calendar
-parameters.
-
-BUG FIX
-
-Fixed bug where two indexes where switched, causing wrong results in some 
-queries in the following circumstances:
-
-CREATE TABLE is executed.
-ALTER TABLE ADD FORIEGN KEY is used to create an FK on a different table that 
-was already present when the first command was issued.
-CREATE INDEX is used to add an index.
-Data is added to the table.
-Database is shutdown.
-Database is restarted.
-At this point the indexes are switched and queries that use either of the 
-indexes will not return the correct set of rows.
-
-BUG FIXES
-
-Fixed reported bug with NOT LIKE and null values
-
-Fixed bug with OR conditions in OUTER JOIN
-
-Fixed bug with duplicated closing of prepared statements
-
-Fixed bug with scalar subqueries. If the result of a scalar subquery is empty 
-(no rows returned), the value is NULL.
-
-Fixed various parsing anomalies where SQL commands were accepted when quoted, 
-double-quoted or prefixed with an identifier, or identifiers were accepted in 
-single quotes. Example of a command that is no-longer tolerated: 
-
-Malformed query: MY. "SELECT" ID FROM 'CUSTOMER' IF.WHERE ID=0;   
-Actual query: SELECT ID FROM CUSTOMER WHERE ID=0;
-
-Fixed bug that prevented adding a primary key with no name to a table.
-
-Fixed bug that resulted in an error when the type of a column was changed to 
-the same type as before. E.g. 
-ALTER TABLE <table name> ALTER COLUMN <column name> INTEGER
-
-BUG FIX
-
-Fixed bug in ROLLBACK. If several updates were made to a row of a table that 
-has no primary key, then ROLLBACK was issued, there would remain multiple 
-versions of the row. E.g.
-
-CREATE TABLE T (I INT);
-INSERT INTO T VALUES (0);
-SET AUTOCOMMIT FALSE;
-UPDATE T SET I=1 WHERE I = 0;
-UPDATE T SET I=2 WHERE I = 1;
-UPDATE T SET I=3 WHERE I = 2;
-UPDATE T SET I=4 WHERE I = 3;
-ROLLBACK
-
-After the rollback the table would contain more than one row.
-
-
-2005.03.02 1.8.0.RC9
-
-Fixed unreported bug in recovery when first column contains null.
-Fixed unreported issue with possible PK and FK name duplication
-Fixed reported bug in recovery when there is no primary key.
-Fixed reported issue with deleting self referencing row (with foreign key).
-Fixed reported issue with illegal user names
-Fixed jdk 1.3 compilation issues
-Applied submitted patch to Server
-
-Applied submitted patch for setting the default table type when CREATE TABLE is
-used. The connection property, hsqldb.default_table_type=cached will set the
-default to CACHED tables, or the SET PROPERTY command can be used. Values,
-"cached" and "memory" are allowed.
- 
-The database property sql.enforce_strict_size=true has now a wider effect
-Previously CHAR /VARCHAR lengths could be checked and padding performed only 
-when inserting / updating rows. Added support for CHAR(n), VARCHAR(n), 
-NUMERIC(p,s) and DECIMAL(p,s) including SQL standard cast and convert semantics.  
-Explicit CAST(c AS VARCHAR(2)) will always truncate the string. Explicit 
-CAST(n AS NUMERIC(p,s)) will always perform the conversion or throw if n is out
-of bounds. All other implicit and explicit conversions to CHAR(n) and VARCHAR(n) 
-are subject to SQL standard rules.
- 
-Bob has improved support for text tables. Newline support in quoted fields is
-now complete. It is now possible to save and restore the first line header of a
-CSV file when ignore_first=true is specified. When a text table is created with 
-a new source (CSV) file, and ignore_first=true has been specified the following
-command can be used to set a user defined string as the first line:
-SET TABLE <tablename> SOURCE HEADER <double quoted string>.
-
-When embedded in OOo, several defaults and properties are set automatically:
-
-CREATE TABLE ... defaults to CREATE CACHED TABLE ...
-hsqldb.cache_scale=13
-hsqldb.cache_size_scale=8
-hsqldb.log_size=10
-SET WRITE DELAY 2
-sql.enforce_strict_size=true
-hsqldb.first_identity=1
-
-
-2005.02.11 1.8.0.RC8
-
-Fixed minor bugs
-
-Added public shutdown() method to Server.
-
-A new application log has been introduced as an optional feature. The
-property/value pair "hsqldb.applog=1" can be used in the first connection string 
-to log some important messages. The default is "hsqldb.applog=0", meaning no
-logging. A file with the ending ".app.log" is generated alongside the rest of
-the database files for this purpose. 
-
-In the current version only the classes used for file persistence (different in
-OpenOffice.org), plus any error encountered while processing the .log file after
-an abnormal end is logged.
-
-Bob Preston has updated the text table support to accept new line characters
-inside quoted strings. It is still not possible to create / modify a row 
-containing a new line inside the engine. This will be a simple upgrade and will
-be included in the next RC.
-
-Note that the JDBC driver and the engine for 1.8.0 cannot be mixed with those of
-earlier versions in client/server setup. Check your classpaths and use the same
-version of the engine for both client and server.
-
-
-2005.01.28 1.8.0.RC7
-
-Fixed minor bugs
-
-2005.01.24 1.8.0.RC5
-
-Issues with SET CHECKPOINT DEFRAG fixed
-
-New property for larger data file limits is introduced. Once set, the limit will
-go up to 8GB. The property can be set with the following SQL command only when 
-the database has no tables (new database).
-
-SET PROPERTY "hsqldb.cache_file_scale" 8
-
-To apply the change to an existing database, SHUTDOWN SCRIPT should be performed 
-first, then the property=value line below should be added to the .properties
-file before reopening the database:
-
-hsqldb.cache_file_scale=8
-
-It is now possible to add or drop a primary key.
-
-An existing primary key that is to be removed should not be referenced in a
-FOREIGN KEY constraint. If a table has an IDENTITY column, removing a primary 
-key will remove the identity attribute of the column but leave the actual data.
-
-When adding a primary key, a NOT NULL constraint is automatically added to the 
-column definitions. The table data for the columns of a newly declared primary
-key should not contain null values. 
-
-ALTER TABLE <name> ADD CONSTRAINT <cname> PRIMARY KEY(collist);
-ALTER TABLE <name> DROP CONSTRAINT <cname>;
-ALTER TABLE <name> DROP PRIMARY KEY; // alternative syntax
-
-2005.01.20 1.8.0.RC4
-
-More minor bug fixes
-ResultSetMetaData reports identical precision/scale in embedded and 
-client/server modes
-
-2005.01.16 1.8.0.RC3
-
-Regression bug fixes.
-New property allows a CHECKPOINT DEFRAG to be performed automatically whenever
-CHECKPOINT is performed internally or via a user command.
-
-SET CHECKPOINT DEFRAG n
-
-The parameter n is the megabytes of abandoned space in the .data file. When
-a CHECKPOINT is performed either as a result of the .log file reaching the 
-limit set by "SET LOGSIZE m", or by the user issuing a CHECKPOINT command, the
-amount of space abandoned during the session is checked and if it is larger 
-than n, a CHECKPOINT DEFRAG is performed instead of a checkpoint.
-
-2005.01.14 1.8.0.RC2
-
-Regression bug fixes.
-
-
-2005.01.10 1.8.0.RC1
-
-Allows embedding into OpenOffice.org
-Rewrite of log and cache handling classes, including:
-New deleted block manager with more effective deleted block reuse.
-Faster log processing after an abnormal termination.
-Better checks when maximum data file size is reached.
-Better recovery when maximum data file size is reached.
-
-Changes to row access to use iterators. More code clarity.
-
-Various refactorings and new package for improved modularity. 
-
-Enhancements to DatabaseManagerSwing
-
-In all other respects, 1.8.0.RC1 is identical to 1.7.3.1
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_7_1.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_7_1.txt
deleted file mode 100644
index 41c87665d9..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_7_1.txt
+++ /dev/null
@@ -1,304 +0,0 @@
-
-Version 1.7.1 improves performance and fixes several bugs that have come to light since the release of 1.7.0. It does not feature any major new functionality in the database engine.
-
-*Over ten-fold speedup of function calls in queries introduced in 1.7.1.
-
-*Up to 30% reduction in memory used by indexes and table rows, resulting in smaller overall memory footprint in 1.7.1.
-
-*Linux scripts for starting and shutting down server instances in 1.7.1.
-
-*Linux build scripts in 1.7.1.
-
-*The Transfer Tool was enhanced for this version by Nicolas Bazin and Bob Preston.
-
-HSQLDB version 1.7.0 CHANGELOG SINCE VERSION 1.60
-
-* Enhancements to SQL
-
-LIMIT and TOP keywords
-
-The LIMIT keyword was introduced in 1.61 with limited functionality. In 1.7.0 the functionality has been fully extended:
-
-SELECT LIMIT <n> <m> DISTINCT is now allowed.
-
-SELECT LIMIT <n> <m> ... is now treated as a complete SELECT statement and can be used anywhere a SELECT is used, so statements such as the following return meaningful results:
-
-SELECT LIMIT <n> <m> ... WHERE <x> IN (SELECT LIMIT <o> <p> ... )
-
-SELECT LIMIT <n> <m> ...  UNION SELECT LIMIT <o> <p>
-
-TOP <m> is synonymous with LIMIT 0 <m>
-
-GROUP BY keyword
-
-GROUP BY had several problems and bugs that have now been resolved. The results are now correct regardless of the order of selected columns or when sorting by multiple columns.
-
-DEFAULT keyword
-
-This keyword has been introduced with full functionality for defining default values for table columns. Special cases 'CURRENT_DATE','CURRENT_TIME','CURRENT_TIMSTAMP', 'TODAY' and 'NOW' can set DATE, TIME and TIMESTAMP columns with current values when an INSERT statement is executed.
-
-SIZE and PRECISION
-
-Maximum column sizes for CHAR, VARCHAR, and other types are now stored in the database. The CHAR and VARCHAR sizes can be enforced when INSERT, UPDATE and SELECT ... INTO table operations are performed. The enforcement is optional and turned off by default.
-
-SAVEPOINT for TRANSACTION
-
-New feature to allow transactions to rollback to a specified point.
-
-CONSTRAINTS and INDEXES
-
-Primary keys declared as CONSTRAINT <name> PRIMARY KEY, either on a single column or on multiple columns, are now accepted and used. All constrains are named, with those generated by the system given unique names as SYS_CT_<n>.
-
-Each INDEX must have a unique name within the database. This conforms to SQL standards.
-
-FOREIGN KEYS, ON DELETE CASCADE
-
-Foreign key constraints referencing the same table are now allowed. New, stricter rules require a unique index to exist on the referenced column (this is the recommended behaviour for new databases but is turned off by default for existing databases). 
-
-ON DELETE CASCADE qualifiers are now supported for foreign keys in data definition scripts. These qualifiers are enforced with fast searches on underlying indexes. 
-
-New support for ALTER TABLE allows 'forward-referencing' foreign keys where the referencing table is created before the referenced table.
-
-TRIGGERS
-
-New multiple-row trigger queues are introduced to improve performance. Enhancements to prevent deadlocks are also added.
-
-TEMP tables
-
-Full support for session-specific temporary tables is introduced. TEMP tables can be used in any statement the same way as ordinary tables, the differences are they are not visible to other session and are dropped when the session is closed. Also, FOREIGN KEY constraints for ordinary tables cannot reference a TEMP table for obvious reasons (TEMP tables can have foreign keys that reference any ordinary or temp table).
-
-TEXT tables
-
-Full support for delimited text files (such as CSV) as the data source for SQL tables.
-
-VIEWS
-
-Views are supported as global objects. Internally, each time the view is used, the underlying select statement is performed. Views can be created and dropped using the following statements.
-
-
-CREATE VIEW <viewname> AS SELECT ... FROM ... WHERE ....
-DROP VIEW <viewname> {IF EXISTS}
-
-ALTER
-
-The following statements are now supported:
-
-ALTER TABLE <name> RENAME TO <newname>
-
-All tables can now be renamed. 
-
-ALTER TABLE <name> ADD COLUMN <column definition> [BEFORE <existing name>]
-ALTER TABLE <name> DROP COLUMN <colname>
-
-A column can be added to the column list, so long as its definition does not include PRIMARY KEY or IDENTITY keywords. If a DEFAULT clause is used in the definition, its value is used in all the existing rows. Any column can be dropped unless it is part of the column list for a constraint or index.
-
-ALTER TABLE <name> DROP CONSTRAINT <constname>
-
-Any constraint apart from primary key can be dropped. The index backing the constraint is dropped if not referenced by a foreign key.
-
-ALTER TABLE <name> ADD CONSTRAINT <constname> UNIQUE <column list>
-
-Unique constraints can be added. A new index is created if necessary.
-
-ALTER TABLE <name> ADD CONSTRAINT <constname> FOREIGN KEY <foreign key definition>
-
-Both backward and forward referencing foreign keys are supported.
-
-ALTER INDEX <name> RENAME TO <newname>
-
-Any index can be renamed, so long as it is not a primary key index or an automatically created index on the referencing columns of a foreign key.
-
-DROP INDEX <name>
-
-Any index can be dropped, so long as it is not a primary key index or an automatically created index on the referencing columns of a foreign key or an index backing a constraint.
-
-SQL NAMES
-
-Full support for quoted SQL object names which can include any Unicode character. This applies to TABLE, COLUMN, CONSTRAINT and INDEX names.
-
-* Functions
-
-SET FUNCTION such as COUNT AVG SUM now accept the DISTICT parameter. This feature is
-supported only when GROUP BY is not used in the query.
-
-A number of bugs in functions such as ABS, CONCAT and SUBSTR have been fixed.
-
-A small number of new functions have been added.
-
-The SOUNDEX function has been rewritten according to standards.
-
-* Expressions
-
-Arithmetic expressions in SQL statements are now fully supported. Previously, when an arithmetic expression was used to INSERT or UPDATE a value, the first term had to be of the same type as the columns. For example 2*1.2 could not be inserted into a DECIMAL or DOUBLE column. Now all expressions are evaluated and the resulting value can be inserted into a column so long as it can be converted without narrowing.
-
-More lenient treatment of values for TIMESTAMP columns in INSERT and UPDATE now allows a DATE or part TIMESTAMP string to be used instead of the full pattern.
-
-BIT columns can be initialised with numeric values in addition to true and false. Numeric value 0 represents false; all other values represent true.
-
-* Locales
-
-CHAR, VARCHAR and LONGVARCHAR columns can now be sorted according to the current JVM locale. This feature is optional and turned off by default. If turned on, it can slow down database operations, especially where indexes on CHAR columns and its variant are used.
-
-* Error Trapping
-
-Some errors in SQL statements that were not reported before and resulted in potentially incorrect data are now caught.
-
-Dropping tables that are referenced by foreign key constraints from other tables is now disallowed regardless of the system-wide REFERENTIAL_INTEGRITY setting.
-
-Duplicate column names in one table are no longer allowed.
-
-Duplicate index names are no longer allowed.
-
-Using system table names for user tables is disallowed.
-
-INSERT INTO table (a,b,c,...) VALUES (x,y,z,...) statements require the count of names and values to match.
-
-* Enhancements to JDBC
-
-JDBC ResultSet objects are now scrollable and fully support absolute and relative positioning.
-
-Extra getXXX() methods are now supported, including getAsciiStream(), getUnicodeStream(), getCharacterStream().
-
-Optional use of column labels (aliases) as the return value for getColumnName(int i) calls. This is turned off by default.
-
-JDBC PreparedStatement support has been enhanced with support for setting and reading Date, Time and Timestamp values with a given Calendar object. This allows, among others, specifying different time zones for values that are set or read.
-
-Extra setXXX() methods are now supported, including setAsciiStream(), setUnicodeStream(), setCharacterStream().
-
-setObject() methods of PreparedStatement have been improved to allow storage of any serializable object in columns of SQL type, OTHER.
-
-JDBC DatabaseMetaData getImportedKeys(), getExportedKeys(), getCrossReference(), getBestRowIdentifier() are now supported.
-
-* Interoperability Enhancements
-
-HsqlServerFactory allows interoperability with application servers.
-
-An embedded server (an HSQLDB server started inside another application) can be directed to avoid calling System.exit() when the SHUTDOWN command is issued to the database for admin purposes.
-
-javax.jdbc.DataSource interface has been introduced as an experimental feature. In order to include this support, the source code should be compiled with JDK 1.4 or with appropriate J2EE jars present in the class path.
-
-* Performance Enhancements
-
-Very large CHAR, VARCHAR, LONGVARCHAR values are now supported in all types of tables.
-
-Major overhaul of internal operations to drastically reduce creation of temporary objects and type conversion.
-
-Code enhancements to reduce unnecessary method calls in loops.
-
-Enhancements to avoid duplicate indexes (in source code but not activated).
-
-Over ten-fold speedup of function calls in queries intoduced in 1.7.1.
-
-Up to 30% reduction in memory used by indexes and table rows, resulting in smaller overall memory footprint in 1.7.1.
-
-* Reliability Enhancements
-
-Many bugs that existed in 1.43 have been fixed.
-
-Better catching of error conditions and special cases such as null values.
-
-Correct treatment of large binary data.
-
-Better enforcement of internal data consistency in a number of areas.
-
-* Utilities
-
-New Script Tool class allows executing an SQL script.
-
-Enhancements to Transfer Tool to allow the user to save the transfer settings and load them in future sessions. Additional enhancements to support different database source and targets in a modular way.
-
-Swing version of Database Manager.
-
-Linux scripts for starting and shutting down server instances in 1.7.1.
-
-* Build
-
-Better Ant build with automatic detection of JDK version
-
-Linux build scripts in 1.7.1
-
-List of patches and fixes numbered by SourceForge Tracker ID's.
-
-416437 by deforest@users - JDBC DataSource
-418017 by deforest@users - made optional
-437174 by hjb@users - cache enhancements
-442993 by fredt - mixed type arithmetic expressions
-448121 by sma@users - large binary values - part implemented
-489917 by jytou@users - optional getColumnName(int) return value
-450412 by elise@users - jdk 1.1 compatibility
-450455 by kibu@users - platform specific line endings in .scrip file
-455757 by galena@users (Michiel de Roo)
-455785 by hjbusch@users - large DECIMAL inserts
-456679 by hiep256@users - TOP keyword
-460907 by fredt - soundex
-461556 by paul-h@users - compatibility with application servers
-471710 by fredt - LIMIT rewritten
-473613 by thertz@users - error trapping for joins
-475199 by fredt - duplicate column
-475586 by wreissen@users - servlet database name
-476650 by johnhobs@users - GROUP BY aggregates
-476694 by velichko@users - transaction savepoints
-478657 by peterhudson@users - improved TRIGGER support
-481239 by xponsard@users - enhancement to Transfer Tool
-481239 by yfl@users - SQL script execution
-485704 by boucherb@users - null binary objects
-488200 by xclay@users - throw exception
-489184 by xclay@users - thread safety
-489777 by fredt - protection of system tables
-491987 by jimbag@users - column size enforcement and preservation
-495484 by boucherb@users - exception at shutdown
-495938 by johnhobs@users - GROUP BY sorting
-497714 by lakuhns@users - scrollable JDBC result sets
-497872 by Nitin Chauhan - performance enhancements
-497872 by Nitin Chauhan - default labels for aggregates
-500767 by adjbirch@users - TransferTool enhancements
-505356 by daniel_fiser@users - sorting according to Locale
-509002 by fredt - correct parsing of primary key constraints
-513005 by sqlbob@users - ABS function
-513005 by sqlbob@users - HOUR function
-513005 by sqlbob@users - TEMP tables
-513005 by sqlbob@users - TEXT TABLE support
-514111 by fredt - CONCAT function
-517028 by peterhudson@users - JDBC setDate(), etc. with Calendar
-521078 by boucherb@users - DROP TABLE checks
-523880 by leptitpre@users - VIEW SUPPORT
-544754 by sqlbob@users - RAWTOHEX and HEXTORAW functions
-549741 by velichko@users - RENAME for tables and indexes
-550970 by boucherb@users - fewer StringBuffers
-552830 by rougier@users - COUNT(DISTICT column)
-580430 by thomasm@users - wrong column name in getIndexInfo()
-
-List of enhancements without patch number
-
-1.7.0 by boucherb@users - maintaining constraint names
-1.7.0 by boucherb@users - self referenced foreign keys
-1.7.0 by boucherb@users - stubs for JDBC3 methods and updated Javadoc
-1.7.0 by boucherb@users - Javadoc for a number of classes
-1.7.0 by deforest@users - create database directory if not exists
-1.7.0 by fredt - full support for quoted identifiers
-1.7.0 by fredt - ON DELETE CASCADE qualifier for foreign keys
-1.7.0 by fredt - foreign keys without target column list
-1.7.0 by fredt - DEFAULT keyword in column definitions
-1.7.0 by fredt - GROUP BY with multiple columns in groups
-1.7.0 by fredt - JDBC getDate, etc. with Calendar
-1.7.0 by fredt - lenient handling of Timestamp inserts
-1.7.0 by fredt - JDK 1.1 compatible deque object backed by an array
-1.7.0 by fredt - new HsqlProperties class
-1.7.0 by fredt - preservation of column size, etc. with SELECT INTO
-1.7.0 by fredt - ensuring internal consistency of Result objects
-1.7.0 by fredt - resolving some deprecation warnings
-1.7.0 by fredt - ALTER TABLE for adding and dropping columns and constraints
-1.7.0 by fredt - revamped storage of cached table with very large strings
-1.7.0 by fredt - management of server connections with optional no system exit
-1.7.0 by fredt - revamped management of server and database properties
-1.7.0 by fredt - JDBC getUnicodeStream(), getAsciiStream(), getCharacterStream()
-1.7.0 by fredt - JDBC setAsciiStream(), setUnicodeStream(), setCharacterStream()
-1.7.0 by fredt - JDBC getCrossReference(), getImportedKeys(), getExportedKeys()
-1.7.0 by nbazin@users - enhancements to Transfer Tool
-1.7.0 by sqlbob@users - reengineering of Database Manager and Transfer Tool
-1.7.0 by sqlbob@users - TEMP, TEXT and CACHED table targets for SELECT INTO
-1.7.0 by sqlbob@users - improvements to cache size management
-1.7.0 by David Moles - tests for subselect
-1.7.0 by jrmaher@users - improvements to Script Tool
-
-also a large number of error-trapping and other fixes not documented
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_7_2.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_7_2.txt
deleted file mode 100644
index f99d65eda8..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_7_2.txt
+++ /dev/null
@@ -1,532 +0,0 @@
-HSQLDB 1.7.2 CHANGE LOG
-
-
-The development of 1.7.2 began in late 2002 with a plan to release the new version within 6 months. Several alpha versions, culminating in ALPHA_M, were released in the first three months and featured most of the intended enhancements. However, when newly written code for system tables was introduced, many changes had to be made to internal code to accommodate the reporting requirements. This was followed from around April 2003 with efforts to separate query compilation from execution. Other developments to allow multiple databases, better query processing, more advanced SQL keywords, etc. took place simultaneously, resulting in an extended scope for 1.7.2 and extensive addition and rewrite of several key classes. The next alpha version was released in September, followed by a further six, until the first Release Candidate became available at the end of 2003. Since then, all efforts have been focused on fixing bugs and inconsistencies, with 7 additional Release Candidates issued.
-
-As a result, 1.7.2 features major changes to the database engine. Existing applications that work with previous versions may need modifications to work with the new version. Changes are listed here and in the rest of the documentation.
-
-I would like to thank all developers, testers and users who have contributed to this effort.
-
-
-June 2004
-
-Fred Toussi
-
-Maintainer, HSQLDB Project
-http://hsqldb.sourceforge.net
-
-
-----------------------------------------------------
-----------------------------------------------------
-
-SQL ENHANCEMENTS AND CHANGES
-
-
-----------------
-
-DDL
-
-Some new restrictions have been imposed:
-
-CONSTRAINT names must be unique within each database (same with INDEX names).
-Size / precision / scale values for several types are now disallowed. Allowed types are: CHAR(n), VARCHAR(n), DOUBLE(n), DECIMAL(n,m)
-
-In column default value specification, functions such as CURRENT_TIME, CURRENT_DATA, etc. should not be enclosed in quotes. New function CURRENT_USER can also be used.
-
-SQL keywords are not allowed as table or column names unless they are double-quoted. 
-
-----------------
-
-VIEW
-
-
-View definitions can now have a column name list:
-
-CREATE VIEW <viewname> [(<colnmae>, ...)] AS SELECT ....
-
-ALTER TABLE commands take into account the views that reference the table and prevent illegal changes.
-
-
-
-----------------
-
-CHECK
-
-
-
-Support for CHECK constraints that apply to the modified/inserted row only. This can be added via ALTER TABLE ADD CHECK() or in table definition.
-
-
-
-----------------
-
-QUERY PROCESSING
-
-
-
-Query processing has been extensively enhanced in this release and better SQL standard compliance has been achieved. Major implications of the recent changes are as follows:
-
-Columns in correlated subqueries are resolved independently first. If there is an unresolved column, then the surrounding context is used to resolve it. This is opposite the resolution order previously enforced in the engine.
-
-Some ambiguities and errors in ORDER BY clauses are now caught.
-
-UNION and other set queries accept only one ORDER BY clause at the end. In this clause, column indexes or column names in the first select are allowed as sort specification e.g.:
-
-SELECT .. UNION SELECT .. ORDER BY 1 DESC, 5, 3
-
-The implemntation of UNION, EXCEPT and INTERSECT set operations has been rewritten to comply with SQL standards.
-
-When multiple set operations are present in a query, they are now evaluated from left to right, with INTERSECT taking precedence over the rest.
-
-It is now possible to use parentheses around multiple (or single) select statements with set operations to change the order of evalation.E.g.:
-
-((SELECT * FROM A EXCEPT SELECT * FROM B) INTERSECT SELECT * FROM D UNION SELECT * FROM E)
-
-The above applies to all cases where a SELECT can be used except a single value select inside another select. Eg.
-
-SELECT a, b, SELECT asinglevalue FROM anothertable WHERE ..., FROM atable JOIN ... 
-
-----------------
-
-IMPROVEMENTS TO UPDATE AND INSERT
-
-
-
-Certain types of UPDATES and INSERTS that previously failed due to blanket application of UNIQUE constraints now work.
-
-Examples include UPDATE ... SET col = col + 1 where col is an identity column or INSERT a self referencing row under FOREIGN key constraints.
-
-
-
-----------------
-
-AGGREGATES, GROUP BY, HAVING
-
-
-
-DISTINCT aggregates are now supported.
-
-Aggregates on all numeric type columns are now supported. Expressions are allowed as aggregate function parameter.
-
-SUM returns a BIGINT for TINYINT, SMALLINT and INTEGER columns. It returns a DECIMAL for BIGINT columns (scale 0). SUM of a DECIMAL column has the same scale as the column.
-
-AVG returns the same type as the column or the expression in its argument.
-
-Aggregates with GROUP BY do not return any rows if table is empty
-
-Fully enforced GROUP BY rules including support for HAVING conditions
-
-
-----------------
-
-JOINS
-
-
-
-Extensive rewrite of join processing abolishes the requirement for an index on any joined columns.
-
-Problems with OUTER and INNER joins returning incorrect results have been fixed and results are correct in all cases.
-
-When two tables are joined, rows resulting from joining null values in the joined columns are no longer returned.
-
-Most expressions are supported in the join condition (JOIN <table> ON ....).
-
-Outer join conditions can now include most comparison operators, as well as OR logical operators. For example:
-
-LEFT OUTER JOIN atable ON a=b AND c>d OR a=2 ...
-
-Illegal forward table references are no longer allowed in join conditions.
-
-There are many other small improvements and fixes, including:
-
-
-
-----------------
-
-NULLS
-
-
-
-Support for multiple rows with null fields under unique constraints.
-
-Exclusion of NULL values from results of queries with range conditions. 
-
-
-
-----------------
-
-FOREIGN KEY
-
-
-
-Full support for triggered actions, including foreign keys that reference the same table.
-
-FORIEGN KEY ... ON UPDATE { CASCADE | SET NULL | SET DEFAULT } ON DELETE { CASCADE | SET NULL | SET DEFAULT }
-
-Strict treatment of foreign key constraint requirements is now enforced. A foreign key declaration _requires_ a unique constraint to exist on the columns of the referenced table. This applies both to old and new databases. Duplicate foreign keys (with exactly the same column sets) are now disallowed.
-
-
-
-----------------
-
-SEQUENCE
-
-
-
-Support for sequences. Identity columns are now automatic sequence primary key columns that can be defined as INTEGER or BIGINT as follows:
-
-GENERATED BY DEFAULT AS IDENTITY (START WITH <n>, INCREMENT BY <m>)
-
-Named sequence objects can be defined with:
-
-CREATE SEQUENCE <sequencename> [AS {INTEGER | BIGINT}] [START WITH <startvalue>] [INCREMENT BY <incrementvalue>];
-
-And the next value can be retrieved with the following expression in SELECT, INSERT and UPDATE queries:
-
-NEXT VALUE FOR <sequencename>
-
-
-
-----------------
-
-SQL FUNCTIONS
-
-
-Added support for a range of SQL style functions:
-
-
-CASE .. WHEN .. THEN .. [WHEN .. THEN ..] ELSE .. END
-
-CASE WHEN .. THEN .. [WHEN .. THEN ..] ELSE ... END
-
-NULLIF(.. , ..)
-
-SUBSTRING(.. FROM .. FOR ..)
-
-POSITION(.. IN ..)
-
-TRIM( {LEADING | TRAILING .. } FROM ..)
-
-EXTRACT({DAY | TIME |..} FROM ..)
-
-COALESCE(.. , ..)
-
-
-
-----------------
-
-TRIGGER
-
-
-
-It is now possible to execute triggers in the main execution thread. This allows uses for triggers that were not possible before, especially checking and modifying inserted values.
-
-
-
-----------------
-
-DATETIME
-
-
-
-Fixed the TIMESTAMPS, TIME and DATE normalisation issues.
-
-
-
-----------------
-
-OTHER
-
-
-
-IN value lists can now contain column values or expressions. See TestSelfQueries.txt for an example.
-
-
-LIKE has been debugged and optimised when possible.
-
-
-
-----------------------------------------------------
-----------------------------------------------------
-
-JDBC ENHANCEMENTS
-
-
-
-JDBC support for savepoints.
-
-Support for JDBC batch execution with multiple-results. Both Statement and PreparedStatement batch modes are supported.
-
-SSL support for server mode operation.
-
-After calling Statement.setMaxRows(int), the maximum row count restriction will no longer apply to result sets returned and used internally. (change in 1_7_2_5)
-
-
-----------------
-
-CONNECTION PROPERTY
-
-
-
-A new property, ifexists={true|false} can be specified for connections. It has an effect only on connections to in-process databases. The default is false and corresponds to current behaviour. 
-
-If set true, the connection is opened only if the database files have already been created -- otherwise no new database is created and the connection attempt will fail. Example:
-
-jdbc:hsqldb:hsql:file:mydb;ifexists=true
-
-This property is intended to reduce problems resulting from wrong URL's which get translated to unintended new database files. It is recommended to use this property for troubleshooting.
-
-Database properties can be specified for the first connection to a new file: or mem: database. This allows properties such as enforce_strict_size to be specified for mem: databases, or for a new file: database.
-
-jdbc:hsqldb:hsql:mem:test;sql.enforce_strict_size=true
-
-
-
-----------------
-
-PREPARED STATEMENTS
-
-
-
-Support for real PreparedStatements - major speedup. This has introduced the following changes from the previous versions.
-
-The execute(String sql), executeUpdate(String sql) and executeQuery(String sql) commands are no-longer supported for PreparedStatements according to JDBC specs. Use an ordinary Statement for calling these methods.
-
-The SQL for each call to the prepareStatement() method of Connection must consist of a single SQL query. For multiple statements use either multiple PreparedStatement objects or an ordinary Statement object.
-
-Bug fixes ensure date / time, java object and binary values stored in in-process databases via prepared statements will not be altered if the object is modified outside the engine.
-
-Full support for ResultSetMetaData
-
-Full support for ParameterMetaData
-
-Support for CLOB methods in ResultSet
-
-
-
-----------------
-
-TRANSACTIONS VIA WEB SERVER
-
-
-
-Uniform support for transactions via HSQL and HTTP (WebServer and Servlet) protocols
-
-
-----------------------------------------------------
-----------------------------------------------------
-
-OTHER ENHANCEMENTS
-
-
-
-----------------------------------------------------
-
-SPEED
-
-
-
-Speed optimisation of joins with views and subqueries, using indexes to optimise join performance.
-
-Improved index use for multiple key joins.
-
-Further speed improvements in all logged modes
-
-INSERT and UPDATE ops are faster by 5-20% in MEMORY tables, less in CACHED tables.
-
-General speedup of CACHED table operation due to better management of the memory cache.
-
-
-
-----------------------------------------------------
-
-DATABASE PACKAGING AND MODES
-
-
-
-Two new options for databases: files_readonly and files_in_jar were added:
-
-
-FILE READ-ONLY
-
-
-If the property hsqldb.files_readonly=true is set in the database .properties file, no attempt is made to write the changes to data to file. Default, MEMORY tables can be read/write but TEXT and CACHED tables are treated as read-only.
-
-
-FILES IN JAR
-
-
-This option allows database files to be distributed in the application jar. We have changed the original contribution so that a special URL is used for this mode in the form of:
-
-jdbc:hsqldb:res:<path in jar>
-
-The URL type 'res' determines that the path that follows is a path into the JAR. The path must be all lowercase and begin with a forward slash.
-
-The database can be readonly or files_readonly, depending on the value set in .properties file.
-
-
-'OTHER' DATA TYPE
-
-
-Change to handling of OTHER columns. It is no longer required that the classes for objects stored in OTHER columns to be available on the path of an HSQLDB engine running as a server. Classes must be available on the JDBC client's path.
-
-
-----------------------------------------------------
-
-MULTIPLE IN-MEMORY AND SERVER DATABASES
-
-
-
-Support for multiple memory-only databases within the same JVM
-
-Support for simultaneous multiple servers on different ports, multiple internal connections and multiple databases within the same JVM
-
-Each HSQLDB server or webserver can now serve up to 10 different databases.
-
-The server.properties and webserver.properties method for defining the databases has changed. The following properties should be used:
-
-server.database.0   path_of_the_first_database
-server.dbname.0 alias_for_the_first_database
-
-Up to 10 databases can be defined but they must start from 0. The same applies to command line arguments for Server and WebServer.
-
-The URL's for connecting to servers should have the alias of the database at the end. For example, to connect to the HSQL protocol server on the localhost use:
-
-jdbc:hsqldb:hsql://localhost/alias_for_the_database
-
-where alias_for_the_database is the same string as defined in server.properties as server.dbname.n
-
-If not explicitly set, the default for server.dbname.0 is "" (empty string) so that old URL types continue to work.
-
-Multiple memory-only database are supported by the use of:
-
-jdbc:hsqldb:mem:alias_for_the_first_database
-jdbc:hsqldb:mem:alias_for_the_second_database
-
-Examples: jdbc:hsqldb:mem:db1 jdbc:hsqldb:mem:mydb
-
-The connection type, 'file:', can be used for file database connections. Example below:
-
-jdbc:hsqldb:file:mydb;ifexists=true
-
-The URL for connecting to a Servlet HTTP server must have a forward-slash at the end. Servlet serves only one database.
-
-jdbc:hsqldb:hsql://localhost:8080/servlet/HsqlServlet/
-
-
-----------------------------------------------------
-
-DATABASE METADATA
-
-
-System table support and java.sql.DatabaseMetadate have been overhauled.
-
-Use SELECT * FROM SYSTEM_TABLES to see the full list.
-
-
-
-----------------------------------------------------
-
-TEXT TABLES
-
-
-Enhanced TEXT table handling and reporting of errors in CSV (source) files
-
-TEXT TABLES encoding of the source file can now be specified. UTF-8 and other encodings can be used.
-
-
-
-----------------------------------------------------
-
-MEMORY USE AND OBJECT POOLING
-
-
-An Object pool has been incorporated. This reduces memory usage to varying degrees depending on the contents of database tables and speeds up the database in most cases. Currently the size of the pool is hard-coded but it will be user adjustable in a future version.
-
-
-
-----------------------------------------------------
-
-PERSISTENCE
-
-
-----------------
-
-CHECKPOINT DEFRAG
-
-Defragments the *.data file without shutting down the database
-
-
-----------------
-
-SET SCRIPTFORMAT {TEXT | BINARY | COMPRESSED }
-
-Changes the format of the *.script file and performs a checkpoint.
-
-Database script can be stored in binary or compressed binary formats, resulting in smaller size and faster loading.
-
-
-----------------
-
-The *.script file now contains only the DDL and data that is written at CHECKPOINT or SHUTDOWN. The COMPRESSED format has the side benefit of hiding the DDL and the admin password.
-
-The *.log file now contains the statements executed since the last startup or CHECKPOINT. This file is in plain text format.
-
-----------------
-
-SET WRITE_DELAY {TRUE | FALSE}
-
-SET WRITE_DELAY <n>
-
-The behaviour of SET WRITE_DELAY has changed with the introduction of the sync() method to force the log to be written out completely to disk at given intervals.
-
-SET WRITE_DELAY {TRUE | FALSE} is interpreted as synch every 60 seconds or 1 second. SET WRITE_DELAY <n> where n is an integer is interpreted as synch every n seconds. The current default is 60 seconds which seems to provide the right balance. Under heavy INSERT/DELETE/UPDATE test conditions, the performance impact of SET WRITE_DELAY 1 is probably about 15% over that of SET WRITE_DELAY 300.
-
-Crash recovery has been modified so that any line in the *.log file that is not properly written (and causes an error) ends the redo process. A message is reported to the user, instead of stopping engine operation.
-
-----------------
-
-NIO ACCESS FOR *.data FILES
-
-New nio access layer for .data files speeds up most CACHED TABLE related operations very significantly. 90% speedups in TestCacheSize tests have been observed.
-
-There must be enough available memory in the machine to allow a memory-mapped buffer for the entire *.data file. Beyond this size, the engine reverts to non-nio access.
-
-
-
-----------------------------------------------------
-
-BUILD
-
-Reduction in JDK / JRE dependencies (see readmebuild.txt)
-
-The supplied JAR is now compiled with JDK 1.4 and requires a JRE 1.4 or later to work. You can rebuild the JAR with JDK 1.3.x in order to use it with JRE 1.3 or earlier.
-
-
-
-----------------------------------------------------
-
-DOCUMENTATION
-
-
-Documentation is now maintained mainly in XML format with HTML and PDF versions available.
-
-
-
-----------------------------------------------------
-
-UTILITIES
-
-
-The SQL Tool is a powerful new utility in 1.7.2 and allows processing SQL commands via the shell or scripts.
-
-The Transfer Tool utility saw a major upgrade just before the 1.7.2 release cycle. In this release some minor updates and bug fixes, together with significant speedup, have been intoduced.
-
-The Database Manager has been enhanced slightly to include a command to save the result set in CSV format. The Swing version of Database Manager allows the user to sort the rows of the result set on any column.
-
-The connection dialogue in the AWT version of Database Manager and Transfer Tool allows saving and recalling connection URL's together with the user name and password.
-
-
-----------------------------------------------------
-
-END
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_8_0.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_8_0.txt
deleted file mode 100644
index 0a50153a5d..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_8_0.txt
+++ /dev/null
@@ -1,287 +0,0 @@
-
-HSQLDB 1.8.0 CHANGE LOG
-
-
-The development of 1.8.0 began in mid 2004 with a plan to release the new version in 2005. The main feature planned for this release was the ability to be used with OpenOffice.org 2.0 as the default database engine. Release candidate versions started to appear in January, culminating in RC10 in May. Several new and enhanced SQL commands have been introduced and new capabilities such as support for multiple SCHEMA objects in each database, database-wide collations and SQL ROLE objects have been added. Parts of the persistence engine have been rewritten for better performance and long-running online operation.
-
-
-I would like to thank all developers, testers and users who have contributed to this effort.
-
-
-June 2005
-
-Fred Toussi
-
-Maintainer, HSQLDB Project
-http://hsqldb.sourceforge.net
-
-
-SQL ENHANCEMENTS
-
-----------------
-
-SCHEMAS
-
-Support for SQL schemas. Each database can contain multiple schemas. The following commands have been introduced:
-
-CREATE SCHMEA <schema name> AUTHORIZATION DBA
-DROP SCHEMA <schema name> {CASCADE | RESTRICT}
-ALTER SCHEMA <schema name> RENAME TO <new name>
-SET SCHEMA <schema name>
-
-Initially, the default user schema will be created with the name PUBLIC. This schema can be renamed or dropped. When the last user schema has been dropped, an empty default schema with the name PUBLIC is created.
-
-System tables all belong to INFORMATION_SCHEMA. To access system tables, either SET SCHEMA INFORMATION_SCHEMA should be used once or they should be referred to by fully specified names, e.g. INFORMATION_SCHEMA.SYSTEM_TABLES
-
-Similarly all database objects apart from columns can be referenced with fully qualified schema names.
-
-The CREATE SCHEMA command can be followed by other CREATE and GRANT commands without an intervening semicolon. All such commands are executed in the context of the newly created schema. A semicolon terminates an extended CREATE SCHEMA command.
-
-----------------
-
-ROLES
-
-Support for SQL standard roles.
-
-CREATE ROLE <role name>
-GRANT ... TO <role name>
-REVOKE ... FROM <role name>
-GRANT <role name> TO <user name>
-DROP ROLE <role name>
-
-The GRANT and REVOKE commands are similar to those used for granting permissions on different objects to USER objects. A role can then be granted to or revoked from different users, simplifying permission management.
-
-----------------
-
-GLOBAL TEMPORARY TABLES
-
-The implementation of temporary tables has changed to conform to SQL standards.
-
-The definition of a GLOBAL TEMPORARY table persists with the database. When a session (JDBC Connection) is started, an empty instance of the table is created. Temporary tables can be created with (the default) ON COMMIT DELETE ROWS or ON COMMIT PRESERVE ROWS added to table definition. With ON COMMIT PRESERVE ROWS, the table contents are not cleared when the session commits. In both cases, the contents are cleared when the session is closed.
-
-----------------
-
-SCHEMA MANIPULATION COMMANDS
-
-Several schema manipulation commands have been enhanced. 
-
-Tables, views and sequences can be dropped with the CASCADE option. This silently drops all tables and views that reference the given database object.
-
-DROP TABLE <table name> [IF EXISTS] [CASCADE];
-DROP VIEW <view name> [IF EXISTS] [CASCADE];
-DROP SEQUENCE <sequence name> [IF EXISTS] [CASCADE];
-
-ALTER TABLE <table name> DROP [COLUMN] now silently drops any primary key or unique constraint declared on the column (excluding multi-column constraints).
-
-ALTER TABLE <table name> ADD [COLUMN] now accepts primary key and identity attributes.
-
-----------------
-
-COLUMN MANIPULATION
-
-Support for converting type, nullability and identity attributes of a column
-
-ALTER TABLE <table name> ALTER [COLUMN] <column name> <column definition>
-
-<column definition> has the same syntax as normal column definition. The new column definition replaces the old one, so it is possible to add/remove a DEFAULT expression, a NOT NULL constraint, or an IDENTITY definition. No change to the primary key is allowed with this command. 
-
-- The column must already be a PK column to accept an IDENTITY definition.
-- If the column is already an IDENTITY column and there is no IDENTITY definition, the existing IDENTITY attribute is removed.
-- The default expression will be that of the new definition, meaning an existing default can be dropped by omission, or a new default added.
-- The NOT NULL attribute will be that of the new definition, similar to above.
-- Depending on the conversion type, the table may have to be empty for the command to work. It always works when the conversion is possible in general and the individual existing values can all be converted.
-
-A different syntax can be used to change the next value from an IDENTITY column:
-
-ALTER TABLE <table name> ALTER [COLUMN] <column name> RESTART WITH <n>
-
-----------------
-
-ADDING AND DROPPING PRIMARY KEYS
-
-It is now possible to add or drop a primary key.
-
-An existing primary key that is to be removed should not be referenced in a FOREIGN KEY constraint. If a table has an IDENTITY column, removing a primary key will remove the identity attribute of the column but leave the actual data.
-
-When adding a primary key, a NOT NULL constraint is automatically added to the column definitions. The table data for the columns of a newly declared primary key should not contain null values. 
-
-ALTER TABLE <name> ADD CONSTRAINT <cname> PRIMARY KEY(collist);
-ALTER TABLE <name> DROP CONSTRAINT <cname>;
-ALTER TABLE <name> DROP PRIMARY KEY; // alternative syntax
-
-----------------
-
-SIZE ENFORCEMENT
-
-
-The database property sql.enforce_strict_size=true has now a wider effect.
-
-Previously CHAR /VARCHAR lengths could be checked and padding performed only when inserting / updating rows. Added support for CHAR(n), VARCHAR(n), NUMERIC(p,s) and DECIMAL(p,s) including SQL standard cast and convert semantics. CHAR and VARCHAR declarations now require a size parameter. A CHAR declaration without a size parameter is interpreted as CHAR(1). TIMESTAMP(0) and TIMESTAMP(6) are also supported, with the precision representing the sub-second resolution.
-
-Explicit CAST(c AS VARCHAR(2)) will always truncate the string. Explicit CAST(n AS NUMERIC(p)) will always perform the conversion or throw if n is out of bounds. All other implicit and explicit conversions to CHAR(n) and VARCHAR(n) are subject to SQL standard rules.
-
-----------------
-
-ALL and ANY expressions
-
-Full support for ALL(SELECT ....) and ANY(SELECT ....) with comparison operators: =, >, <, <>, >=, <=
-Example:
-
-SELECT ... WHERE <value expression> >= ALL(SELECT ...)
-
-LIMIT and OFFSET
-
-New alternative syntax for LIMIT at the end of the query:
-
-LIMIT L [OFFSET O]
-
-It is now possible to use LIMIT combined with ORDER BY in subqueries and SELECT statements in brackets that are terms of UNION or other set operations.
-
-An ORDER BY or LIMIT clause applies to the complete result of the UNION and other set operations or alternatively to one of its components depending on how parentheses are used. In the first example the scope is the second SELECT, while in the second query, the scope is the result of the UNION.
-
-SELECT ... FROM ... UNION 
-(SELECT ... FROM ... ORDER BY .. LIMIT)
-
-SELECT ... FROM ... UNION 
-SELECT ... FROM ... ORDER BY .. LIMIT
-
-
-Support for ORDER BY, LIMIT and OFFSET in CREATE VIEW statements
-
-----------------
-
-COLLATIONS
-
-Each database can have its own collation. The SQL command below sets the collation from the set of collations in the source for org.hsqldb.Collation:
-
-SET DATABASE COLLATION <double quoted collation name>
-
-The command has an effect only on an empty database. Once it has been issued, the database can be opened in any JVM locale and will retain its collation.
-
-The property sql.compare_in_locale=true is no longer supported. If the line exists in a .properties file, it will switch the database to the collation for the current default.  
-
-----------------
-
-NAME RESOLUTION IN QUERIES
-
-Parsing enhancements allow all reserved SQL words to be used as identifiers when double-quoted and then used in queries. E.g. CREATE TABLE "TABLE" ("INTEGER" INTEGER)
-
-Enhancements to resolve column and table aliases used in query conditions.
-
-----------------
-
-ENHANCEMENTS
-
-Since 1.7.3, the evaluation of BOOLEAN expressions has changed to conform to SQL standards. Any such expression can be TRUE, FALSE, or UNDEFINED. The UNDEFINED result is equivalent to NULL.
-
-Optional changed behaviour of transactions in the default READ UNCOMMITTED mode. When a database property, sql.tx_no_multi_write=true has been set, a transaction is no longer allowed to delete or update a row that has already been updated or added by another uncommitted transaction.
-
-Support for correct casting of TIME into TIMESTAMP, using CURRENT_DATE 
-
-
-----------------
-
-BUG FIXES
-
-Fixed reported bug with NOT LIKE and null values
-
-Fixed bug with OR conditions in OUTER JOIN
-
-Fixed bug with duplicated closing of prepared statements
-
-Fixed various parsing anomalies where SQL commands were accepted when quoted, double-quoted or prefixed with an identifier, or identifiers were accepted in single quotes. Example of a command that is no-longer tolerated: 
-
-Malformed query: MY. "SELECT" ID FROM 'CUSTOMER' IF.WHERE ID=0;   
-Actual query: SELECT ID FROM CUSTOMER WHERE ID=0;
-
-Fixed issue with illegal user names
-
-Fixed TEXT table implementation to maintain the commit status of rows during recovery from an abrupt shutdown. Uncommitted changes will not appear in TEXT tables.
-
-----------------
-
-STORAGE AND PERSISTENCE IMPROVEMENTS
-
-New connection property for setting the default table type when CREATE TABLE is used. The connection property, hsqldb.default_table_type=cached will set the default to CACHED tables, or the SET PROPERTY command can be used. Values, "cached" and "memory" are allowed.
- 
-
-Improved support for text tables. Newline support in quoted fields is now complete. It is now possible to save and restore the first line header of a CSV file when ignore_first=true is specified. When a text table is created with a new source (CSV) file, and ignore_first=true has been specified the following command can be used to set a user defined string as the first line:
-SET TABLE <table name> SOURCE HEADER <double quoted string>.
-
-A new application log has been introduced as an optional feature. The property/value pair "hsqldb.applog=1" can be used in the first connection string to log some important messages. The default is "hsqldb.applog=0", meaning no logging. A file with the ending ".app.log" is generated alongside the rest of the database files for this purpose. 
-
-In the current version, only the classes used for file persistence, plus any error encountered while processing the .log file after an abnormal end, are logged.
-
-Note that the JDBC driver and the engine for 1.8.0 cannot be mixed with those of earlier versions in client/server setup. Check your classpaths and use the same version of the engine for both client and server.
-
-New property for larger data file limits is introduced. Once set, the limit will go up to 8GB. The property can be set with the following SQL command only when the database has no tables (new database).
-
-SET PROPERTY "hsqldb.cache_file_scale" 8
-
-To apply the change to an existing database, SHUTDOWN SCRIPT should be performed first, then the property=value line below should be added to the .properties file before reopening the database:
-
-hsqldb.cache_file_scale=8
-
-
-New property allows a CHECKPOINT DEFRAG to be performed automatically whenever CHECKPOINT is performed internally or via a user command.
-
-SET CHECKPOINT DEFRAG n
-
-The parameter n is the megabytes of abandoned space in the .data file. When a CHECKPOINT is performed either as a result of the .log file reaching the limit set by "SET LOGSIZE m", or by the user issuing a CHECKPOINT command, the amount of space abandoned during the session is checked and if it is larger than n, a CHECKPOINT DEFRAG is performed instead of a checkpoint.
-
-Rewrite of log and cache handling classes, including:
-New deleted block manager with more efficient deleted block reuse.
-Faster log processing after an abnormal termination.
-Better checks when maximum data file size is reached.
-Better recovery when maximum data file size is reached.
-
-Support for the res: connection protocol (database files in a jar) has been
-extended to allow CACHED tables.
-
-----------------
-
-JDBC AND OTHER ENHANCEMENTS
-
-ResultSetMetaData reports identical precision/scale in embedded and client/server modes
-
-When PreparedStatement.setTimestamp() and ResultSet.getTimestamp() are used with a Calendar parameter, the result is symmetrical if the time zones are equal.
-
-Added public shutdown() method to Server.
-
-Enhancements to DatabaseManagerSwing and SqlTool
-
-----------------
-
-BUG FIX
-
-Fixed bug where two indexes where switched, causing wrong results in some queries in the following circumstances:
-
-CREATE TABLE is executed.
-ALTER TABLE ADD FORIEGN KEY is used to create an FK on a different table that was already present when the first command was issued.
-CREATE INDEX is used to add an index.
-Data is added to the table.
-Database is shutdown.
-Database is restarted.
-At this point the indexes are switched and queries that use either of the indexes will not return the correct set of rows. If data is not added prior to the first shutdown, the database will works as normal.
-
-----------------
-
-UPGRADING DATABASES
-
-Databases that do not contain CACHED tables can be opened with the new version. For databases with CACHED tables, if they are created with versions 1.7.2 or 1.7.3, the SHUTDOWN SCRIPT command should be run once on the database prior to opening with the new version. For databases created with earlier versions, the instructions in the Advanced Topics section of The Guide should be followed.
-
-----------------
-
-OPEN OFFICE INTEGRATION
-
-When used in OpenOffice.org as the default database, several defaults and properties are set automatically:
-
-CREATE TABLE ... defaults to CREATE CACHED TABLE ...
-hsqldb.cache_scale=13
-hsqldb.cache_size_scale=8
-hsqldb.log_size=10
-SET WRITE DELAY 2
-sql.enforce_strict_size=true
-
-
-
diff --git a/plugins/org.eclipse.net4j.db.mysql/.project b/plugins/org.eclipse.net4j.db.mysql/.project
index 306afc02c4..1303d0283b 100644
--- a/plugins/org.eclipse.net4j.db.mysql/.project
+++ b/plugins/org.eclipse.net4j.db.mysql/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
index 3da4c6831c..f5e79eb60d 100644
--- a/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.db.mysql;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .,
  lib/mysql-connector-java-5.1.5-bin.jar
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.db;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+ org.eclipse.net4j.db;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Export-Package: com.mysql.jdbc;version="5.1.5",
  com.mysql.jdbc.exceptions;version="5.1.5",
  com.mysql.jdbc.exceptions.jdbc4;version="5.1.5",
@@ -20,7 +20,7 @@ Export-Package: com.mysql.jdbc;version="5.1.5",
  com.mysql.jdbc.log;version="5.1.5",
  com.mysql.jdbc.profiler;version="5.1.5",
  com.mysql.jdbc.util;version="5.1.5",
- org.eclipse.net4j.db.internal.mysql;version="1.0.0";x-internal:=true,
- org.eclipse.net4j.db.internal.mysql.bundle;version="1.0.0";x-internal:=true,
+ org.eclipse.net4j.db.internal.mysql;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.db.internal.mysql.bundle;version="2.0.0";x-internal:=true,
  org.gjt.mm.mysql;version="5.1.5"
 Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.tests/.project b/plugins/org.eclipse.net4j.db.tests/.project
index f5964fa8e1..f1fc78ac16 100644
--- a/plugins/org.eclipse.net4j.db.tests/.project
+++ b/plugins/org.eclipse.net4j.db.tests/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
index ffcd1dcbe8..ee319890e5 100644
--- a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.db.tests
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,7 +10,7 @@ Bundle-Activator: org.eclipse.net4j.db.tests.bundle.Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.tests;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.net4j.db.derby;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.db.tests;version="1.0.0"
+ org.eclipse.net4j.tests;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.db.derby;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Import-Package: org.apache.derby.jdbc
+Export-Package: org.eclipse.net4j.db.tests;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.db/.project b/plugins/org.eclipse.net4j.db/.project
index 12bb7c285e..3e4ad0ed9d 100644
--- a/plugins/org.eclipse.net4j.db/.project
+++ b/plugins/org.eclipse.net4j.db/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
index b42fb0dc5a..39940e6ef6 100644
--- a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.db;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.net4j.internal.db.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -10,13 +10,13 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.net4j.util;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.db;version="1.0.0",
- org.eclipse.net4j.db.ddl;version="1.0.0",
- org.eclipse.net4j.db.dml;version="1.0.0",
- org.eclipse.net4j.internal.db;version="1.0.0";x-internal:=true,
- org.eclipse.net4j.internal.db.bundle;version="1.0.0";x-internal:=true,
- org.eclipse.net4j.internal.db.ddl;version="1.0.0";x-internal:=true,
- org.eclipse.net4j.internal.db.dml;version="1.0.0";x-internal:=true,
- org.eclipse.net4j.spi.db;version="1.0.0"
+Export-Package: org.eclipse.net4j.db;version="2.0.0",
+ org.eclipse.net4j.db.ddl;version="2.0.0",
+ org.eclipse.net4j.db.dml;version="2.0.0",
+ org.eclipse.net4j.internal.db;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.internal.db.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.internal.db.ddl;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.internal.db.dml;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.spi.db;version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Eclipse-BuddyPolicy: registered
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBField.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBField.java
index bf0dbf92bb..26ba30d816 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBField.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBField.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.db.DBType;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IDBField extends IDBSchemaElement
 {
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBIndex.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBIndex.java
index ffe7a67106..6109793380 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBIndex.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBIndex.java
@@ -12,6 +12,7 @@ package org.eclipse.net4j.db.ddl;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IDBIndex extends IDBSchemaElement
 {
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBSchemaElement.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBSchemaElement.java
index d0eb709815..b84db31a5f 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBSchemaElement.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBSchemaElement.java
@@ -14,6 +14,7 @@ import java.util.Properties;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IDBSchemaElement
 {
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBTable.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBTable.java
index 35ac10baf2..fa312d1705 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBTable.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBTable.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.db.DBType;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IDBTable extends IDBSchemaElement
 {
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/IDBParameter.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/IDBParameter.java
index 9d7f4bb3de..343e79edd3 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/IDBParameter.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/IDBParameter.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.db.DBType;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IDBParameter
 {
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/IDBStatement.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/IDBStatement.java
index 2de389a020..46eabfad69 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/IDBStatement.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/IDBStatement.java
@@ -16,6 +16,7 @@ import org.eclipse.net4j.db.ddl.IDBSchemaElement;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IDBStatement
 {
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBField.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBField.java
index 5e59091b0f..214464c929 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBField.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBField.java
@@ -13,6 +13,7 @@ package org.eclipse.net4j.internal.db.ddl;
 import org.eclipse.net4j.db.DBType;
 import org.eclipse.net4j.db.ddl.IDBField;
 import org.eclipse.net4j.db.ddl.IDBSchema;
+import org.eclipse.net4j.spi.db.DBSchemaElement;
 
 /**
  * @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java
index 62c8912b9d..a65b24fa74 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java
@@ -13,6 +13,7 @@ package org.eclipse.net4j.internal.db.ddl;
 import org.eclipse.net4j.db.ddl.IDBField;
 import org.eclipse.net4j.db.ddl.IDBIndex;
 import org.eclipse.net4j.db.ddl.IDBSchema;
+import org.eclipse.net4j.spi.db.DBSchemaElement;
 
 /**
  * @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBTable.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBTable.java
index dc62b423ba..26565f8b3c 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBTable.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBTable.java
@@ -17,6 +17,7 @@ import org.eclipse.net4j.db.ddl.IDBIndex;
 import org.eclipse.net4j.db.ddl.IDBTable;
 import org.eclipse.net4j.db.ddl.IDBIndex.Type;
 import org.eclipse.net4j.spi.db.DBSchema;
+import org.eclipse.net4j.spi.db.DBSchemaElement;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
index e9d9e57cb9..56812fd9a0 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
@@ -18,8 +18,6 @@ import org.eclipse.net4j.db.ddl.IDBField;
 import org.eclipse.net4j.db.ddl.IDBIndex;
 import org.eclipse.net4j.db.ddl.IDBTable;
 import org.eclipse.net4j.internal.db.bundle.OM;
-import org.eclipse.net4j.internal.db.ddl.DBField;
-import org.eclipse.net4j.internal.db.ddl.DBIndex;
 import org.eclipse.net4j.internal.db.ddl.DBTable;
 import org.eclipse.net4j.util.om.trace.ContextTracer;
 
@@ -242,7 +240,10 @@ public abstract class DBAdapter implements IDBAdapter
     return getName() + "-" + getVersion();
   }
 
-  protected void doCreateTable(DBTable table, Statement statement) throws SQLException
+  /**
+   * @since 2.0
+   */
+  protected void doCreateTable(IDBTable table, Statement statement) throws SQLException
   {
     StringBuilder builder = new StringBuilder();
     builder.append("CREATE TABLE ");
@@ -265,16 +266,19 @@ public abstract class DBAdapter implements IDBAdapter
 
     statement.execute(sql);
 
-    DBIndex[] indices = table.getIndices();
+    IDBIndex[] indices = table.getIndices();
     for (int i = 0; i < indices.length; i++)
     {
       createIndex(indices[i], statement, i);
     }
   }
 
-  protected void createIndex(DBIndex index, Statement statement, int num) throws SQLException
+  /**
+   * @since 2.0
+   */
+  protected void createIndex(IDBIndex index, Statement statement, int num) throws SQLException
   {
-    DBTable table = index.getTable();
+    IDBTable table = index.getTable();
     StringBuilder builder = new StringBuilder();
     builder.append("CREATE ");
     if (index.getType() == IDBIndex.Type.UNIQUE)
@@ -314,12 +318,18 @@ public abstract class DBAdapter implements IDBAdapter
     builder.append(field);
   }
 
-  protected String createConstraints(DBTable table)
+  /**
+   * @since 2.0
+   */
+  protected String createConstraints(IDBTable table)
   {
     return null;
   }
 
-  protected String createFieldDefinition(DBField field)
+  /**
+   * @since 2.0
+   */
+  protected String createFieldDefinition(IDBField field)
   {
     return getTypeName(field) + (field.isNotNull() ? " NOT NULL" : "");
   }
@@ -413,7 +423,10 @@ public abstract class DBAdapter implements IDBAdapter
     return reservedWords.contains(word);
   }
 
-  protected void validateTable(DBTable table, Statement statement) throws DBException
+  /**
+   * @since 2.0
+   */
+  protected void validateTable(IDBTable table, Statement statement) throws DBException
   {
     try
     {
@@ -439,15 +452,15 @@ public abstract class DBAdapter implements IDBAdapter
     }
   }
 
-  private String[] createFieldDefinitions(DBTable table)
+  private String[] createFieldDefinitions(IDBTable table)
   {
-    DBField[] fields = table.getFields();
+    IDBField[] fields = table.getFields();
     int fieldCount = fields.length;
 
     String[] result = new String[fieldCount];
     for (int i = 0; i < fieldCount; i++)
     {
-      DBField field = fields[i];
+      IDBField field = fields[i];
       result[i] = createFieldDefinition(field);
     }
 
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBSchema.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBSchema.java
index 7d8dc8f5f2..23ccc266d4 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBSchema.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBSchema.java
@@ -17,7 +17,6 @@ import org.eclipse.net4j.db.IDBConnectionProvider;
 import org.eclipse.net4j.db.IDBRowHandler;
 import org.eclipse.net4j.db.ddl.IDBSchema;
 import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.db.ddl.DBSchemaElement;
 import org.eclipse.net4j.internal.db.ddl.DBTable;
 
 import javax.sql.DataSource;
@@ -60,7 +59,10 @@ public class DBSchema extends DBSchemaElement implements IDBSchema
     return name;
   }
 
-  public DBTable addTable(String name) throws DBException
+  /**
+   * @since 2.0
+   */
+  public IDBTable addTable(String name) throws DBException
   {
     assertUnlocked();
     if (tables.containsKey(name))
@@ -73,12 +75,18 @@ public class DBSchema extends DBSchemaElement implements IDBSchema
     return table;
   }
 
-  public DBTable getTable(String name)
+  /**
+   * @since 2.0
+   */
+  public IDBTable getTable(String name)
   {
     return tables.get(name);
   }
 
-  public DBTable[] getTables()
+  /**
+   * @since 2.0
+   */
+  public IDBTable[] getTables()
   {
     return tables.values().toArray(new DBTable[tables.size()]);
   }
@@ -145,13 +153,13 @@ public class DBSchema extends DBSchemaElement implements IDBSchema
 
   public void export(Connection connection, PrintStream out) throws DBException
   {
-    for (DBTable table : getTables())
+    for (IDBTable table : getTables())
     {
       export(table, connection, out);
     }
   }
 
-  private void export(final DBTable table, Connection connection, final PrintStream out)
+  private void export(final IDBTable table, Connection connection, final PrintStream out)
   {
     if (DBUtil.select(connection, new IDBRowHandler()
     {
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchemaElement.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBSchemaElement.java
index 69d130e61f..f634844818 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchemaElement.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBSchemaElement.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  **************************************************************************/
-package org.eclipse.net4j.internal.db.ddl;
+package org.eclipse.net4j.spi.db;
 
 import org.eclipse.net4j.db.ddl.IDBSchemaElement;
 
@@ -16,6 +16,7 @@ import java.util.Properties;
 
 /**
  * @author Eike Stepper
+ * @since 2.0
  */
 public abstract class DBSchemaElement implements IDBSchemaElement
 {
diff --git a/plugins/org.eclipse.net4j.debug/.project b/plugins/org.eclipse.net4j.debug/.project
index 6a5e8b15db..5023f97e18 100644
--- a/plugins/org.eclipse.net4j.debug/.project
+++ b/plugins/org.eclipse.net4j.debug/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.examples/.project b/plugins/org.eclipse.net4j.examples/.project
index bec30c77a8..1645771dd7 100644
--- a/plugins/org.eclipse.net4j.examples/.project
+++ b/plugins/org.eclipse.net4j.examples/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF
index 18737455bc..cf813513c0 100644
--- a/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.examples;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.net4j.internal.examples.bundle.OM$Activator
@@ -9,7 +9,6 @@ Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
- org.eclipse.net4j;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.net4j.tcp;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.net4j.jvm;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+ org.eclipse.net4j.tcp;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.jvm;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.http.common/.project b/plugins/org.eclipse.net4j.http.common/.project
index 7cee278a2b..28ed6737b3 100644
--- a/plugins/org.eclipse.net4j.http.common/.project
+++ b/plugins/org.eclipse.net4j.http.common/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF
index c7fb87ad72..d0c01998bf 100644
--- a/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.http.common
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,7 +10,7 @@ Bundle-Activator: org.eclipse.net4j.http.internal.common.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
- org.eclipse.net4j;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.http.common;version="1.0.0";uses:="org.eclipse.net4j.connector",
- org.eclipse.net4j.http.internal.common;version="1.0.0";x-friends:="org.eclipse.net4j.http,org.eclipse.net4j.http.server,org.eclipse.net4j.http.tests",
- org.eclipse.net4j.http.internal.common.bundle;version="1.0.0";x-friends:="org.eclipse.net4j.http,org.eclipse.net4j.http.server,org.eclipse.net4j.http.tests"
+ org.eclipse.net4j;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.net4j.http.common;version="2.0.0";uses:="org.eclipse.net4j.connector",
+ org.eclipse.net4j.http.internal.common;version="2.0.0";x-friends:="org.eclipse.net4j.http,org.eclipse.net4j.http.server,org.eclipse.net4j.http.tests",
+ org.eclipse.net4j.http.internal.common.bundle;version="2.0.0";x-friends:="org.eclipse.net4j.http,org.eclipse.net4j.http.server,org.eclipse.net4j.http.tests"
diff --git a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/IHTTPConnector.java b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/IHTTPConnector.java
index 2634bb284e..95ec644acd 100644
--- a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/IHTTPConnector.java
+++ b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/IHTTPConnector.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.connector.IConnector;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IHTTPConnector extends IConnector
 {
diff --git a/plugins/org.eclipse.net4j.http.server/.project b/plugins/org.eclipse.net4j.http.server/.project
index 36ca72f978..02717b0f62 100644
--- a/plugins/org.eclipse.net4j.http.server/.project
+++ b/plugins/org.eclipse.net4j.http.server/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF
index bd15108981..d8d90c853e 100644
--- a/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.http.server;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,10 +10,10 @@ Bundle-Activator: org.eclipse.net4j.http.internal.server.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
- org.eclipse.net4j.http.common;bundle-version="0.8.0",
+ org.eclipse.net4j.http.common;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.equinox.http.registry;bundle-version="[1.0.0,2.0.0)"
 Import-Package: javax.servlet;version="[2.4.0,3.0.0)",
  javax.servlet.http;version="[2.4.0,3.0.0)"
-Export-Package: org.eclipse.net4j.http.internal.server;version="1.0.0";x-friends:="org.eclipse.net4j.http.tests",
- org.eclipse.net4j.http.internal.server.bundle;version="1.0.0";x-internal:=true,
- org.eclipse.net4j.http.server;version="1.0.0"
+Export-Package: org.eclipse.net4j.http.internal.server;version="2.0.0";x-friends:="org.eclipse.net4j.http.tests",
+ org.eclipse.net4j.http.internal.server.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.http.server;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/IHTTPAcceptor.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/IHTTPAcceptor.java
index 458f554f73..8e5396e362 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/IHTTPAcceptor.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/IHTTPAcceptor.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.acceptor.IAcceptor;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IHTTPAcceptor extends IAcceptor
 {
diff --git a/plugins/org.eclipse.net4j.http.tests/.project b/plugins/org.eclipse.net4j.http.tests/.project
index 2bac15bb38..8584627ceb 100644
--- a/plugins/org.eclipse.net4j.http.tests/.project
+++ b/plugins/org.eclipse.net4j.http.tests/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.http.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http.tests/META-INF/MANIFEST.MF
index 465c9db05d..0bfb69cc39 100644
--- a/plugins/org.eclipse.net4j.http.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.http.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.http.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,11 +10,11 @@ Bundle-Activator: org.eclipse.net4j.internal.http.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
- org.eclipse.net4j.tests;bundle-version="0.8.0";visibility:=reexport,
- org.eclipse.net4j.http;bundle-version="0.8.0",
- org.eclipse.net4j.http.server;bundle-version="0.8.0"
+ org.eclipse.net4j.tests;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.http;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.net4j.http.server;bundle-version="[1.0.0,3.0.0)"
 Import-Package: javax.servlet;version="2.4.0",
  javax.servlet.http;version="2.4.0",
  org.apache.commons.httpclient;version="3.0.1",
  org.apache.commons.httpclient.methods;version="3.0.1"
-Export-Package: org.eclipse.net4j.http.tests;version="1.0.0"
+Export-Package: org.eclipse.net4j.http.tests;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.http/.project b/plugins/org.eclipse.net4j.http/.project
index 005ba052cf..ccc2f21d51 100644
--- a/plugins/org.eclipse.net4j.http/.project
+++ b/plugins/org.eclipse.net4j.http/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
index 87bc52f0c1..f2dc9fec1d 100644
--- a/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.http;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,9 +10,9 @@ Bundle-Activator: org.eclipse.net4j.internal.http.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
- org.eclipse.net4j.http.common;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+ org.eclipse.net4j.http.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Import-Package: org.apache.commons.httpclient;version="[3.0.0,4.0.0)",
  org.apache.commons.httpclient.methods;version="[3.0.0,4.0.0)"
-Export-Package: org.eclipse.net4j.http;version="1.0.0",
- org.eclipse.net4j.internal.http;version="1.0.0";x-friends:="org.eclipse.net4j.http.tests",
- org.eclipse.net4j.internal.http.bundle;version="1.0.0";x-internal:=true
+Export-Package: org.eclipse.net4j.http;version="2.0.0",
+ org.eclipse.net4j.internal.http;version="2.0.0";x-friends:="org.eclipse.net4j.http.tests",
+ org.eclipse.net4j.internal.http.bundle;version="2.0.0";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/IHTTPConnector.java b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/IHTTPConnector.java
index 0927c1b1c6..eb4e71415d 100644
--- a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/IHTTPConnector.java
+++ b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/IHTTPConnector.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.connector.IConnector;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IHTTPConnector extends IConnector
 {
diff --git a/plugins/org.eclipse.net4j.jms.admin/.project b/plugins/org.eclipse.net4j.jms.admin/.project
index c7af87ed59..cd51dd91dc 100644
--- a/plugins/org.eclipse.net4j.jms.admin/.project
+++ b/plugins/org.eclipse.net4j.jms.admin/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
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 300826359b..0c3538bcc5 100644
--- a/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jms.admin
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.net4j.jms.internal.admin.bundle.OM
@@ -9,8 +9,8 @@ Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.jms;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.jms.admin;version="1.0.0",
- org.eclipse.net4j.jms.internal.admin;version="1.0.0",
- org.eclipse.net4j.jms.internal.admin.protocol;version="1.0.0"
+ org.eclipse.net4j.jms;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.net4j.jms.admin;version="2.0.0",
+ org.eclipse.net4j.jms.internal.admin;version="2.0.0",
+ org.eclipse.net4j.jms.internal.admin.protocol;version="2.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.jms.api/.project b/plugins/org.eclipse.net4j.jms.api/.project
index 023ba4d7d8..56ae1a5dac 100644
--- a/plugins/org.eclipse.net4j.jms.api/.project
+++ b/plugins/org.eclipse.net4j.jms.api/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/.project b/plugins/org.eclipse.net4j.jms.server.jdbc/.project
index afc317d56b..233ef1631e 100644
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/.project
+++ b/plugins/org.eclipse.net4j.jms.server.jdbc/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
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 b07dee2eb8..d9ca2b7345 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
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jms.server.jdbc
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,8 +10,8 @@ Bundle-Activator: org.eclipse.net4j.jms.server.internal.jdbc.bundle.OM
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.jms.server;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.net4j.db;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+ org.eclipse.net4j.jms.server;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.db;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Import-Package: javax.jms;version="1.1.0"
-Export-Package: org.eclipse.net4j.jms.server.internal.jdbc;version="1.0.0",
- org.eclipse.net4j.jms.server.jdbc;version="1.0.0"
+Export-Package: org.eclipse.net4j.jms.server.internal.jdbc;version="2.0.0",
+ org.eclipse.net4j.jms.server.jdbc;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.jms.server/.project b/plugins/org.eclipse.net4j.jms.server/.project
index 8bbd7f899a..11a9955939 100644
--- a/plugins/org.eclipse.net4j.jms.server/.project
+++ b/plugins/org.eclipse.net4j.jms.server/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
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 325d678237..1cc4e42544 100644
--- a/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jms.server
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,10 +10,10 @@ Bundle-Activator: org.eclipse.net4j.jms.internal.server.bundle.OM
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.jms;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+ org.eclipse.net4j.jms;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Import-Package: javax.jms;version="1.1.0"
-Export-Package: org.eclipse.net4j.jms.internal.server;version="1.0.0",
- org.eclipse.net4j.jms.internal.server.protocol;version="1.0.0",
- org.eclipse.net4j.jms.internal.server.protocol.admin;version="1.0.0",
- org.eclipse.net4j.jms.internal.server.store;version="1.0.0",
- org.eclipse.net4j.jms.server;version="1.0.0"
+Export-Package: org.eclipse.net4j.jms.internal.server;version="2.0.0",
+ org.eclipse.net4j.jms.internal.server.protocol;version="2.0.0",
+ org.eclipse.net4j.jms.internal.server.protocol.admin;version="2.0.0",
+ org.eclipse.net4j.jms.internal.server.store;version="2.0.0",
+ org.eclipse.net4j.jms.server;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.jms.tests/.project b/plugins/org.eclipse.net4j.jms.tests/.project
index 417871d1db..5fe1cbd75d 100644
--- a/plugins/org.eclipse.net4j.jms.tests/.project
+++ b/plugins/org.eclipse.net4j.jms.tests/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF
index 36a05fa028..90d95199d7 100644
--- a/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.jms.tests
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.tcp;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.net4j.jms;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.net4j.jms.admin;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.net4j.jms.server;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.net4j.jms.server.jdbc;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.net4j.tcp;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.net4j.jms;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.net4j.jms.admin;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.net4j.jms.server;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.net4j.jms.server.jdbc;bundle-version="[2.0.0,3.0.0)"
 Import-Package: javax.jms;version="1.1.0"
diff --git a/plugins/org.eclipse.net4j.jms/.project b/plugins/org.eclipse.net4j.jms/.project
index d71302b1e7..7f1a4910ad 100644
--- a/plugins/org.eclipse.net4j.jms/.project
+++ b/plugins/org.eclipse.net4j.jms/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
index 9b85abdc50..d64d388725 100644
--- a/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jms
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,9 +10,9 @@ Bundle-Activator: org.eclipse.net4j.internal.jms.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+ org.eclipse.net4j;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Import-Package: javax.jms;version="1.1.0"
-Export-Package: org.eclipse.net4j.internal.jms;version="1.0.0",
- org.eclipse.net4j.internal.jms.protocol;version="1.0.0",
- org.eclipse.net4j.internal.jms.util;version="1.0.0",
- org.eclipse.net4j.jms;version="1.0.0"
+Export-Package: org.eclipse.net4j.internal.jms;version="2.0.0",
+ org.eclipse.net4j.internal.jms.protocol;version="2.0.0",
+ org.eclipse.net4j.internal.jms.util;version="2.0.0",
+ org.eclipse.net4j.jms;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.jvm/.project b/plugins/org.eclipse.net4j.jvm/.project
index 7faa074437..80100480fb 100644
--- a/plugins/org.eclipse.net4j.jvm/.project
+++ b/plugins/org.eclipse.net4j.jvm/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
index 34a133faef..1f162805c3 100644
--- a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jvm;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,8 +10,8 @@ Bundle-Activator: org.eclipse.net4j.internal.jvm.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
- org.eclipse.net4j;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+ org.eclipse.net4j;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Import-Package: org.osgi.framework;version="1.3.0";resolution:=optional
-Export-Package: org.eclipse.net4j.internal.jvm;version="1.0.0";x-internal:=true,
- org.eclipse.net4j.internal.jvm.bundle;version="1.0.0";x-internal:=true,
- org.eclipse.net4j.jvm;version="1.0.0"
+Export-Package: org.eclipse.net4j.internal.jvm;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.internal.jvm.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.jvm;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java
index 0e00d519de..f9f2434bee 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.acceptor.IAcceptor;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IJVMAcceptor extends IAcceptor
 {
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptorManager.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptorManager.java
index 039f320afe..39f057173c 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptorManager.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptorManager.java
@@ -15,6 +15,7 @@ import org.eclipse.net4j.util.registry.IRegistry;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IJVMAcceptorManager
 {
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java
index 877c88c5e1..45cdc4b509 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.connector.IConnector;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IJVMConnector extends IConnector
 {
diff --git a/plugins/org.eclipse.net4j.tcp/.project b/plugins/org.eclipse.net4j.tcp/.project
index 43df6e8d96..e461e449a4 100644
--- a/plugins/org.eclipse.net4j.tcp/.project
+++ b/plugins/org.eclipse.net4j.tcp/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
index fcf8ff33dd..524f3416be 100644
--- a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.tcp;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,8 +10,8 @@ Bundle-Activator: org.eclipse.net4j.internal.tcp.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
- org.eclipse.net4j;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+ org.eclipse.net4j;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Import-Package: org.osgi.framework;version="1.3.0";resolution:=optional
-Export-Package: org.eclipse.net4j.internal.tcp;version="1.0.0";x-friends:="org.eclipse.net4j.tests",
- org.eclipse.net4j.internal.tcp.bundle;version="1.0.0";x-internal:=true,
- org.eclipse.net4j.tcp;version="1.0.0"
+Export-Package: org.eclipse.net4j.internal.tcp;version="2.0.0";x-friends:="org.eclipse.net4j.tests",
+ org.eclipse.net4j.internal.tcp.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.tcp;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java
index bb965573d8..036bf0d14c 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.acceptor.IAcceptor;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ITCPAcceptor extends IAcceptor
 {
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java
index 91c7c4f843..9b800bb943 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.connector.IConnector;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ITCPConnector extends IConnector
 {
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPPassiveSelectorListener.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPPassiveSelectorListener.java
index caf1662399..ec075d5a74 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPPassiveSelectorListener.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPPassiveSelectorListener.java
@@ -14,6 +14,7 @@ import java.nio.channels.ServerSocketChannel;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ITCPPassiveSelectorListener
 {
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelector.java
index 34e19f0491..481047e47b 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelector.java
@@ -17,6 +17,7 @@ import java.nio.channels.SocketChannel;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ITCPSelector
 {
diff --git a/plugins/org.eclipse.net4j.tests/.project b/plugins/org.eclipse.net4j.tests/.project
index 513e06956d..68a2fd1e45 100644
--- a/plugins/org.eclipse.net4j.tests/.project
+++ b/plugins/org.eclipse.net4j.tests/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
index 7a49e5b270..b2258482a9 100644
--- a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,10 +10,10 @@ Bundle-Activator: org.eclipse.net4j.tests.bundle.Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.tcp;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.net4j.jvm;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.net4j.tcp;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.jvm;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.junit;bundle-version="[3.8.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.tests;version="1.0.0",
- org.eclipse.net4j.tests.signal;version="1.0.0",
- org.eclipse.net4j.util.tests;version="1.0.0",
- org.eclipse.net4j.util.tests.cache;version="1.0.0"
+Export-Package: org.eclipse.net4j.tests;version="2.0.0",
+ org.eclipse.net4j.tests.signal;version="2.0.0",
+ org.eclipse.net4j.util.tests;version="2.0.0",
+ org.eclipse.net4j.util.tests.cache;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.ui/.project b/plugins/org.eclipse.net4j.ui/.project
index c015ab0a94..f38e1dd362 100644
--- a/plugins/org.eclipse.net4j.ui/.project
+++ b/plugins/org.eclipse.net4j.ui/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
index 365862e5eb..f61e71fa78 100644
--- a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,7 +10,7 @@ Bundle-Activator: org.eclipse.net4j.internal.ui.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.net4j.util.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.internal.ui;version="1.0.0",
- org.eclipse.net4j.internal.ui.views;version="1.0.0"
+ org.eclipse.net4j;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.util.ui;bundle-version="[1.0.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.net4j.internal.ui;version="2.0.0",
+ org.eclipse.net4j.internal.ui.views;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.util.ui/.project b/plugins/org.eclipse.net4j.util.ui/.project
index a10d2cbd97..d40581cd1f 100644
--- a/plugins/org.eclipse.net4j.util.ui/.project
+++ b/plugins/org.eclipse.net4j.util.ui/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.util/.project b/plugins/org.eclipse.net4j.util/.project
index b52e9e4cf3..43c2e097ed 100644
--- a/plugins/org.eclipse.net4j.util/.project
+++ b/plugins/org.eclipse.net4j.util/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/WrappedException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/WrappedException.java
index e847ef302b..c2e8dbf556 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/WrappedException.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/WrappedException.java
@@ -10,9 +10,11 @@
  **************************************************************************/
 package org.eclipse.net4j.util;
 
+/* 
+ *TODO Handle IORuntimeException
+ */
+
 /**
- * TODO Handle IORuntimeException
- * 
  * @author Eike Stepper
  */
 public class WrappedException extends RuntimeException
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IPluginContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IPluginContainer.java
index 444ed5185e..e8926e497a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IPluginContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IPluginContainer.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.internal.util.container.PluginContainer;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IPluginContainer extends IManagedContainer
 {
diff --git a/plugins/org.eclipse.net4j/.project b/plugins/org.eclipse.net4j/.project
index fd0305df1a..3e2d7eaf6f 100644
--- a/plugins/org.eclipse.net4j/.project
+++ b/plugins/org.eclipse.net4j/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
index 88779e6f5c..2c658b35f1 100644
--- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,8 +11,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
  org.eclipse.net4j.util;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.internal.net4j;version="1.0.0";x-internal:=true,
- org.eclipse.internal.net4j.acceptor;version="1.0.0";
+Export-Package: org.eclipse.internal.net4j;version="2.0.0";x-internal:=true,
+ org.eclipse.internal.net4j.acceptor;version="2.0.0";
   x-friends:="org.eclipse.net4j.http.server,
    org.eclipse.net4j.jvm,
    org.eclipse.net4j.tcp,
@@ -20,9 +20,9 @@ Export-Package: org.eclipse.internal.net4j;version="1.0.0";x-internal:=true,
    org.eclipse.net4j.http.common,
    org.eclipse.net4j.http.tests,
    org.eclipse.net4j.tests",
- org.eclipse.internal.net4j.buffer;version="1.0.0";x-friends:="org.eclipse.net4j.tcp",
- org.eclipse.internal.net4j.bundle;version="1.0.0";x-internal:=true,
- org.eclipse.internal.net4j.channel;version="1.0.0";
+ org.eclipse.internal.net4j.buffer;version="2.0.0";x-friends:="org.eclipse.net4j.tcp",
+ org.eclipse.internal.net4j.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.internal.net4j.channel;version="2.0.0";
   x-friends:="org.eclipse.net4j.http,
    org.eclipse.net4j.http.common,
    org.eclipse.net4j.http.server,
@@ -30,7 +30,7 @@ Export-Package: org.eclipse.internal.net4j;version="1.0.0";x-internal:=true,
    org.eclipse.net4j.http.tests,
    org.eclipse.net4j.tests,
    org.eclipse.net4j.jvm",
- org.eclipse.internal.net4j.connector;version="1.0.0";
+ org.eclipse.internal.net4j.connector;version="2.0.0";
   x-friends:="org.eclipse.net4j.http,
    org.eclipse.net4j.http.common,
    org.eclipse.net4j.http.server,
@@ -38,13 +38,13 @@ Export-Package: org.eclipse.internal.net4j;version="1.0.0";x-internal:=true,
    org.eclipse.net4j.tcp,
    org.eclipse.net4j.http.tests,
    org.eclipse.net4j.tests",
- org.eclipse.net4j;version="1.0.0",
- org.eclipse.net4j.acceptor;version="1.0.0",
- org.eclipse.net4j.buffer;version="1.0.0",
- org.eclipse.net4j.channel;version="1.0.0",
- org.eclipse.net4j.connector;version="1.0.0",
- org.eclipse.net4j.protocol;version="1.0.0",
- org.eclipse.net4j.signal;version="1.0.0",
- org.eclipse.net4j.signal.failover;version="1.0.0",
- org.eclipse.net4j.signal.wrapping;version="1.0.0",
+ org.eclipse.net4j;version="2.0.0",
+ org.eclipse.net4j.acceptor;version="2.0.0",
+ org.eclipse.net4j.buffer;version="2.0.0",
+ org.eclipse.net4j.channel;version="2.0.0",
+ org.eclipse.net4j.connector;version="2.0.0",
+ org.eclipse.net4j.protocol;version="2.0.0",
+ org.eclipse.net4j.signal;version="2.0.0",
+ org.eclipse.net4j.signal.failover;version="2.0.0",
+ org.eclipse.net4j.signal.wrapping;version="2.0.0",
  org.eclipse.spi.net4j
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jTransportInjector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jTransportInjector.java
index 6b4922e1b9..0a07162ab0 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jTransportInjector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jTransportInjector.java
@@ -10,12 +10,12 @@
  **************************************************************************/
 package org.eclipse.net4j;
 
+import org.eclipse.net4j.buffer.IBufferProvider;
 import org.eclipse.net4j.util.container.IElementProcessor;
 import org.eclipse.net4j.util.container.IManagedContainer;
 import org.eclipse.net4j.util.security.INegotiator;
 
 import org.eclipse.internal.net4j.ExecutorServiceFactory;
-import org.eclipse.internal.net4j.buffer.BufferProvider;
 import org.eclipse.internal.net4j.buffer.BufferProviderFactory;
 
 import org.eclipse.spi.net4j.InternalAcceptor;
@@ -111,9 +111,12 @@ public class Net4jTransportInjector implements IElementProcessor
     }
   }
 
-  protected BufferProvider getBufferProvider(IManagedContainer container)
+  /**
+   * @since 2.0
+   */
+  protected IBufferProvider getBufferProvider(IManagedContainer container)
   {
-    return (BufferProvider)container.getElement(BufferProviderFactory.PRODUCT_GROUP, BufferProviderFactory.TYPE, null);
+    return (IBufferProvider)container.getElement(BufferProviderFactory.PRODUCT_GROUP, BufferProviderFactory.TYPE, null);
   }
 
   protected ExecutorService getExecutorService(IManagedContainer container)
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBuffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBuffer.java
index ec6075929c..ed06b8fca0 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBuffer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBuffer.java
@@ -67,6 +67,7 @@ import java.nio.channels.SocketChannel;
  * @see IChannel#setReceiveHandler(IBufferHandler)
  * @see IBufferHandler#handleBuffer(IBuffer)
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IBuffer
 {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java
index 1663c0ca02..231f46d567 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java
@@ -56,6 +56,7 @@ import org.eclipse.net4j.util.event.INotifier;
  * (IChannel)element; channel.setReceiveHandler(receiveHandler); } }); </pre>
  * 
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IChannel extends IBufferHandler, INotifier
 {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorStateEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorStateEvent.java
index 4dc5699eae..feff6484ed 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorStateEvent.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorStateEvent.java
@@ -14,6 +14,7 @@ package org.eclipse.net4j.connector;
  * An event that is fired by an {@link IConnector} to indicate that its state has changed.
  * 
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IConnectorStateEvent extends IConnectorEvent
 {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverEvent.java
index dfd174a8ff..5362572382 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverEvent.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverEvent.java
@@ -16,6 +16,7 @@ import org.eclipse.net4j.util.event.IEvent;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IFailOverEvent extends IEvent
 {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/InternalBuffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/InternalBuffer.java
index aed3ad8d9d..0ac200f168 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/InternalBuffer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/InternalBuffer.java
@@ -15,6 +15,7 @@ import org.eclipse.net4j.buffer.IBufferProvider;
 
 /**
  * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface InternalBuffer extends IBuffer
 {