[Releng] Remove @apiviz tags

197 files changed, 22 insertions, 452 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonRepository.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonRepository.java
index a6c0b45163..649e268294 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonRepository.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonRepository.java
@@ -35,12 +35,6 @@ import java.util.Set;
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link CDOCommonRepository.IDGenerationLocation}
- * @apiviz.has {@link CDOCommonRepository.Type}
- * @apiviz.has {@link CDOCommonRepository.State}
- * @apiviz.uses {@link CDOCommonRepository.TypeChangedEvent} - - fires
- * @apiviz.uses {@link CDOCommonRepository.StateChangedEvent} - - fires
  */
 public interface CDOCommonRepository extends CDOTimeProvider, IAdaptable
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonSession.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonSession.java
index 490cfab1a7..97f96504d4 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonSession.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonSession.java
@@ -26,10 +26,6 @@ import org.eclipse.core.runtime.IAdaptable;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.composedOf {@link CDOCommonView} - - views
- * @apiviz.has {@link CDOCommonSession.Options}
- * @apiviz.uses {@link CDOCommonRepository} - - connectsTo
  */
 public interface CDOCommonSession extends IAdaptable, IUserAware, IOptionsContainer, IPropertiesContainer, Closeable
 {
@@ -50,8 +46,6 @@ public interface CDOCommonSession extends IAdaptable, IUserAware, IOptionsContai
    * @author Simon McDuff
    * @noextend This interface is not intended to be extended by clients.
    * @noimplement This interface is not intended to be implemented by clients.
-   * @apiviz.has CDOCommonSession.Options.PassiveUpdateMode
-   * @apiviz.has CDOCommonSession.Options.LockNotificationMode
    */
   public interface Options extends IOptions
   {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonTransaction.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonTransaction.java
index 012508afd0..d46d3ea7cf 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonTransaction.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonTransaction.java
@@ -17,7 +17,6 @@ package org.eclipse.emf.cdo.common;
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
  */
 public interface CDOCommonTransaction extends CDOCommonView
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java
index 80dbbe820f..78f222ec09 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java
@@ -31,8 +31,6 @@ import org.eclipse.core.runtime.IAdaptable;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link CDOCommonView.Options}
  */
 public interface CDOCommonView extends CDOLockOwner, CDOBranchPoint, CDORevisionProvider, IOptionsContainer, IPropertiesContainer, IAdaptable, Closeable
 {
@@ -69,7 +67,6 @@ public interface CDOCommonView extends CDOLockOwner, CDOBranchPoint, CDORevision
    * @noextend This interface is not intended to be extended by clients.
    * @noimplement This interface is not intended to be implemented by clients.
    * @since 4.1
-   * @apiviz.uses {@link CDOCommonView.Options.LockNotificationEvent} - - fires
    */
   public interface Options extends IOptions
   {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
index bd1c6d5797..6e57c774da 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
@@ -35,9 +35,6 @@ import org.eclipse.core.runtime.IAdaptable;
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link CDOBranchPoint} oneway - - base
- * @apiviz.composedOf {@link CDOBranch} - - subBranches
  */
 public interface CDOBranch extends CDOBranchPoint, CDONameProvider, IContainer<CDOBranch>, Comparable<CDOBranch>, IAdaptable
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchHandler.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchHandler.java
index 7f2d031f81..2fc67e7015 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchHandler.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchHandler.java
@@ -16,7 +16,6 @@ package org.eclipse.emf.cdo.common.branch;
  * @see CDOBranchManager#getBranches(int, int, CDOBranchHandler)
  * @author Eike Stepper
  * @since 3.0
- * @apiviz.uses {@link CDOBranch} - - handles
  */
 public interface CDOBranchHandler
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchManager.java
index c043df08b0..d1f0660c17 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchManager.java
@@ -37,9 +37,6 @@ import org.eclipse.net4j.util.event.INotifier;
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link CDOBranch} oneway - - mainBranch
- * @apiviz.uses {@link CDOBranchChangedEvent} - - fires
  */
 public interface CDOBranchManager extends INotifier
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.java
index 4f0c0d35f9..1ec80838a8 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.java
@@ -27,7 +27,6 @@ import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil;
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.has {@link CDOBranch}
  */
 public interface CDOBranchPoint extends CDOBranchProvider, CDOTimeProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.java
index aad943519a..20a63e1f06 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.java
@@ -27,8 +27,6 @@ import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil;
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.has {@link CDOBranchPoint} oneway - - start
- * @apiviz.has {@link CDOBranchPoint} oneway - - end
  */
 public interface CDOBranchPointRange
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.java
index 0784b9290b..229ebcf323 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.java
@@ -27,7 +27,6 @@ import org.eclipse.emf.cdo.common.util.CDOVersionProvider;
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.has {@link CDOBranch}
  */
 public interface CDOBranchVersion extends CDOBranchProvider, CDOVersionProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/package-info.java
index 6d4ad42c0a..e7ba00b296 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/package-info.java
@@ -7,9 +7,5 @@
 
 /**
  * Common concepts for dealing with branches.
- *
- * @apiviz.exclude .*\.IContainer
- * @apiviz.exclude .*\.INotifier
- * @apiviz.exclude .*Event
  */
 package org.eclipse.emf.cdo.common.branch;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeKindProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeKindProvider.java
index 3481da8aed..90b4d6f94a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeKindProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeKindProvider.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.cdo.common.id.CDOID;
  *
  * @author Eike Stepper
  * @since 4.0
- * @apiviz.uses {@link CDOChangeKind} - - provides
  */
 public interface CDOChangeKindProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSetDataProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSetDataProvider.java
index 19b5b24418..c3dab0f362 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSetDataProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSetDataProvider.java
@@ -15,7 +15,6 @@ package org.eclipse.emf.cdo.common.commit;
  *
  * @author Eike Stepper
  * @since 4.0
- * @apiviz.uses {@link CDOChangeSetData} - - provides
  */
 public interface CDOChangeSetDataProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfo.java
index d1e1e9f243..f482b23c9f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfo.java
@@ -21,7 +21,6 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
  */
 public interface CDOCommitInfo extends CDOBranchPoint, CDOCommitData
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.java
index 5b8eccb2dd..980ab57eff 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.java
@@ -16,7 +16,6 @@ package org.eclipse.emf.cdo.common.commit;
  *
  * @author Eike Stepper
  * @since 3.0
- * @apiviz.uses {@link CDOCommitInfo} - - handles
  */
 public interface CDOCommitInfoHandler
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java
index 474f3d0f92..29fbefb51e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java
@@ -20,8 +20,6 @@ import org.eclipse.emf.cdo.common.branch.CDOBranch;
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.uses {@link CDOCommitInfo} - - manages
  */
 public interface CDOCommitInfoManager extends CDOCommitInfoProvider, CDOCommitHistory.Provider<CDOBranch, CDOCommitHistory>
 {
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 65d787604d..2555227481 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
@@ -25,8 +25,6 @@ import java.lang.reflect.Array;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link CDOID.Type}
  */
 public interface CDOID extends Comparable<CDOID>, Serializable
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDObject.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDObject.java
index 56d6f5639a..88a4433e3b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDObject.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDObject.java
@@ -18,7 +18,6 @@ import org.eclipse.emf.cdo.common.CDOCommonRepository;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.has {@link CDOID.ObjectType}
  */
 public interface CDOIDObject extends CDOID
 {
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 6e2fdddb3e..ba886df209 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
@@ -14,7 +14,6 @@ package org.eclipse.emf.cdo.common.id;
  * Provides the {@link CDOID IDs} of passed objects.
  *
  * @author Eike Stepper
- * @apiviz.uses {@link CDOID} - - provides
  */
 public interface CDOIDProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDReference.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDReference.java
index f196f2c10e..9f0455e0d8 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDReference.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDReference.java
@@ -25,8 +25,6 @@ import java.io.IOException;
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
- * @apiviz.has {@link CDOID} oneway - - source
- * @apiviz.has {@link CDOID} oneway - - target
  */
 public class CDOIDReference implements CDOReference<CDOID>
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIdentifiable.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIdentifiable.java
index 33d5d5687b..4757bb4f7f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIdentifiable.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIdentifiable.java
@@ -16,7 +16,6 @@ package org.eclipse.emf.cdo.common.id;
  * @author Eike Stepper
  * @see CDOIDUtil#getCDOID(Object)
  * @since 4.3
- * @apiviz.has {@link CDOID}
  */
 public interface CDOIdentifiable
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOReference.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOReference.java
index c15e53ec8b..00c48d25b3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOReference.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOReference.java
@@ -23,7 +23,6 @@ import org.eclipse.emf.ecore.util.FeatureMap;
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.has {@link org.eclipse.emf.ecore.EStructuralFeature}
  */
 public interface CDOReference<OBJECT>
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOWithID.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOWithID.java
index 92e73fa551..e494e56d01 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOWithID.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOWithID.java
@@ -16,7 +16,6 @@ package org.eclipse.emf.cdo.common.id;
  * @author Eike Stepper
  * @see CDOIDUtil#getCDOID(Object)
  * @since 4.0
- * @apiviz.has {@link CDOID}
  */
 public interface CDOWithID
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOBlob.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOBlob.java
index 468e0940d3..579cdd01b8 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOBlob.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOBlob.java
@@ -22,7 +22,6 @@ import java.io.InputStream;
  *
  * @author Eike Stepper
  * @since 4.0
- * @apiviz.landmark
  */
 public final class CDOBlob extends CDOLob<InputStream>
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOClob.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOClob.java
index 8c00777ae9..7720791360 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOClob.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOClob.java
@@ -22,7 +22,6 @@ import java.io.Reader;
  *
  * @author Eike Stepper
  * @since 4.0
- * @apiviz.landmark
  */
 public final class CDOClob extends CDOLob<Reader>
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobHandler.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobHandler.java
index 61b441a667..ff0b8d8928 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobHandler.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobHandler.java
@@ -19,7 +19,6 @@ import java.io.Writer;
  *
  * @author Eike Stepper
  * @since 4.0
- * @apiviz.uses {@link CDOLob} - - handles
  */
 public interface CDOLobHandler
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobStore.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobStore.java
index c75835671f..670f67e3f6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobStore.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobStore.java
@@ -20,7 +20,6 @@ import java.io.Reader;
  *
  * @author Eike Stepper
  * @since 4.0
- * @apiviz.composedOf {@link CDOLob}
  */
 public interface CDOLobStore
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.java
index 1e2fb19011..724bc2b9f5 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.java
@@ -23,10 +23,6 @@ import org.eclipse.net4j.util.concurrent.IRWLockManager.LockType;
  * @since 4.1
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.has {@link CDOLockOwner}
- * @apiviz.has {@link CDOLockChangeInfo.Operation}
- * @apiviz.has {@link org.eclipse.net4j.util.concurrent.IRWLockManager.LockType}
- * @apiviz.composedOf {@link CDOLockState}
  */
 public interface CDOLockChangeInfo extends CDOBranchPoint
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockState.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockState.java
index 3045397565..f90e055617 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockState.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockState.java
@@ -29,11 +29,6 @@ import java.util.Set;
  * @since 4.1
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link java.lang.Object} oneway - - lockedObject
- * @apiviz.owns {@link CDOLockOwner} - - readLockOwners
- * @apiviz.has {@link CDOLockOwner} oneway - - writeLockOwner
- * @apiviz.has {@link CDOLockOwner} oneway - - writeOptionOwner
  */
 public interface CDOLockState
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java
index 1d44245fae..6f593f228b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java
@@ -23,7 +23,6 @@ import java.util.Map;
  *
  * @author Eike Stepper
  * @since 4.0
- * @apiviz.uses {@link IDurableLockingManager.LockArea} - - manages
  */
 public interface IDurableLockingManager
 {
@@ -49,7 +48,6 @@ public interface IDurableLockingManager
    * @author Eike Stepper
    * @noextend This interface is not intended to be extended by clients.
    * @noimplement This interface is not intended to be implemented by clients.
-   * @apiviz.composedOf {@link IDurableLockingManager.LockGrade} - - locks
    */
   public interface LockArea extends CDOBranchPoint
   {
@@ -78,7 +76,6 @@ public interface IDurableLockingManager
      * A call-back interface for <em>handling</em> {@link LockArea lock area} objects.
      *
      * @author Eike Stepper
-     * @apiviz.uses {@link IDurableLockingManager.LockArea} - - handles
      */
     public interface Handler
     {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/package-info.java
index b85ced45ee..5c2a1466b4 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/package-info.java
@@ -8,6 +8,5 @@
 /**
  * Common concepts for dealing with durable locks and views.
  *
- * @apiviz.exclude .*Exception
  */
 package org.eclipse.emf.cdo.common.lock;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java
index 9e3f59ee8f..7ac5e14769 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java
@@ -24,8 +24,6 @@ import org.eclipse.emf.ecore.EStructuralFeature;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link org.eclipse.emf.ecore.EClass}
  */
 public interface CDOClassInfo extends Adapter
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassifierRef.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassifierRef.java
index 68e72221c8..711a0e64a0 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassifierRef.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassifierRef.java
@@ -154,7 +154,6 @@ public final class CDOClassifierRef implements Serializable
    *
    * @author Eike Stepper
    * @since 3.0
-   * @apiviz.uses {@link CDOClassifierRef} - - provides
    */
   public interface Provider
   {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java
index f78f82d67b..b0bb13ff62 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java
@@ -63,7 +63,6 @@ import java.util.Set;
  *
  * @author Eike Stepper
  * @since 2.0
- * @apiviz.uses {@link CDOType} - - provides
  */
 public final class CDOModelUtil implements CDOModelConstants
 {
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 779d3c52c1..4ca6c1efba 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
@@ -29,9 +29,6 @@ import org.eclipse.emf.ecore.EPackage.Descriptor;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link org.eclipse.emf.ecore.EPackage}
- * @apiviz.composedOf {@link CDOClassInfo}
  */
 public interface CDOPackageInfo extends Adapter, EPackage.Descriptor, Comparable<CDOPackageInfo>
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.java
index 17b95dcfb5..b69a1d4418 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.java
@@ -31,8 +31,6 @@ import java.util.Map;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.composedOf {@link CDOPackageUnit}
  */
 public interface CDOPackageRegistry extends EPackage.Registry
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.java
index 5d83dff7e6..c35f3d405a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.java
@@ -23,9 +23,6 @@ import java.util.Map.Entry;
  *
  * @author Eike Stepper
  * @since 2.0
- * @apiviz.uses {@link CDOPackageRegistryPopulator.Descriptor} - - creates
- * @apiviz.uses {@link CDOPackageRegistry} - - populates
- * @apiviz.uses {@link org.eclipse.emf.ecore.EPackage.Registry} - - polls
  */
 public class CDOPackageRegistryPopulator extends Worker
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java
index b9ac894f37..db5d818e8f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java
@@ -31,7 +31,6 @@ import java.util.Map;
  *
  * @author Eike Stepper
  * @since 2.0
- * @apiviz.exclude
  */
 public final class CDOPackageTypeRegistry
 {
@@ -219,7 +218,6 @@ public final class CDOPackageTypeRegistry
    * @author Eike Stepper
    * @noextend This interface is not intended to be extended by clients.
    * @noimplement This interface is not intended to be implemented by clients.
-   * @apiviz.exclude
    */
   public static interface CDOObjectMarker
   {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java
index 3cbce04944..7069492633 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java
@@ -29,10 +29,6 @@ import org.eclipse.emf.ecore.EPackage.Registry;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link CDOPackageUnit.Type}
- * @apiviz.has {@link CDOPackageUnit.State}
- * @apiviz.composedOf {@link CDOPackageInfo}
  */
 public interface CDOPackageUnit extends Comparable<CDOPackageUnit>, CDOTimeProvider
 {
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 221af56bdb..1945884b32 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
@@ -26,7 +26,6 @@ import java.io.IOException;
  * @author Eike Stepper
  * @noimplement This interface is not intended to be implemented by clients.
  * @since 2.0
- * @apiviz.landmark
  */
 public interface CDOType
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
index 70df3d5567..d2d91aad7c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
@@ -63,7 +63,6 @@ import java.util.Set;
  *
  * @author Eike Stepper
  * @since 2.0
- * @apiviz.exclude
  */
 public final class EMFUtil
 {
@@ -721,7 +720,6 @@ public final class EMFUtil
    * to be switched on/off as desired.
    *
    * @since 4.0
-   * @apiviz.exclude
    */
   public static class ExtResourceSet extends ResourceSetImpl
   {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/package-info.java
index 04ba61dd3c..64b7c9fcf3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/package-info.java
@@ -8,6 +8,5 @@
 /**
  * Common concepts for dealing with models and types.
  *
- * @apiviz.exclude .*\.Comparable
  */
 package org.eclipse.emf.cdo.common.model;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/package-info.java
index 1c98f5353e..69a0ba8204 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/package-info.java
@@ -7,10 +7,5 @@
 
 /**
  * Common concepts that are differently extended in clients and servers.
- *
- * @apiviz.exclude .*\.IOptions
- * @apiviz.exclude .*\.IOptionsContainer
- * @apiviz.exclude .*\.Closeable
- * @apiviz.exclude .*Event
  */
 package org.eclipse.emf.cdo.common;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocol.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocol.java
index e15277ba59..94fde47f15 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocol.java
@@ -32,8 +32,6 @@ import java.util.Set;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.uses {@link CDODataInput}
- * @apiviz.uses {@link CDODataOutput}
  */
 public interface CDOProtocol extends CDOProtocolConstants
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOAllRevisionsProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOAllRevisionsProvider.java
index 115a1ed25b..0b1a51e078 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOAllRevisionsProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOAllRevisionsProvider.java
@@ -20,7 +20,6 @@ import java.util.Map;
  *
  * @author Eike Stepper
  * @since 3.0
- * @apiviz.exclude
  */
 public interface CDOAllRevisionsProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java
index 0cfe2f83f5..2204ea3dbc 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.cdo.common.id.CDOIdentifiable;
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.exclude
  */
 public interface CDOIDAndBranch extends CDOIdentifiable, CDOBranchProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOList.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOList.java
index 2cf880bcba..0b5be2213e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOList.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOList.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.common.util.EList;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.uses {@link CDOElementProxy} - - contains
  */
 public interface CDOList extends MoveableList<Object>, EList<Object>
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListFactory.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListFactory.java
index 06c2262e96..9fb4f72500 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListFactory.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListFactory.java
@@ -18,7 +18,6 @@ import org.eclipse.emf.cdo.internal.common.revision.CDOListImpl;
  *
  * @author Simon McDuff
  * @since 2.0
- * @apiviz.uses {@link CDOList} - - creates
  */
 public interface CDOListFactory
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListResolver.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListResolver.java
index 0ff3faf96f..134f2f428f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListResolver.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListResolver.java
@@ -21,7 +21,6 @@ import org.eclipse.emf.ecore.EStructuralFeature;
  *
  * @author Eike Stepper
  * @since 4.0
- * @apiviz.uses {@link CDOList} - - resolves
  */
 public interface CDOListResolver
 {
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 b210ed8ec0..2bcf3549f3 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
@@ -31,8 +31,6 @@ import org.eclipse.emf.ecore.EObject;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link CDORevisionData}
  */
 public interface CDORevision extends CDORevisionKey, CDORevisable
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java
index aa77ff7efb..ad6d0422ba 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java
@@ -30,7 +30,6 @@ import java.util.List;
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.composedOf {@link CDORevision}
  */
 public interface CDORevisionCache extends CDORevisionCacheAdder, INotifier
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionManager.java
index 972bd2381c..945f95f547 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionManager.java
@@ -49,10 +49,6 @@ import java.util.List;
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link CDORevisionFactory}
- * @apiviz.has {@link CDORevisionCache}
- * @apiviz.uses {@link CDORevision} - - loads
  */
 public interface CDORevisionManager extends INotifier
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionProvider.java
index edde7f9c8e..b714daf805 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionProvider.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.cdo.common.id.CDOID;
  *
  * @author Eike Stepper
  * @since 3.0
- * @apiviz.uses {@link CDORevision} - - provides
  */
 public interface CDORevisionProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
index 169f65c2ca..8b98ab3561 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
@@ -62,7 +62,6 @@ import java.util.StringTokenizer;
  * Various static helper methods for dealing with {@link CDORevision revisions}.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public final class CDORevisionUtil
 {
@@ -629,7 +628,6 @@ public final class CDORevisionUtil
    * targets. Concrete output formats and targets are implemented by subclasses.
    *
    * @since 4.0
-   * @apiviz.exclude
    */
   public static abstract class AllRevisionsDumper
   {
@@ -684,7 +682,6 @@ public final class CDORevisionUtil
      * implemented by subclasses.
      *
      * @author Eike Stepper
-     * @apiviz.exclude
      */
     public static abstract class Stream extends AllRevisionsDumper
     {
@@ -705,7 +702,6 @@ public final class CDORevisionUtil
        * A {@link Stream revision dumper} that directs all output as plain text to a stream.
        *
        * @author Eike Stepper
-       * @apiviz.exclude
        */
       public static class Plain extends Stream
       {
@@ -754,7 +750,6 @@ public final class CDORevisionUtil
        * A {@link Stream revision dumper} that directs all output as HTML text to a stream.
        *
        * @author Eike Stepper
-       * @apiviz.exclude
        */
       public static class Html extends Stream
       {
@@ -825,7 +820,6 @@ public final class CDORevisionUtil
    *
    * @author Eike Stepper
    * @since 4.0
-   * @apiviz.exclude
    */
   public static class CDORevisionComparator implements Comparator<CDORevisionKey>
   {
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 2e9d80c32b..385f593d39 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
@@ -23,9 +23,6 @@ import org.eclipse.emf.ecore.EStructuralFeature;
  * @author Simon McDuff
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link org.eclipse.emf.ecore.EStructuralFeature}
- * @apiviz.has {@link CDOFeatureDelta.Type}
  */
 public interface CDOFeatureDelta
 {
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 d2dac4067d..326ed266ee 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
@@ -16,7 +16,6 @@ package org.eclipse.emf.cdo.common.revision.delta;
  *
  * @see CDORevisionDelta#accept(CDOFeatureDeltaVisitor)
  * @author Simon McDuff
- * @apiviz.uses {@link CDOFeatureDelta} - - visits
  */
 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 d9ecae8fc1..5b1cbd8841 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
@@ -23,7 +23,6 @@ import java.util.List;
  * @author Simon McDuff
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.composedOf {@link CDOFeatureDelta} - - listChanges
  */
 public interface CDOListFeatureDelta extends CDOFeatureDelta, CDOOriginSizeProvider
 {
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 ff2789cdc2..caafc835d9 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
@@ -34,10 +34,6 @@ import java.util.List;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link org.eclipse.emf.ecore.EClass}
- * @apiviz.has {@link org.eclipse.emf.cdo.common.revision.CDORevisable} oneway - - target
- * @apiviz.composedOf {@link CDOFeatureDelta}
  */
 public interface CDORevisionDelta extends CDORevisionKey
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDeltaProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDeltaProvider.java
index a4373fc9ee..aaa5d52cb4 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDeltaProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDeltaProvider.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.cdo.common.id.CDOID;
  *
  * @author Eike Stepper
  * @since 4.0
- * @apiviz.uses {@link CDORevisionDelta} - - provides
  */
 public interface CDORevisionDeltaProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/package-info.java
index 3e276bb088..62f9e3a78f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/package-info.java
@@ -7,8 +7,5 @@
 
 /**
  * Common concepts for dealing with revisions and revision lists.
- *
- * @apiviz.exclude .*\.INotifier
- * @apiviz.exclude .*Event
  */
 package org.eclipse.emf.cdo.common.revision;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/package-info.java
index a2742cd934..7c293adf7c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/package-info.java
@@ -8,6 +8,5 @@
 /**
  * Common utility classes, some common interfaces and exceptions.
  *
- * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.common.util;
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 0702385c6e..02201ef07e 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: 4.4.200.qualifier
+Bundle-Version: 4.4.300.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.edit;version="4.4.200",
+Export-Package: org.eclipse.emf.cdo.edit;version="4.4.300",
  org.eclipse.emf.cdo.eresource.provider;version="4.2.100",
  org.eclipse.emf.cdo.etypes.provider;version="4.2.100",
- org.eclipse.emf.cdo.internal.edit.messages;version="4.4.200";x-internal:=true
+ org.eclipse.emf.cdo.internal.edit.messages;version="4.4.300";x-internal:=true
 Automatic-Module-Name: org.eclipse.emf.cdo.edit
diff --git a/plugins/org.eclipse.emf.cdo.edit/pom.xml b/plugins/org.eclipse.emf.cdo.edit/pom.xml
index e54e5f25d5..7eaa8ecd79 100644
--- a/plugins/org.eclipse.emf.cdo.edit/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.edit/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.edit</artifactId>
-  <version>4.4.200-SNAPSHOT</version>
+  <version>4.4.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/package-info.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/package-info.java
index aae34d16f0..a337a34759 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/package-info.java
@@ -8,6 +8,5 @@
 /**
  * The generated EMF edit support of the CDO repository file system.
  *
- * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.eresource.provider;
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/package-info.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/package-info.java
index e03df0b653..d05ddbede0 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/package-info.java
@@ -8,6 +8,5 @@
 /**
  * The generated EMF edit support of the CDO system data types and native annotations.
  *
- * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.etypes.provider;
diff --git a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
index d929182362..4e5942dcc0 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.explorer;singleton:=true
-Bundle-Version: 4.5.200.qualifier
+Bundle-Version: 4.5.300.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.internal.explorer.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -24,12 +24,12 @@ Import-Package: org.h2;version="[1.0.0,2.0.0)";resolution:=optional,
  org.h2.jdbcx;version="[1.0.0,2.0.0)";resolution:=optional,
  org.h2.util;version="[1.0.0,2.0.0)";resolution:=optional,
  org.h2.value;version="[1.0.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.explorer;version="4.5.200",
- org.eclipse.emf.cdo.explorer.checkouts;version="4.5.200",
- org.eclipse.emf.cdo.explorer.repositories;version="4.5.200",
- org.eclipse.emf.cdo.internal.explorer;version="4.5.200";x-friends:="org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.cdo.internal.explorer.bundle;version="4.5.200";x-internal:=true,
- org.eclipse.emf.cdo.internal.explorer.checkouts;version="4.5.200";x-friends:="org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.cdo.internal.explorer.repositories;version="4.5.200";x-friends:="org.eclipse.emf.cdo.explorer.ui"
+Export-Package: org.eclipse.emf.cdo.explorer;version="4.5.300",
+ org.eclipse.emf.cdo.explorer.checkouts;version="4.5.300",
+ org.eclipse.emf.cdo.explorer.repositories;version="4.5.300",
+ org.eclipse.emf.cdo.internal.explorer;version="4.5.300";x-friends:="org.eclipse.emf.cdo.explorer.ui",
+ org.eclipse.emf.cdo.internal.explorer.bundle;version="4.5.300";x-internal:=true,
+ org.eclipse.emf.cdo.internal.explorer.checkouts;version="4.5.300";x-friends:="org.eclipse.emf.cdo.explorer.ui",
+ org.eclipse.emf.cdo.internal.explorer.repositories;version="4.5.300";x-friends:="org.eclipse.emf.cdo.explorer.ui"
 Eclipse-BuddyPolicy: registered
 Automatic-Module-Name: org.eclipse.emf.cdo.explorer
diff --git a/plugins/org.eclipse.emf.cdo.explorer/pom.xml b/plugins/org.eclipse.emf.cdo.explorer/pom.xml
index 49af089862..8dfecfc6a5 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.explorer/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.explorer</artifactId>
-  <version>4.5.200-SNAPSHOT</version>
+  <version>4.5.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckoutManager.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckoutManager.java
index 09f5ba4cdc..9ca43df040 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckoutManager.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckoutManager.java
@@ -24,7 +24,6 @@ import java.util.Properties;
  * @since 4.4
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.composedOf {@link CDOCheckout}
  */
 public interface CDOCheckoutManager extends CDOExplorerManager<CDOCheckout>
 {
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepositoryManager.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepositoryManager.java
index a2f82f0ccb..cf299157ec 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepositoryManager.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepositoryManager.java
@@ -25,7 +25,6 @@ import java.util.Properties;
  * @since 4.4
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.composedOf {@link CDORepository}
  */
 public interface CDORepositoryManager extends CDOExplorerManager<CDORepository>
 {
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.expressions.edit/META-INF/MANIFEST.MF
index 24f0e2e650..4ac6613011 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.expressions.edit;singleton:=true
-Bundle-Version: 4.3.300.qualifier
+Bundle-Version: 4.3.400.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.expressions.provider.ExpressionsEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/pom.xml b/plugins/org.eclipse.emf.cdo.expressions.edit/pom.xml
index 1e324c2eed..edc53899f5 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.expressions.edit</artifactId>
-  <version>4.3.300-SNAPSHOT</version>
+  <version>4.3.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/package-info.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/package-info.java
index 8f7e9f46ad..944837eb9f 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/package-info.java
@@ -8,6 +8,5 @@
 /**
  * The generated EMF edit support of the CDO expressions model.
  *
- * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.expressions.provider;
diff --git a/plugins/org.eclipse.emf.cdo.expressions/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.expressions/META-INF/MANIFEST.MF
index e822c69f30..85bcf27811 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.expressions/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.expressions;singleton:=true
-Bundle-Version: 4.3.300.qualifier
+Bundle-Version: 4.3.400.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.expressions;version="4.3.300",
- org.eclipse.emf.cdo.expressions.impl;version="4.3.300",
- org.eclipse.emf.cdo.expressions.util;version="4.3.300"
+Export-Package: org.eclipse.emf.cdo.expressions;version="4.3.400",
+ org.eclipse.emf.cdo.expressions.impl;version="4.3.400",
+ org.eclipse.emf.cdo.expressions.util;version="4.3.400"
 Require-Bundle: org.eclipse.emf.cdo;visibility:=reexport;bundle-version="[4.1.0,5.0.0)"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.cdo.expressions
diff --git a/plugins/org.eclipse.emf.cdo.expressions/pom.xml b/plugins/org.eclipse.emf.cdo.expressions/pom.xml
index 2bc3df3d6e..ca67fa4508 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.expressions/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.expressions</artifactId>
-  <version>4.3.300-SNAPSHOT</version>
+  <version>4.3.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/package-info.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/package-info.java
index dde1e012f1..61b4c1c503 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/package-info.java
@@ -8,6 +8,5 @@
 /**
  * The generated EMF implementation of the CDO expressions model.
  *
- * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.expressions.impl;
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/package-info.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/package-info.java
index 8e6d2a7de4..e9e7b838ae 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/package-info.java
@@ -7,8 +7,5 @@
 
 /**
  * The generated EMF API of the CDO expressions model.
- *
- * @apiviz.exclude .*\.ExpressionsPackage.*
- * @apiviz.exclude .*\.ExpressionsFactory.*
  */
 package org.eclipse.emf.cdo.expressions;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java
index 20a5ca7aa1..95796b8530 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java
@@ -25,8 +25,6 @@ import org.eclipse.emf.spi.cdo.CDOSessionProtocol;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link CDONet4jSession.Options}
  */
 public interface CDONet4jSession extends org.eclipse.emf.cdo.session.CDOSession
 {
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.java
index 01412b3921..af77972d9c 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.java
@@ -25,8 +25,6 @@ import org.eclipse.net4j.util.io.IStreamWrapper;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.uses {@link CDONet4jSession} - - opens
  */
 public interface CDONet4jSessionConfiguration extends org.eclipse.emf.cdo.session.CDOSessionConfiguration
 {
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java
index 03c3052da7..a7064c33e5 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java
@@ -38,9 +38,6 @@ import java.util.Map;
  *
  * @since 2.0
  * @author Eike Stepper
- * @apiviz.uses {@link CDONet4jSessionConfiguration} - - creates
- * @apiviz.uses {@link ReconnectingCDOSessionConfiguration} - - creates
- * @apiviz.uses {@link FailoverCDOSessionConfiguration} - - creates
  */
 public final class CDONet4jUtil
 {
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/package-info.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/package-info.java
index 646633b3d2..9531bbe444 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/package-info.java
@@ -7,8 +7,5 @@
 
 /**
  * Client concepts for dealing with Net4j-based sessions to remote repositories.
- *
- * @apiviz.exclude .*Event
- * @apiviz.exclude .*Event\.Type
  */
 package org.eclipse.emf.cdo.net4j;
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.security.edit/META-INF/MANIFEST.MF
index 28ddebc4d9..b29ca594fb 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.security.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.security.edit;singleton:=true
-Bundle-Version: 4.4.100.qualifier
+Bundle-Version: 4.4.200.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.security.provider.SecurityEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/pom.xml b/plugins/org.eclipse.emf.cdo.security.edit/pom.xml
index 825c249a62..8d50e58f1f 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.security.edit/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.security.edit</artifactId>
-  <version>4.4.100-SNAPSHOT</version>
+  <version>4.4.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/package-info.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/package-info.java
index 87cf3e9752..790ac8ff95 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/package-info.java
@@ -7,7 +7,5 @@
 
 /**
  * The generated EMF edit support of the CDO security model.
- *
- * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.security.provider;
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/package-info.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/package-info.java
index 0019803769..49d0d46a3e 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/package-info.java
@@ -7,7 +7,5 @@
 
 /**
  * The generated EMF implementation of the CDO security model.
- *
- * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.security.impl;
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/package-info.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/package-info.java
index 2bbf1938f6..920a7ca8e8 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/package-info.java
@@ -7,8 +7,5 @@
 
 /**
  * The generated EMF API of the CDO security model.
- *
- * @apiviz.exclude .*\.EresourcePackage.*
- * @apiviz.exclude .*\.EresourceFactory.*
  */
 package org.eclipse.emf.cdo.security;
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.java
index da87d29f3f..ff1b18303f 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.java
@@ -378,7 +378,6 @@ public interface IMappingStrategy
    * @since 4.4
    * @noimplement This interface is not intended to be implemented by clients.
    * @noextend This interface is not intended to be extended by clients.
-   * @apiviz.exclude
    */
   public interface Props
   {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerImporter.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerImporter.java
index ce4cae0778..ca0a9c1d80 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerImporter.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerImporter.java
@@ -92,7 +92,6 @@ import java.util.Map;
  *
  * @author Eike Stepper
  * @since 4.0
- * @apiviz.has {@link CDOServerImporter.Handler}
  */
 public abstract class CDOServerImporter
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
index deaa1457a9..c63a629158 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
@@ -59,7 +59,6 @@ import java.util.Map;
  * Various static methods that may help with CDO {@link IRepository repositories} and server-side {@link CDOView views}.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public final class CDOServerUtil
 {
@@ -321,7 +320,6 @@ public final class CDOServerUtil
    *
    * @author Eike Stepper
    * @since 2.0
-   * @apiviz.exclude
    */
   public static abstract class RepositoryReadAccessValidator implements IRepository.ReadAccessHandler
   {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IMEMStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IMEMStore.java
index 42daf80b1b..cf31d05c23 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IMEMStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IMEMStore.java
@@ -18,7 +18,6 @@ package org.eclipse.emf.cdo.server;
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated Use {@link org.eclipse.emf.cdo.server.mem.IMEMStore}
- * @apiviz.exclude
  */
 @Deprecated
 public interface IMEMStore extends org.eclipse.emf.cdo.server.mem.IMEMStore
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryContext.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryContext.java
index 1cb060838a..402d54d6fe 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryContext.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryContext.java
@@ -21,7 +21,6 @@ import org.eclipse.emf.cdo.view.CDOQuery;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.exclude
  */
 public interface IQueryContext extends CDOBranchPoint
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandlerProvider.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandlerProvider.java
index bde36110b3..16c90964f1 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandlerProvider.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandlerProvider.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.cdo.view.CDOQuery;
  *
  * @author Eike Stepper
  * @since 2.0
- * @apiviz.uses {@link IQueryHandler} - - provides
  */
 public interface IQueryHandlerProvider
 {
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 d96706dbdc..244ec67262 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
@@ -39,17 +39,6 @@ import java.util.Set;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link IStore}
- * @apiviz.has {@link java.util.Map} oneway - - properties
- * @apiviz.has {@link org.eclipse.emf.cdo.common.model.CDOPackageRegistry}
- * @apiviz.has {@link org.eclipse.emf.cdo.common.branch.CDOBranchManager}
- * @apiviz.has {@link org.eclipse.emf.cdo.common.revision.CDORevisionManager}
- * @apiviz.has {@link org.eclipse.emf.cdo.common.lock.IDurableLockingManager}
- * @apiviz.has {@link ISessionManager}
- * @apiviz.has {@link IQueryHandlerProvider}
- * @apiviz.composedOf {@link org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler}
- * @apiviz.composedOf {@link IRepository.Handler} - - accessHandlers
  */
 public interface IRepository extends CDOCommonRepository, IQueryHandlerProvider, IContainer<Object>, ILifecycle
 {
@@ -305,7 +294,6 @@ public interface IRepository extends CDOCommonRepository, IQueryHandlerProvider,
    * @author Eike Stepper
    * @noimplement This interface is not intended to be implemented by clients.
    * @noextend This interface is not intended to be extended by clients.
-   * @apiviz.exclude
    */
   public interface Props
   {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryFactory.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryFactory.java
index e2173b7532..265ae04d76 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryFactory.java
@@ -14,7 +14,6 @@ package org.eclipse.emf.cdo.server;
  * Creates CDO {@link IRepository repositories}.
  *
  * @author Eike Stepper
- * @apiviz.uses {@link IRepository} - - creates
  */
 public interface IRepositoryFactory
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryProvider.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryProvider.java
index de97a54e56..1773f36169 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryProvider.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryProvider.java
@@ -14,7 +14,6 @@ package org.eclipse.emf.cdo.server;
  * Provides the consumer with CDO {@link IRepository repositories} specified by their name.
  *
  * @author Eike Stepper
- * @apiviz.uses {@link IRepository} - - provides
  */
 public interface IRepositoryProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositorySynchronizer.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositorySynchronizer.java
index 30c9c28ed3..46223c16f2 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositorySynchronizer.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositorySynchronizer.java
@@ -22,8 +22,6 @@ import org.eclipse.net4j.util.container.IContainer;
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link org.eclipse.emf.cdo.session.CDOSessionConfigurationFactory} oneway - - remote
  */
 public interface IRepositorySynchronizer extends IContainer<CDOSession>
 {
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 141c7d738f..b462910612 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
@@ -24,10 +24,6 @@ import org.eclipse.net4j.util.container.IContainer;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link org.eclipse.emf.cdo.spi.server.ISessionProtocol}
- * @apiviz.composedOf {@link IView} - - views
- * @apiviz.composedOf {@link ITransaction} - - transactions
  */
 public interface ISession extends CDOCommonSession, IContainer<IView>
 {
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 e379186e1f..ad7c082879 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
@@ -19,8 +19,6 @@ import org.eclipse.net4j.util.security.IAuthenticator;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.composedOf {@link ISession}
  */
 public interface ISessionManager extends IContainer<ISession>
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
index a032d19515..edf4c7088b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
@@ -28,11 +28,6 @@ import java.util.Set;
  * system folder.
  *
  * @author Eike Stepper
- * @apiviz.landmark
- * @apiviz.has {@link IStore.ChangeFormat}
- * @apiviz.has {@link IStore.RevisionTemporality}
- * @apiviz.has {@link IStore.RevisionParallelism}
- * @apiviz.uses {@link IStoreAccessor} - - creates
  */
 public interface IStore
 {
@@ -240,7 +235,6 @@ public interface IStore
    *
    * @author Eike Stepper
    * @since 4.1
-   * @apiviz.exclude
    */
   public interface CanHandleClientAssignedIDs
   {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreAccessor.java
index dadff4a262..2e39c77e87 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreAccessor.java
@@ -67,7 +67,6 @@ import java.util.Set;
  * Represents a <i>connection</i> to a physical data storage back-end.
  *
  * @author Eike Stepper
- * @apiviz.uses {@link IStoreChunkReader} - - creates
  */
 public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, CommitInfoLoader
 {
@@ -270,7 +269,6 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
    * @since 2.0
    * @noimplement This interface is not intended to be implemented by clients.
    * @noextend This interface is not intended to be extended by clients.
-   * @apiviz.exclude
    */
   public interface CommitContext extends CDORevisionProvider
   {
@@ -494,7 +492,6 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
    * @author Eike Stepper
    * @since 2.0
    * @noimplement This interface is not intended to be implemented by clients.
-   * @apiviz.exclude
    */
   public interface QueryResourcesContext extends CDOBranchPoint
   {
@@ -524,7 +521,6 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
      *
      * @author Eike Stepper
      * @since 2.0
-     * @apiviz.exclude
      */
     public interface ExactMatch extends QueryResourcesContext
     {
@@ -538,7 +534,6 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
    * @author Eike Stepper
    * @since 3.0
    * @noimplement This interface is not intended to be implemented by clients.
-   * @apiviz.exclude
    */
   public interface QueryXRefsContext extends CDOBranchPoint
   {
@@ -575,7 +570,6 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
    *
    * @author Eike Stepper
    * @since 4.0
-   * @apiviz.exclude
    */
   public interface Raw extends IStoreAccessor
   {
@@ -796,7 +790,6 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
    *
    * @author Eike Stepper
    * @since 4.6
-   * @apiviz.exclude
    */
   public interface Raw2 extends Raw
   {
@@ -838,7 +831,6 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
    * @see DurableLocking2
    * @author Eike Stepper
    * @since 4.0
-   * @apiviz.exclude
    */
   public interface DurableLocking extends IDurableLockingManager
   {
@@ -854,7 +846,6 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
    *
    * @author Caspar De Groot
    * @since 4.1
-   * @apiviz.exclude
    */
   public interface DurableLocking2 extends DurableLocking
   {
@@ -868,7 +859,6 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
    *
    * @author Eike Stepper
    * @since 4.5
-   * @apiviz.exclude
    */
   public interface UnitSupport extends IStoreAccessor
   {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java
index f3c6852553..9a3f5572c8 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java
@@ -24,7 +24,6 @@ import java.util.List;
  * partially loaded} lists from a physical data storage backend.
  *
  * @author Eike Stepper
- * @apiviz.uses {@link IStoreChunkReader.Chunk} - - reads
  */
 public interface IStoreChunkReader
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreFactory.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreFactory.java
index 7832b63c68..2ae42a1079 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreFactory.java
@@ -18,7 +18,6 @@ import java.util.Map;
  * Creates {@link IStore stores}.
  *
  * @author Eike Stepper
- * @apiviz.uses {@link IStore} - - creates
  */
 public interface IStoreFactory
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISynchronizableRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISynchronizableRepository.java
index 56082e37f2..3623f34518 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISynchronizableRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISynchronizableRepository.java
@@ -17,9 +17,6 @@ package org.eclipse.emf.cdo.server;
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link IRepositorySynchronizer}
- * @apiviz.has {@link ISession} oneway - - replicatorSession
  */
 public interface ISynchronizableRepository extends IRepository
 {
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 78769d1234..3e0b8b361e 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
@@ -20,7 +20,6 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
  */
 public interface ITransaction extends IView, CDOCommonTransaction
 {
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 9e06de4d9a..5446035e8c 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
@@ -19,7 +19,6 @@ import org.eclipse.emf.cdo.view.CDOView;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
  */
 public interface IView extends CDOCommonView
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/StoreThreadLocal.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/StoreThreadLocal.java
index 2c6db4295b..ade3012319 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/StoreThreadLocal.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/StoreThreadLocal.java
@@ -22,7 +22,6 @@ import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
  *
  * @author Eike Stepper
  * @since 2.0
- * @apiviz.exclude
  */
 public final class StoreThreadLocal
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/package-info.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/package-info.java
index 6f34433bbd..f03c51ea0a 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/package-info.java
@@ -7,12 +7,5 @@
 
 /**
  * Server concepts for dealing with repositories and stores.
- *
- * @apiviz.exclude .*\.CDOServerBrowser.*
- * @apiviz.exclude .*\.CommitInfoLoader
- * @apiviz.exclude .*\.BranchLoader
- * @apiviz.exclude .*\.IContainer
- * @apiviz.exclude .*\.INotifier
- * @apiviz.exclude .*Exception
  */
 package org.eclipse.emf.cdo.server;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/package-info.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/package-info.java
index 2944b66036..04416bdba5 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/package-info.java
@@ -7,7 +7,5 @@
 
 /**
  * Server service provider interfaces and useful base implementations.
- *
- * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.spi.server;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOAdapter.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOAdapter.java
index d851d99030..358cf747e7 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOAdapter.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOAdapter.java
@@ -27,7 +27,6 @@ import org.eclipse.emf.common.notify.Adapter;
  *
  * @author Simon McDuff
  * @since 2.0
- * @apiviz.uses {@link CDONotification} - - receives
  */
 public interface CDOAdapter extends Adapter
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObject.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObject.java
index 95ae98864d..547f4a692d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObject.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObject.java
@@ -32,13 +32,6 @@ import org.eclipse.emf.spi.cdo.InternalCDOObject;
  * Note that, by contract, every instance of CDOObject can also be cast to {@link InternalCDOObject}.
  *
  * @author Eike Stepper
- * @apiviz.landmark
- * @apiviz.has {@link CDOState}
- * @apiviz.owns {@link CDOAdapter} - - adapters
- * @apiviz.has {@link CDOLock} oneway - - readLock
- * @apiviz.has {@link CDOLock} oneway - - writeLock
- * @apiviz.has {@link CDOLock} oneway - - writeOption
- * @apiviz.uses {@link CDONotification} - - delivers
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CDOObject extends EObject, CDOWithID
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObjectReference.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObjectReference.java
index fa07ee1f7b..d0de359915 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObjectReference.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObjectReference.java
@@ -20,8 +20,6 @@ import org.eclipse.emf.cdo.common.id.CDOReference;
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.has {@link CDOObject} oneway - - source
- * @apiviz.has {@link CDOObject} oneway - - target
  */
 public interface CDOObjectReference extends CDOReference<CDOObject>
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java
index 46f68a7b08..c67b6e08b0 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java
@@ -30,7 +30,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
  * @extends Resource
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
  * <!-- end-user-doc -->
  *
  * <p>
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java
index 103a60cd2a..5bc1f78e7b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java
@@ -30,7 +30,6 @@ import org.eclipse.emf.ecore.resource.Resource;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.uses {@link CDOResource} - - creates
  */
 public interface CDOResourceFactory extends Resource.Factory
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java
index feea2e1b2e..588ef3d328 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java
@@ -15,8 +15,6 @@ import org.eclipse.emf.common.util.EList;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Resource Folder</b></em>'.
  *
- * @apiviz.landmark
- * @apiviz.composedOf {@link CDOResourceNode} - - nodes
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
  *
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java
index 5a145e8846..0eb4d0efd8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.ecore.EFactory;
  * <!-- begin-user-doc --> The <b>Factory</b> for the Eresource model. It provides a create method for each non-abstract
  * class of the model.
  *
- * @apiviz.exclude
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
  * @see org.eclipse.emf.cdo.eresource.EresourcePackage
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java
index 9835d9ad34..39bf62b438 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java
@@ -26,7 +26,6 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  *
- * @apiviz.exclude
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
  * @see org.eclipse.emf.cdo.eresource.EresourceFactory
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/package-info.java
index 5ba72fb1cd..1e0888190b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/package-info.java
@@ -7,7 +7,5 @@
 
 /**
  * The generated EMF implementation of the CDO repository file system.
- *
- * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.eresource.impl;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/package-info.java
index e1133cf9c9..eedd65d2f4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/package-info.java
@@ -7,8 +7,5 @@
 
 /**
  * The generated EMF API of the CDO repository file system.
- *
- * @apiviz.exclude .*\.EresourcePackage.*
- * @apiviz.exclude .*\.EresourceFactory.*
  */
 package org.eclipse.emf.cdo.eresource;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesFactory.java
index a7cf038ac3..8f20abd62c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesFactory.java
@@ -16,8 +16,6 @@ import org.eclipse.emf.ecore.EFactory;
  * <!-- begin-user-doc --> The <b>Factory</b> for the Etypes model. It provides a create method for each non-abstract
  * class of the model.
  *
- * @apiviz.uses {@link org.eclipse.emf.cdo.common.lob.CDOBlob} - - provides
- * @apiviz.uses {@link org.eclipse.emf.cdo.common.lob.CDOClob} - - provides
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/package-info.java
index be3435017a..f89ded0904 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/package-info.java
@@ -7,7 +7,5 @@
 
 /**
  * The generated EMF implementation of the CDO system data types and native annotations.
- *
- * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.etypes.impl;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/package-info.java
index 8e63fb6097..4ed8f90d3f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/package-info.java
@@ -7,7 +7,5 @@
 
 /**
  * The generated EMF API of the CDO system data types and native annotations.
- *
- * @apiviz.exclude .*\.EtypesPackage.*
  */
 package org.eclipse.emf.cdo.etypes;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/package-info.java
index 09c4a89743..5963decaf3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/package-info.java
@@ -7,7 +7,5 @@
 
 /**
  * Client concepts like {@link org.eclipse.emf.cdo.CDOObject} and {@link org.eclipse.emf.cdo.CDOState}.
- *
- * @apiviz.exclude .*\.CDOWithID
  */
 package org.eclipse.emf.cdo;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
index 6be21c594a..f946d79475 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
@@ -75,24 +75,6 @@ import java.util.concurrent.locks.Lock;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link org.eclipse.emf.cdo.session.CDORepositoryInfo}
- * @apiviz.has {@link org.eclipse.emf.cdo.common.model.CDOPackageRegistry}
- * @apiviz.has {@link org.eclipse.emf.cdo.common.branch.CDOBranchManager}
- * @apiviz.has {@link org.eclipse.emf.cdo.common.revision.CDORevisionManager}
- * @apiviz.has {@link org.eclipse.emf.cdo.view.CDOFetchRuleManager}
- * @apiviz.has {@link org.eclipse.emf.cdo.session.remote.CDORemoteSessionManager}
- * @apiviz.has {@link org.eclipse.emf.cdo.common.commit.CDOCommitInfoManager}
- * @apiviz.has {@link org.eclipse.emf.cdo.common.id.CDOIDGenerator}
- * @apiviz.has {@link CDOSession.Options}
- * @apiviz.has {@link CDOSession.ExceptionHandler}
- * @apiviz.has {@link CDOSession.ExceptionHandler}
- * @apiviz.composedOf {@link org.eclipse.emf.cdo.view.CDOView} - - views
- * @apiviz.composedOf {@link org.eclipse.emf.cdo.transaction.CDOTransaction} - - transactions
- * @apiviz.uses {@link CDOSessionInvalidationEvent} - - fires
- * @apiviz.uses {@link CDOSessionLocksChangedEvent} - - fires
- * @apiviz.exclude .*\.CDOTransactionContainer
- * @apiviz.exclude .*\.CDOUpdatable
  */
 public interface CDOSession extends CDOCommonSession, CDOUpdatable, CDOTransactionContainer, IPasswordCredentialsProvider.Provider
 {
@@ -225,11 +207,6 @@ public interface CDOSession extends CDOCommonSession, CDOUpdatable, CDOTransacti
    * @author Simon McDuff
    * @noextend This interface is not intended to be extended by clients.
    * @noimplement This interface is not intended to be implemented by clients.
-   * @apiviz.has {@link CDOCollectionLoadingPolicy}
-   * @apiviz.has {@link org.eclipse.emf.cdo.common.lob.CDOLobStore} oneway - - lobCache
-   * @apiviz.uses {@link CDOSession.Options.GeneratedPackageEmulationEvent} - - fires
-   * @apiviz.uses {@link CDOSession.Options.CollectionLoadingPolicyEvent} - - fires
-   * @apiviz.uses {@link CDOSession.Options.LobCacheEvent} - - fires
    */
   public interface Options extends CDOCommonSession.Options
   {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java
index a749e2cdc1..93c3ac79c5 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java
@@ -32,9 +32,6 @@ import org.eclipse.net4j.util.security.IPasswordCredentialsProvider;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.uses {@link CDOSession} - - opens
- * @apiviz.uses {@link CDOSessionConfiguration.SessionOpenedEvent} - - fires
  */
 public interface CDOSessionConfiguration extends INotifier
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfigurationFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfigurationFactory.java
index 31c63bc289..9b90c9de44 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfigurationFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfigurationFactory.java
@@ -15,8 +15,6 @@ package org.eclipse.emf.cdo.session;
  *
  * @author Eike Stepper
  * @since 3.0
- * @apiviz.landmark
- * @apiviz.uses {@link CDOSessionConfiguration} - - creates
  */
 public interface CDOSessionConfigurationFactory
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionEvent.java
index d7c9be1711..2dc40b6da2 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionEvent.java
@@ -19,7 +19,6 @@ import org.eclipse.net4j.util.event.IEvent;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.exclude
  */
 public interface CDOSessionEvent extends IEvent
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionProvider.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionProvider.java
index 0784222d1f..0be2471a4f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionProvider.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionProvider.java
@@ -15,7 +15,6 @@ package org.eclipse.emf.cdo.session;
  *
  * @author Eike Stepper
  * @since 2.0
- * @apiviz.exclude
  */
 public interface CDOSessionProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/package-info.java
index b4ae25b292..b2c856a8f0 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/package-info.java
@@ -7,14 +7,5 @@
 
 /**
  * Client concepts for dealing with sessions to CDO repositories.
- *
- * @apiviz.exclude .*\.CDOCommonRepository
- * @apiviz.exclude .*\.CDOListResolver
- * @apiviz.exclude .*\.CDOTransactionContainer
- * @apiviz.exclude .*\.CDOCommitInfo
- * @apiviz.exclude .*\.CDOLockChangeInfo
- * @apiviz.exclude .*\.CDOUpdatable
- * @apiviz.exclude .*\.INotifier
- * @apiviz.exclude .*Event
  */
 package org.eclipse.emf.cdo.session;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionContainer.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionContainer.java
index b7b7f77e06..0e3babc859 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionContainer.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionContainer.java
@@ -26,8 +26,6 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
  * @since 4.1
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.exclude
- * @apiviz.composedOf {@link CDOTransaction} - - transactions
  */
 public interface CDOTransactionContainer extends CDOViewContainer, CDOTransactionOpener
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionOpener.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionOpener.java
index 060db5bc13..e322b991da 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionOpener.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionOpener.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
  *
  * @author Eike Stepper
  * @since 4.4
- * @apiviz.exclude
  */
 public interface CDOTransactionOpener
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/package-info.java
index 782ed0b4fb..4a972fe8d2 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/package-info.java
@@ -7,7 +7,5 @@
 
 /**
  * Client concepts for dealing with transactions, distributed transactions and their save points.
- *
- * @apiviz.exclude .*Event
  */
 package org.eclipse.emf.cdo.transaction;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/AbstractCDOViewProvider.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/AbstractCDOViewProvider.java
index fe1ecfe8d4..1eae9500fd 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/AbstractCDOViewProvider.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/AbstractCDOViewProvider.java
@@ -25,7 +25,6 @@ import java.util.regex.Pattern;
  *
  * @author Victor Roldan Betancort
  * @since 2.0
- * @apiviz.exclude
  */
 public abstract class AbstractCDOViewProvider implements CDOViewProvider2
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.java
index 8cc49e5b07..446defe3b7 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.EStructuralFeature;
  *
  * @author Simon McDuff
  * @since 2.0
- * @apiviz.exclude
  */
 public interface CDOFeatureAnalyzer
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOQuery.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOQuery.java
index 7119689bb2..c99f7a9cbb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOQuery.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOQuery.java
@@ -27,11 +27,6 @@ import java.util.List;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link java.lang.Object} oneway - - context
- * @apiviz.composedOf {@link java.util.Map.Entry} - - parameters
- * @apiviz.uses {@link java.util.List} - - result
- * @apiviz.uses {@link org.eclipse.net4j.util.collection.CloseableIterator} - - resultAsync
  */
 public interface CDOQuery extends CDOQueryInfo
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOStaleObject.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOStaleObject.java
index 4c7aeeb69e..18ad798a96 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOStaleObject.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOStaleObject.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.cdo.common.id.CDOWithID;
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.exclude
  */
 public interface CDOStaleObject extends CDOWithID
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
index da5452e57b..d1ffeb3b3a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
@@ -85,16 +85,6 @@ import java.util.concurrent.locks.Lock;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link CDOView.Options}
- * @apiviz.owns {@link CDOObjectHandler}
- * @apiviz.uses {@link CDOQuery} - - creates
- * @apiviz.uses {@link org.eclipse.emf.cdo.CDOObject} - - manages
- * @apiviz.uses {@link CDOViewAdaptersNotifiedEvent} - - fires
- * @apiviz.uses {@link CDOViewDurabilityChangedEvent} - - fires
- * @apiviz.uses {@link CDOViewInvalidationEvent} - - fires
- * @apiviz.uses {@link CDOViewLocksChangedEvent} - - fires
- * @apiviz.uses {@link CDOViewTargetChangedEvent} - - fires
  */
 public interface CDOView extends CDOCommonView, CDOUpdatable, CDOCommitHistory.Provider<CDOObject, CDOObjectHistory>, IContainer<CDOResourceNode>
 {
@@ -616,20 +606,6 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, CDOCommitHistory.P
    * @author Simon McDuff
    * @noextend This interface is not intended to be extended by clients.
    * @noimplement This interface is not intended to be implemented by clients.
-   * @apiviz.has {@link org.eclipse.net4j.util.ref.ReferenceType} oneway - - cacheReferences
-   * @apiviz.has {@link org.eclipse.emf.cdo.view.CDOInvalidationPolicy}
-   * @apiviz.composedOf {@link org.eclipse.emf.cdo.view.CDOAdapterPolicy} - - changeSubscriptions
-   * @apiviz.has {@link org.eclipse.emf.cdo.view.CDOAdapterPolicy} oneway - - strongReferences
-   * @apiviz.has {@link org.eclipse.emf.cdo.view.CDOStaleReferencePolicy} oneway - - staleReferences
-   * @apiviz.has {@link org.eclipse.emf.cdo.view.CDORevisionPrefetchingPolicy}
-   * @apiviz.uses {@link CDOView.Options.CacheReferenceTypeEvent} - - fires
-   * @apiviz.uses {@link CDOView.Options.StrongReferencePolicyEvent} - - fires
-   * @apiviz.uses {@link CDOView.Options.StaleReferencePolicyEvent} - - fires
-   * @apiviz.uses {@link CDOView.Options.ChangeSubscriptionPoliciesEvent} - - fires
-   * @apiviz.uses {@link CDOView.Options.InvalidationPolicyEvent} - - fires
-   * @apiviz.uses {@link CDOView.Options.InvalidationNotificationEvent} - - fires
-   * @apiviz.uses {@link CDOView.Options.RevisionPrefetchingPolicyEvent} - - fires
-   * @apiviz.uses {@link CDOView.Options.FeatureAnalyzerEvent} - - fires
    */
   public interface Options extends org.eclipse.emf.cdo.common.CDOCommonView.Options
   {
@@ -969,7 +945,6 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, CDOCommitHistory.P
      * @noextend This interface is not intended to be extended by clients.
      * @noimplement This interface is not intended to be implemented by clients.
      * @deprecated Use {@link StrongReferencePolicyEvent} instead.
-     * @apiviz.exclude
      */
     @Deprecated
     public interface ReferencePolicyEvent extends StrongReferencePolicyEvent
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewContainer.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewContainer.java
index d39e96a9aa..9cf83d6249 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewContainer.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewContainer.java
@@ -28,8 +28,6 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
  * @since 4.1
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.exclude
- * @apiviz.composedOf {@link CDOView} - - views
  */
 public interface CDOViewContainer extends IContainer<CDOView>, CDOViewOpener
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewEvent.java
index f67723f916..67d3ab25cc 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewEvent.java
@@ -19,7 +19,6 @@ import org.eclipse.net4j.util.event.IEvent;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.exclude
  */
 public interface CDOViewEvent extends IEvent
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewOpener.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewOpener.java
index 509c23b990..43f7654dfd 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewOpener.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewOpener.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
  *
  * @author Eike Stepper
  * @since 4.4
- * @apiviz.exclude
  */
 public interface CDOViewOpener
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProviderRegistry.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProviderRegistry.java
index ef12055679..2ac836131c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProviderRegistry.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProviderRegistry.java
@@ -24,7 +24,6 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.composedOf {@link org.eclipse.emf.cdo.view.CDOViewProvider}
  */
 public interface CDOViewProviderRegistry extends IContainer<CDOViewProvider>
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewRegistry.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewRegistry.java
index e0a3756090..a26bcfd09a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewRegistry.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewRegistry.java
@@ -22,7 +22,6 @@ import org.eclipse.net4j.util.container.IContainer;
  * @since 4.2
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.composedOf {@link org.eclipse.emf.cdo.view.CDOView}
  */
 public interface CDOViewRegistry extends IContainer<Registration>
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewSet.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewSet.java
index de3f82652f..2b5ed689b3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewSet.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewSet.java
@@ -28,11 +28,6 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.composedOf {@link CDOView} - - views
- * @apiviz.has {@link org.eclipse.emf.ecore.EPackage.Registry}
- * @apiviz.has {@link org.eclipse.emf.ecore.resource.ResourceSet}
- * @apiviz.has {@link org.eclipse.emf.cdo.eresource.CDOResourceFactory}
  */
 public interface CDOViewSet extends Notifier
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/ManagedContainerViewProvider.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/ManagedContainerViewProvider.java
index 6683be6214..7e660977d1 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/ManagedContainerViewProvider.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/ManagedContainerViewProvider.java
@@ -19,7 +19,6 @@ import org.eclipse.net4j.util.om.OMPlatform;
  *
  * @author Victor Roldan Betancort
  * @since 2.0
- * @apiviz.exclude
  */
 public abstract class ManagedContainerViewProvider extends AbstractCDOViewProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/package-info.java
index 9bf5310fe1..6dd2c8f901 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/package-info.java
@@ -7,14 +7,5 @@
 
 /**
  * Client concepts for dealing with views, view sets, queries, CDO objects and EMF resource sets.
- *
- * @apiviz.exclude .*\.CDOQueryInfo
- * @apiviz.exclude .*\.CDOLockChangeInfo
- * @apiviz.exclude .*\.CDOUpdatable
- * @apiviz.exclude .*\.CDOFetchRuleManager
- * @apiviz.exclude .*\.IContainer
- * @apiviz.exclude .*\.INotifier
- * @apiviz.exclude .*\.Notifier
- * @apiviz.exclude .*Event
  */
 package org.eclipse.emf.cdo.view;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/package-info.java
index ef99ad0bf3..e38d298608 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/package-info.java
@@ -7,7 +7,5 @@
 
 /**
  * Client service provider interfaces and useful base implementations.
- *
- * @apiviz.exclude .*
  */
 package org.eclipse.emf.spi.cdo;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java
index 3943ce685c..a4e2010537 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java
@@ -20,7 +20,6 @@ import java.lang.management.RuntimeMXBean;
  * Provides static methods that check object states and invocation arguments.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public final class CheckUtil
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ImplementationError.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ImplementationError.java
index 8c6e9db89f..563530a7cd 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ImplementationError.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ImplementationError.java
@@ -15,7 +15,6 @@ package org.eclipse.net4j.util;
  *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
- * @apiviz.exclude
  */
 public class ImplementationError extends Error
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
index 341e612e2a..b90990894e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
@@ -660,7 +660,6 @@ public final class ReflectUtil
    * ReflectUtil.collectFields()} and {@link ReflectUtil#toString(Object) ReflectUtil.toString()}.
    *
    * @author Eike Stepper
-   * @apiviz.exclude
    */
   @Retention(RetentionPolicy.RUNTIME)
   @Target(ElementType.FIELD)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/package-info.java
index a5f47e0e52..a40a7cc510 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/package-info.java
@@ -7,6 +7,5 @@
 
 /**
  * Additional collection-like interfaces and classes.
- * @apiviz.exclude .*
  */
 package org.eclipse.net4j.util.collection;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/package-info.java
index bba23a5a25..ffb722827b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/package-info.java
@@ -7,6 +7,5 @@
 
 /**
  * Utility interfaces and classes commonly useful in concurrent programming.
- * @apiviz.exclude .*
  */
 package org.eclipse.net4j.util.concurrent;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerDelta.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerDelta.java
index bc094f0f57..c53c77eea8 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerDelta.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerDelta.java
@@ -14,7 +14,6 @@ package org.eclipse.net4j.util.container;
  * A default {@link IContainerDelta container delta} implementation.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public class ContainerDelta<E> implements IContainerDelta<E>
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEvent.java
index 4c490aa8ce..e03473c3e3 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEvent.java
@@ -21,7 +21,6 @@ import java.util.List;
  *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
- * @apiviz.exclude
  */
 public class ContainerEvent<E> extends Event implements IContainerEvent<E>
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEventAdapter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEventAdapter.java
index f8985222f9..be2625560c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEventAdapter.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEventAdapter.java
@@ -22,7 +22,6 @@ import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
  * overridden by extenders.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public class ContainerEventAdapter<E> implements IListener
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FactoryNotFoundException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FactoryNotFoundException.java
index 7b9c8342d4..5ec5098a5a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FactoryNotFoundException.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FactoryNotFoundException.java
@@ -19,7 +19,6 @@ import org.eclipse.net4j.util.factory.IFactoryKey;
  *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
- * @apiviz.exclude
  */
 public class FactoryNotFoundException extends RuntimeException
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainer.java
index 19efbcbf47..cfc0698048 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainer.java
@@ -25,9 +25,6 @@ import java.util.Collection;
  * </ul>
  *
  * @author Eike Stepper
- * @apiviz.landmark
- * @apiviz.composedOf {@link java.lang.Object} - - elements
- * @apiviz.uses {@link IContainerEvent} - - fires
  */
 public interface IContainer<E> extends INotifier
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerDelta.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerDelta.java
index 73c2859872..eb90829af8 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerDelta.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerDelta.java
@@ -25,7 +25,6 @@ public interface IContainerDelta<E>
    * Enumerates the possible {@link IContainerDelta container delta} kinds {@link #ADDED} or {@link #REMOVED}.
    *
    * @author Eike Stepper
-   * @apiviz.exclude
    */
   public enum Kind
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEvent.java
index 360af551ec..416b3a832e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEvent.java
@@ -19,7 +19,6 @@ import org.eclipse.net4j.util.event.IEvent;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.composedOf {@link IContainerDelta} - - deltas
  */
 public interface IContainerEvent<E> extends IEvent
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java
index 4c4c8a37b2..a9001fccdb 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java
@@ -15,7 +15,6 @@ package org.eclipse.net4j.util.container;
  *
  * @see IContainerEvent#accept(IContainerEventVisitor)
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public interface IContainerEventVisitor<E>
 {
@@ -29,7 +28,6 @@ public interface IContainerEventVisitor<E>
    *
    * @see IContainerEvent#accept(IContainerEventVisitor)
    * @author Eike Stepper
-   * @apiviz.exclude
    */
   public interface Filtered<E> extends IContainerEventVisitor<E>
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java
index c4be920c23..f29fe1ea31 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java
@@ -29,9 +29,6 @@ import java.util.Set;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.composedOf {@link org.eclipse.net4j.util.factory.IFactory} - - factoryRegistry
- * @apiviz.composedOf {@link org.eclipse.net4j.util.container.IElementProcessor} - - postProcessors
  */
 public interface IManagedContainer extends IContainer<Object>, ILifecycle
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ISlow.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ISlow.java
index a1b905b591..e5b37d3951 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ISlow.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ISlow.java
@@ -15,7 +15,6 @@ package org.eclipse.net4j.util.container;
  *
  * @author Eike Stepper
  * @since 3.1
- * @apiviz.exclude
  */
 public interface ISlow
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/LifecycleEventConverter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/LifecycleEventConverter.java
index b7e6d925b0..791ade1cdb 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/LifecycleEventConverter.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/LifecycleEventConverter.java
@@ -21,7 +21,6 @@ import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
  * {@link IContainerEvent container events}.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public class LifecycleEventConverter<E> implements IListener
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
index 2b6bb05de8..370a59f578 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
@@ -49,7 +49,6 @@ import java.util.Set;
  * A default implementation of a {@link IManagedContainer managed container}.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public class ManagedContainer extends Lifecycle implements IManagedContainer
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java
index b861656748..69fd436741 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java
@@ -20,7 +20,6 @@ import java.text.MessageFormat;
  *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
- * @apiviz.exclude
  */
 public class SingleDeltaContainerEvent<E> extends Event implements IContainerEvent<E>
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/AbstractDelegator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/AbstractDelegator.java
index c2fe8fafa9..044fd8feea 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/AbstractDelegator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/AbstractDelegator.java
@@ -25,7 +25,6 @@ import java.util.Iterator;
  * A delegating base class for {@link IContainer containers}.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public abstract class AbstractDelegator<E> extends Notifier implements IContainer<E>
 {
@@ -84,7 +83,6 @@ public abstract class AbstractDelegator<E> extends Notifier implements IContaine
    * A delegating {@link Iterator iterator}.
    *
    * @author Eike Stepper
-   * @apiviz.exclude
    */
   public class DelegatingIterator implements Iterator<E>
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.java
index 33a406161b..e343b3e1ab 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.java
@@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit;
  * A default implementation of a {@link IContainerBlockingQueue container blocking queue}.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public class ContainerBlockingQueue<E> extends ContainerQueue<E> implements IContainerBlockingQueue<E>
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerCollection.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerCollection.java
index 8a6e45a1d3..a580aaaa6a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerCollection.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerCollection.java
@@ -21,7 +21,6 @@ import java.util.Iterator;
  * A default implementation of a {@link IContainerCollection container collection}.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public class ContainerCollection<E> extends AbstractDelegator<E> implements IContainerCollection<E>
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerList.java
index 8c73d1b635..6c913b4683 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerList.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerList.java
@@ -22,7 +22,6 @@ import java.util.ListIterator;
  * A default implementation of a {@link IContainerList container list}.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public class ContainerList<E> extends ContainerCollection<E> implements IContainerList<E>
 {
@@ -140,7 +139,6 @@ public class ContainerList<E> extends ContainerCollection<E> implements IContain
    * A delegating {@link ListIterator list iterator}.
    *
    * @author Eike Stepper
-   * @apiviz.exclude
    */
   public class DelegatingListIterator extends DelegatingIterator implements ListIterator<E>
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerMap.java
index 51810fa908..73eb02300e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerMap.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerMap.java
@@ -24,7 +24,6 @@ import java.util.Set;
  * A default implementation of a {@link IContainerMap container map}.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public class ContainerMap<K, V> extends AbstractDelegator<Map.Entry<K, V>> implements IContainerMap<K, V>
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerQueue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerQueue.java
index b42fa8254a..ca8813ac0b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerQueue.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerQueue.java
@@ -16,7 +16,6 @@ import java.util.Queue;
  * A default implementation of a {@link IContainerQueue container queue}.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public class ContainerQueue<E> extends ContainerCollection<E> implements IContainerQueue<E>
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSet.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSet.java
index 7d2694d679..6ee44f6cc4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSet.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSet.java
@@ -16,7 +16,6 @@ import java.util.Set;
  * A default implementation of a {@link IContainerSet container set}.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public class ContainerSet<E> extends ContainerCollection<E> implements IContainerSet<E>
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.java
index 2cc8684f45..1c1d738301 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.java
@@ -17,7 +17,6 @@ import java.util.SortedSet;
  * A default implementation of a {@link IContainerSortedSet container sorted set}.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public class ContainerSortedSet<E> extends ContainerSet<E> implements IContainerSortedSet<E>
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ExecutorServiceNotifier.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ExecutorServiceNotifier.java
index 99b1ec36da..7f69fb6882 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ExecutorServiceNotifier.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ExecutorServiceNotifier.java
@@ -19,7 +19,6 @@ import java.util.concurrent.ExecutorService;
  *
  * @author Eike Stepper
  * @since 2.0
- * @apiviz.exclude
  */
 @Deprecated
 public class ExecutorServiceNotifier extends Notifier implements IExecutorServiceProvider
@@ -53,7 +52,6 @@ public class ExecutorServiceNotifier extends Notifier implements IExecutorServic
    * Deprecated.
    *
    * @author Eike Stepper
-   * @apiviz.exclude
    */
   @Deprecated
   public static class ThreadPool extends ExecutorServiceNotifier
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IEvent.java
index 4f69712acb..7d15fb2c34 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IEvent.java
@@ -14,7 +14,6 @@ package org.eclipse.net4j.util.event;
  * An event that is fired from a {@link INotifier notifier} and can be handled by {@link IListener listeners}.
  *
  * @author Eike Stepper
- * @apiviz.landmark
  */
 public interface IEvent
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IListener.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IListener.java
index ea74a0a6e7..2e0ca6c310 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IListener.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IListener.java
@@ -16,7 +16,6 @@ import java.util.EventListener;
  * A callback interface that {@link INotifier notifiers} use to pass {@link IEvent events} to.
  *
  * @author Eike Stepper
- * @apiviz.landmark
  */
 public interface IListener extends EventListener
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/INotifier.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/INotifier.java
index c1ab6fab12..03fbaa49c3 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/INotifier.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/INotifier.java
@@ -20,9 +20,6 @@ package org.eclipse.net4j.util.event;
  * Implementors may want to extend {@link Notifier} instead of implementing this interface directly.
  *
  * @author Eike Stepper
- * @apiviz.landmark
- * @apiviz.owns {@link IListener} - - listeners
- * @apiviz.uses {@link IEvent} - - fires
  */
 public interface INotifier
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ThrowableEventAdapter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ThrowableEventAdapter.java
index 9e038fa091..602efa59c0 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ThrowableEventAdapter.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ThrowableEventAdapter.java
@@ -17,7 +17,6 @@ import java.io.PrintStream;
  * overridden by extenders.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  * @since 3.3
  */
 public class ThrowableEventAdapter implements IListener
@@ -56,7 +55,6 @@ public class ThrowableEventAdapter implements IListener
    * Prints the stack traces of throwable {@link ThrowableEvent events} to a {@link PrintStream}.
    *
    * @author Eike Stepper
-   * @apiviz.exclude
    */
   public static class ToPrintStream extends ThrowableEventAdapter
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ValueNotifier.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ValueNotifier.java
index 0108196cf5..241be9ce1e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ValueNotifier.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ValueNotifier.java
@@ -22,8 +22,6 @@ import org.eclipse.net4j.util.ObjectUtil;
  *
  * @author Eike Stepper
  * @since 3.1
- * @apiviz.has {@link java.lang.Object} oneway - - value
- * @apiviz.uses {@link ValueEvent} - - fires
  */
 public class ValueNotifier<VALUE> extends Notifier
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryCreationException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryCreationException.java
index 8e85c61f79..ed411647c4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryCreationException.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryCreationException.java
@@ -15,7 +15,6 @@ package org.eclipse.net4j.util.factory;
  *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
- * @apiviz.exclude
  */
 public class FactoryCreationException extends RuntimeException
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryDescriptor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryDescriptor.java
index 55d1623d50..7b766de022 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryDescriptor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryDescriptor.java
@@ -31,7 +31,6 @@ import org.eclipse.core.runtime.IExtensionRegistry;
  *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
- * @apiviz.exclude
  */
 public class FactoryDescriptor extends Factory
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryKey.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryKey.java
index 8a208ef5de..611361eba8 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryKey.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryKey.java
@@ -20,7 +20,6 @@ import java.text.MessageFormat;
  * A default implementation of a {@link IFactoryKey factory key}.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public final class FactoryKey implements IFactoryKey, Serializable, Comparable<FactoryKey>
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java
index ff61c391d5..1837b28267 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java
@@ -21,9 +21,6 @@ import org.eclipse.net4j.util.container.IManagedContainerFactory;
  * injects that container into the factory for it to reach back into to obtain dependencies.
  *
  * @author Eike Stepper
- * @apiviz.landmark
- * @apiviz.has {@link IFactoryKey}
- *
  * @see IManagedContainerFactory
  */
 public interface IFactory
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactoryKey.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactoryKey.java
index 64296bc29a..2f58cdaa14 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactoryKey.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactoryKey.java
@@ -16,7 +16,6 @@ package org.eclipse.net4j.util.factory;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
  */
 public interface IFactoryKey
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/ProductCreationException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/ProductCreationException.java
index b824ac462e..31f388d470 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/ProductCreationException.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/ProductCreationException.java
@@ -16,7 +16,6 @@ package org.eclipse.net4j.util.factory;
  *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
- * @apiviz.exclude
  */
 public class ProductCreationException extends RuntimeException
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
index 138479ddbc..6a1efff057 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
@@ -29,9 +29,6 @@ import java.text.MessageFormat;
  * </ul>
  *
  * @author Eike Stepper
- * @apiviz.landmark
- * @apiviz.has {@link ITransition} oneway - - matrix
- * @apiviz.uses {@link FiniteStateMachine.StateChangedEvent} - - fires
  */
 public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends Enum<?>, SUBJECT> extends Lifecycle
 {
@@ -238,7 +235,6 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
    *
    * @author Eike Stepper
    * @deprecated Use {@link FiniteStateMachine#IGNORE}
-   * @apiviz.exclude
    */
   @Deprecated
   public static class IgnoreTransition implements ITransition<Enum<?>, Enum<?>, Object, Object>
@@ -260,7 +256,6 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
    *
    * @author Eike Stepper
    * @deprecated Use {@link FiniteStateMachine#FAIL}
-   * @apiviz.exclude
    */
   @Deprecated
   public static class FailTransition implements ITransition<Enum<?>, Enum<?>, Object, Object>
@@ -281,7 +276,6 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
    * A {@link ITransition transition} that does nothing.
    *
    * @author Eike Stepper
-   * @apiviz.exclude
    */
   private static class InternalIgnoreTransition implements ITransition<Enum<?>, Enum<?>, Object, Object>
   {
@@ -301,7 +295,6 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
    * A {@link ITransition transition} that throws an {@link IllegalStateException}.
    *
    * @author Eike Stepper
-   * @apiviz.exclude
    */
   private static class InternalFailTransition implements ITransition<Enum<?>, Enum<?>, Object, Object>
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java
index 67af0a17bd..e8810fc147 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java
@@ -14,7 +14,6 @@ package org.eclipse.net4j.util.fsm;
  * Encpsulates the logic to be executed when an <i>event</i> arrives for a <i>subject</i> in a particular <i>state</i>.
  *
  * @author Eike Stepper
- * @apiviz.landmark
  */
 public interface ITransition<STATE extends Enum<?>, EVENT extends Enum<?>, SUBJECT, DATA>
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/package-info.java
index 5f27899699..f7861840cd 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/package-info.java
@@ -7,6 +7,5 @@
 
 /**
  * Interfaces and classes for I/O.
- * @apiviz.exclude .*
  */
 package org.eclipse.net4j.util.io;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/IDeactivateable.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/IDeactivateable.java
index e8ffc54cf6..710e692ac5 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/IDeactivateable.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/IDeactivateable.java
@@ -12,7 +12,6 @@ package org.eclipse.net4j.util.lifecycle;
 
 /**
  * @author Eike Stepper
- * @apiviz.excludeSubtypes
  * @since 3.6
  */
 public interface IDeactivateable
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java
index e7a1e89a4d..226a87d84b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java
@@ -22,10 +22,6 @@ import org.eclipse.net4j.util.event.INotifier;
  * </ul>
  *
  * @author Eike Stepper
- * @apiviz.landmark
- * @apiviz.has {@link LifecycleState}
- * @apiviz.uses {@link ILifecycleEvent} - - fires
- * @apiviz.excludeSubtypes
  */
 public interface ILifecycle extends IDeactivateable, INotifier
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java
index 5360de1741..dd8aec576d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java
@@ -20,7 +20,6 @@ import org.eclipse.net4j.util.event.IEvent;
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement Thi import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IEvent; import
  *              org.eclipse.net4j.util.event.IEvent; s interface is not intended to be implemented by clients.
- * @apiviz.has {@link org.eclipse.net4j.util.lifecycle.ILifecycleEvent.Kind}
  */
 public interface ILifecycleEvent extends IEvent
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java
index 78c045fee3..111591079a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java
@@ -25,7 +25,6 @@ import java.util.concurrent.Semaphore;
  * A default implementation of an entity with a {@link ILifecycle lifecycle}.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public class Lifecycle extends Notifier implements ILifecycle, DeferrableActivation
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleEvent.java
index 5157ba5a5e..88076cedd9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleEvent.java
@@ -17,7 +17,6 @@ import org.eclipse.net4j.util.event.Event;
  *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
- * @apiviz.exclude
  */
 public class LifecycleEvent extends Event implements ILifecycleEvent
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleEventAdapter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleEventAdapter.java
index b9d1dc3cfc..a7a63f79d1 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleEventAdapter.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleEventAdapter.java
@@ -18,7 +18,6 @@ import org.eclipse.net4j.util.event.IListener;
  * overridden by extenders.
  *
  * @author Eike Stepper
- * @apiviz.exclude
  */
 public class LifecycleEventAdapter implements IListener
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java
index c02795311d..52f2853927 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java
@@ -15,7 +15,6 @@ package org.eclipse.net4j.util.lifecycle;
  *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
- * @apiviz.exclude
  */
 public class LifecycleException extends IllegalStateException
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
index 545a4a8db1..c9c648b285 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
@@ -352,7 +352,6 @@ public final class LifecycleUtil
    * {@link LifecycleUtil#activate(Object)}.
    *
    * @author Eike Stepper
-   * @apiviz.exclude
    */
   @Retention(RetentionPolicy.RUNTIME)
   @Target(ElementType.METHOD)
@@ -366,7 +365,6 @@ public final class LifecycleUtil
    * {@link LifecycleUtil#deactivate(Object)}.
    *
    * @author Eike Stepper
-   * @apiviz.exclude
    */
   @Retention(RetentionPolicy.RUNTIME)
   @Target(ElementType.METHOD)
@@ -381,7 +379,6 @@ public final class LifecycleUtil
    *
    * @author Eike Stepper
    * @since 2.0
-   * @apiviz.exclude
    */
   public static final class Delegator<T> implements InvocationHandler
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java
index 71de083ceb..21163f2967 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java
@@ -34,13 +34,6 @@ import java.util.ResourceBundle;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link org.eclipse.net4j.util.om.pref.OMPreferences} oneway - - preferences
- * @apiviz.has {@link org.eclipse.net4j.util.om.log.OMLogger} oneway - - logger
- * @apiviz.owns {@link org.eclipse.net4j.util.om.trace.OMTracer} - - tracers
- * @apiviz.has {@link OMBundle.DebugSupport}
- * @apiviz.has {@link OMBundle.TranslationSupport}
- * @apiviz.has {@link java.util.Properties} oneway - - config
  */
 public interface OMBundle
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java
index c2955fff80..2d14a49e53 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java
@@ -25,11 +25,6 @@ import java.util.Properties;
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.landmark
- * @apiviz.has {@link OMBundle} bundles platform
- * @apiviz.owns {@link org.eclipse.net4j.util.om.log.OMLogHandler} - - logHandlers
- * @apiviz.owns {@link org.eclipse.net4j.util.om.trace.OMTraceHandler} - - traceHandlers
- * @apiviz.has {@link java.io.File} oneway - - stateFolder
  */
 public interface OMPlatform
 {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java
index 7fca4b9e64..1d8c3aef98 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java
@@ -287,7 +287,6 @@ public abstract class OSGiActivator implements BundleActivator
    *
    * @author Eike Stepper
    * @since 3.1
-   * @apiviz.has {@link OSGiActivator.StateHandler} oneway - - stateHandler
    */
   public static abstract class WithState extends OSGiActivator
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/package-info.java
index 0fc743ce07..1fa12568c1 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/package-info.java
@@ -7,6 +7,5 @@
 
 /**
  * Interfaces and classes for security, negotiation, authentication, authorization and cryptography.
- * @apiviz.exclude .*
  */
 package org.eclipse.net4j.util.security;