37 files changed, 179 insertions, 25 deletions
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 671af79abb..bb87693f0c 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,6 +27,7 @@ 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 19be4417eb..afa1f3154d 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
@@ -30,8 +30,13 @@ 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.has CDOState
- * @apiviz.owns CDOAdapter
+ * @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
  */
 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 a7ef3d7355..6bce0436f9 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
@@ -19,6 +19,8 @@ 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 f2e64c24df..5a6f85d972 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
@@ -25,22 +25,23 @@ 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. <!-- end-user-doc -->
- *              <p>
- *              The following features are supported:
- *              <ul>
- *              <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}</li>
- *              <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getURI <em>URI</em>}</li>
- *              <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getContents <em>Contents</em>}</li>
- *              <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}</li>
- *              <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded <em>Loaded</em>}</li>
- *              <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking Modification
- *              </em>}</li>
- *              <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors <em>Errors</em>}</li>
- *              <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings <em>Warnings</em>}</li>
- *              <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp <em>Time Stamp</em>}</li>
- *              </ul>
- *              </p>
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @apiviz.landmark <!-- end-user-doc -->
+ *                  <p>
+ *                  The following features are supported:
+ *                  <ul>
+ *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}</li>
+ *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getURI <em>URI</em>}</li>
+ *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getContents <em>Contents</em>}</li>
+ *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}</li>
+ *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded <em>Loaded</em>}</li>
+ *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking
+ *                  Modification </em>}</li>
+ *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors <em>Errors</em>}</li>
+ *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings <em>Warnings</em>}</li>
+ *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp <em>Time Stamp</em>}</li>
+ *                  </ul>
+ *                  </p>
  * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource()
  * @model
  * @generated
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 5e1b681712..667973672a 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
@@ -21,6 +21,7 @@ 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 19fc1c744b..5167e3ef6d 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,6 +15,8 @@ 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 -->
  * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceFolder()
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 017964fc2b..90b92f108c 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,6 +16,7 @@ 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 74d023cec9..09e56e9ca5 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,6 +26,7 @@ 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 f6526903c1..1fbd576770 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
@@ -11,5 +11,8 @@
 
 /**
  * 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 9735ad79ee..b9f0613402 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
@@ -11,5 +11,9 @@
 
 /**
  * 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 6b6abf07bf..c1a41ac4ee 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,6 +16,8 @@ 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/EtypesPackage.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java
index 2922ee8d26..8c962717e7 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java
@@ -25,10 +25,12 @@ import org.eclipse.emf.ecore.EReference;
  * <li>each enum,</li>
  * <li>and each data type</li>
  * </ul>
+ * <!-- end-user-doc -->
  * 
  * @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 -->
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @apiviz.exclude
  * @see org.eclipse.emf.cdo.etypes.EtypesFactory
  * @model kind="package"
  * @generated
@@ -312,8 +314,9 @@ public interface EtypesPackage extends EPackage
   {
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.etypes.impl.ModelElementImpl <em>Model Element</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * class. <!-- begin-user-doc -->
      * 
+     * @apiviz.exclude <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.etypes.impl.ModelElementImpl
      * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getModelElement()
      * @generated
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 2fb6fde374..c5cd286915 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
@@ -11,5 +11,8 @@
 
 /**
  * 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 db85dc5079..4511b229e4 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
@@ -11,5 +11,8 @@
 
 /**
  * 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 7ca00e2e77..c202125f04 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
@@ -11,6 +11,8 @@
 
 /**
  * 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/CDORepositoryInfo.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDORepositoryInfo.java
index bcdbe10cc2..24ee0e13b9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDORepositoryInfo.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDORepositoryInfo.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.cdo.common.CDOCommonRepository;
  * Describes a model repository a {@link CDOSession session} is connected to.
  * 
  * @author Eike Stepper
- * @see CDOSession#getRepositoryInfo()
  * @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.
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 b4a0ccd125..1db1443aaf 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
@@ -13,6 +13,7 @@
  */
 package org.eclipse.emf.cdo.session;
 
+import org.eclipse.emf.cdo.CDOLock;
 import org.eclipse.emf.cdo.common.CDOCommonSession;
 import org.eclipse.emf.cdo.common.branch.CDOBranch;
 import org.eclipse.emf.cdo.common.branch.CDOBranchManager;
@@ -51,13 +52,38 @@ import org.eclipse.emf.spi.cdo.CDOSessionProtocol;
  * <li> {@link CDOSession#getViews() View management}
  * </ul>
  * <p>
- * Note that, in order to retrieve, access and store {@link EObject objects} a {@link CDOView view} is needed. The
+ * Note that in order to retrieve, access and store {@link EObject objects} a {@link CDOView view} is needed. The
  * various <code>openXYZ</code> methods are provided for this purpose.
+ * <p>
+ * A session can fire the following events:
+ * <ul>
+ * <li> {@link CDOSessionInvalidationEvent} after {@link Options#setPassiveUpdateEnabled(boolean) commit notifications}
+ * have been received and processed.
+ * <li> {@link CDOSessionLocksChangedEvent} after {@link CDOLock locks} have been acquired or released.
+ * </ul>
  * 
  * @author Eike Stepper
  * @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
 {
@@ -154,10 +180,24 @@ public interface CDOSession extends CDOCommonSession, CDOUpdatable, CDOTransacti
 
   /**
    * Encapsulates a set of notifying {@link CDOSession session} configuration options.
+   * <p>
+   * The session options can fire the following events:
+   * <ul>
+   * <li> {@link GeneratedPackageEmulationEvent} after the {@link #setGeneratedPackageEmulationEnabled(boolean) generated
+   * package emulation mode} has changed.
+   * <li> {@link CollectionLoadingPolicyEvent} after the {@link #setCollectionLoadingPolicy(CDOCollectionLoadingPolicy)
+   * collection loading policy} has changed.
+   * <li> {@link LobCacheEvent} after the {@link #setLobCache(CDOLobStore) large object cache} has changed.
+   * </ul>
    * 
    * @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 c219833a51..7a0d21c4cb 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
@@ -20,11 +20,19 @@ import org.eclipse.net4j.util.event.INotifier;
 
 /**
  * Configures and opens new {@link CDOSession sessions}.
+ * <p>
+ * A session configuration can fire the following events:
+ * <ul>
+ * <li> {@link CDOSessionConfiguration.SessionOpenedEvent} after a session has been opened by this configuration.
+ * </ul>
  * 
  * @author Eike Stepper
  * @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 93af6d3ff4..dc968fb8db 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,6 +15,8 @@ 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 2a05590a5a..d4b9885bab 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,6 +19,7 @@ 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 691bd145ed..4bc966e532 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,6 +15,7 @@ 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 fcae558fa6..e8379d2484 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
@@ -10,6 +10,16 @@
  */
 
 /**
- * Client concepts for dealing with sessions to remote repositories.
+ * 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 d9c9871a95..600455f7d5 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
@@ -27,6 +27,8 @@ 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
 {
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 08c7cdcf5a..faba2e163f 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
@@ -11,5 +11,8 @@
 
 /**
  * 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 cf7d1d537c..0a399015fc 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
@@ -23,6 +23,7 @@ import java.util.regex.Pattern;
  * 
  * @author Victor Roldan Betancort
  * @since 2.0
+ * @apiviz.exclude
  */
 public abstract class AbstractCDOViewProvider implements CDOViewProvider
 {
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 fcebd9ec15..d330a13a9d 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,6 +22,7 @@ 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 6e97ee466e..ce7e9f69de 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,6 +27,11 @@ 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 214ff68451..4865956c12 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
@@ -17,6 +17,7 @@ package org.eclipse.emf.cdo.view;
  * @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
 {
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 100d1a4f65..b79b77dec8 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
@@ -71,6 +71,17 @@ 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.landmark
+ * @apiviz.has {@link org.eclipse.emf.cdo.common.branch.CDOBranchPoint} oneway - - target
+ * @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, INotifier
 {
@@ -401,6 +412,19 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, INotifier
    * @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 - - cacheReferenceType
+   * @apiviz.has {@link org.eclipse.emf.cdo.view.CDOInvalidationPolicy}
+   * @apiviz.composedOf {@link org.eclipse.emf.cdo.view.CDOAdapterPolicy} - - changeSubscriptionPolicies
+   * @apiviz.has {@link org.eclipse.emf.cdo.view.CDOAdapterPolicy} oneway - - strongReferencePolicy
+   * @apiviz.has {@link org.eclipse.emf.cdo.view.CDOStaleReferencePolicy} oneway - - staleReferenceBehaviour
+   * @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
    */
   public interface Options extends org.eclipse.emf.cdo.common.CDOCommonView.Options
   {
@@ -588,6 +612,7 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, INotifier
      * @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 a59b993d27..ff436a3010 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,6 +28,8 @@ 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>
 {
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 fcee486bfe..3a41326fc0 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,6 +19,7 @@ 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/CDOViewProvider.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProvider.java
index 40657e0fd1..b2109513bb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProvider.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProvider.java
@@ -20,8 +20,6 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
  * 
  * @since 2.0
  * @author Victor Roldan Betancort
- * @see CDOView
- * @see CDOViewProviderRegistry
  */
 public interface CDOViewProvider
 {
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 c2c75a552f..1986ab87bb 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,6 +24,7 @@ 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/CDOViewSet.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewSet.java
index 469108e882..2ed84750cf 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
@@ -27,6 +27,11 @@ 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} viewSet 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 9a3a6b7343..09fff250c8 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,6 +19,7 @@ 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 0d282c9152..4afa475ff1 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
@@ -11,5 +11,15 @@
 
 /**
  * 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 c020ca21c4..f4638bf71c 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
@@ -11,5 +11,8 @@
 
 /**
  * Client service provider interfaces and useful base implementations.
+ * 
+ * @apiviz.exclude .*
  */
 package org.eclipse.emf.spi.cdo;
+