42 files changed, 172 insertions, 68 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassInfo.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassInfo.html
index 31775081e6..9538966545 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassInfo.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassInfo.html
@@ -96,7 +96,14 @@ Interface CDOClassInfo</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>CDOClassInfo</B><DT>extends <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify">Adapter</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="CDOClassInfo.html" title="&#171;interface&#187; CDOClassInfo" alt="" coords="57,100,159,140"/>
+<area shape="rect" id="node2" title="&#171;interface&#187; Adapter (org.eclipse.emf.common.notify)" alt="" coords="5,6,211,61"/>
+</map>
+
+<CENTER><IMG SRC="CDOClassInfo.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 An EMF <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify"><CODE>adapter</CODE></A> that encapsulates CDO specific information about an <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/EClass.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>EClass</CODE></A>.
@@ -106,8 +113,6 @@ An EMF <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/e
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>No Implement</B></DT>
   <DD>This interface is not intended to be implemented by clients.</DD>
 <DT><B>No Extend</B></DT>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassInfo.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassInfo.png
new file mode 100644
index 0000000000..def8031da7
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassInfo.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassifierRef.Provider.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassifierRef.Provider.html
index 6d4511d5ab..b8a09dc44e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassifierRef.Provider.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassifierRef.Provider.html
@@ -96,7 +96,13 @@ Interface CDOClassifierRef.Provider</H2>
 <HR>
 <DL>
 <DT><PRE>public static interface <B>CDOClassifierRef.Provider</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="CDOClassifierRef.Provider.html" title="&#171;interface&#187; CDOClassifierRef.Provider" alt="" coords="5,5,176,45"/>
+</map>
+
+<CENTER><IMG SRC="CDOClassifierRef.Provider.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Provides <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOClassifierRef.html" title="class in org.eclipse.emf.cdo.common.model"><CODE>classifier references</CODE></A>.
@@ -106,8 +112,6 @@ Provides <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOClassifi
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassifierRef.Provider.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassifierRef.Provider.png
new file mode 100644
index 0000000000..b9709ab4e8
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassifierRef.Provider.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassifierRef.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassifierRef.html
index 65ab5e2185..1868d24c91 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassifierRef.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassifierRef.html
@@ -97,7 +97,13 @@ Class CDOClassifierRef</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>CDOClassifierRef</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="CDOClassifierRef.html" title="CDOClassifierRef" alt="" coords="5,6,128,31"/>
+</map>
+
+<CENTER><IMG SRC="CDOClassifierRef.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 References an <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/EClassifier.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>EClassifier</CODE></A>.
@@ -107,8 +113,6 @@ References an <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassifierRef.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassifierRef.png
new file mode 100644
index 0000000000..dd9e9c5c9b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOClassifierRef.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOModelConstants.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOModelConstants.html
index fe9ff5652c..0408567f4d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOModelConstants.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOModelConstants.html
@@ -96,7 +96,14 @@ Interface CDOModelConstants</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>CDOModelConstants</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="CDOModelUtil.html" title="&#171;static&#187; CDOModelUtil" alt="" coords="25,84,129,124"/>
+<area shape="rect" id="node2" href="CDOModelConstants.html" title="&#171;interface&#187; CDOModelConstants" alt="" coords="5,5,149,45"/>
+</map>
+
+<CENTER><IMG SRC="CDOModelConstants.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Symbolic model constants commonly used in CDO.
@@ -106,8 +113,6 @@ Symbolic model constants commonly used in CDO.
 <DL>
 <DT><B>Since:</B></DT>
   <DD>4.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>No Implement</B></DT>
   <DD>This interface is not intended to be implemented by clients.</DD>
 <DT><B>No Extend</B></DT>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOModelConstants.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOModelConstants.png
new file mode 100644
index 0000000000..d6960c36c8
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOModelConstants.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOModelUtil.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOModelUtil.html
index 874908aa08..75d18d264c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOModelUtil.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOModelUtil.html
@@ -100,7 +100,14 @@ Class CDOModelUtil</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>CDOModelUtil</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOModelConstants.html" title="interface in org.eclipse.emf.cdo.common.model">CDOModelConstants</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="CDOModelUtil.html" title="&#171;static&#187; CDOModelUtil" alt="" coords="25,84,129,124"/>
+<area shape="rect" id="node2" href="CDOModelConstants.html" title="&#171;interface&#187; CDOModelConstants" alt="" coords="5,5,149,45"/>
+</map>
+
+<CENTER><IMG SRC="CDOModelUtil.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Various static helper methods for dealing with CDO meta models.
@@ -110,8 +117,6 @@ Various static helper methods for dealing with CDO meta models.
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOModelUtil.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOModelUtil.png
new file mode 100644
index 0000000000..01e974da98
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOModelUtil.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageInfo.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageInfo.html
index 8cd2485de5..a668ae9e67 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageInfo.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageInfo.html
@@ -99,7 +99,17 @@ Interface CDOPackageInfo</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>CDOPackageInfo</B><DT>extends <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify">Adapter</A>, <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/EPackage.Descriptor.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EPackage.Descriptor</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</A>&lt;<A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageInfo.html" title="interface in org.eclipse.emf.cdo.common.model">CDOPackageInfo</A>&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../../spi/common/model/InternalCDOPackageInfo.html" title="&#171;interface&#187; InternalCDOPackageInfo (org.eclipse.emf.cdo.spi.common.model)" alt="" coords="106,179,363,234"/>
+<area shape="rect" id="node2" title="&#171;interface&#187; EPackage.Descriptor (org.eclipse.emf.ecore)" alt="" coords="5,6,160,61"/>
+<area shape="rect" id="node3" title="&#171;interface&#187; Comparable (java.lang)" alt="" coords="189,6,280,61"/>
+<area shape="rect" id="node4" href="CDOPackageInfo.html" title="&#171;interface&#187; CDOPackageInfo" alt="" coords="174,100,295,140"/>
+<area shape="rect" id="node5" title="&#171;interface&#187; Adapter (org.eclipse.emf.common.notify)" alt="" coords="310,6,516,61"/>
+</map>
+
+<CENTER><IMG SRC="CDOPackageInfo.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Describes a single <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/EPackage.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>package </CODE></A> instance of the nested package tree strucure represented by the
@@ -114,8 +124,6 @@ Describes a single <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>No Implement</B></DT>
   <DD>This interface is not intended to be implemented by clients.</DD>
 <DT><B>No Extend</B></DT>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageInfo.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageInfo.png
new file mode 100644
index 0000000000..296e9dd4c0
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageInfo.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.html
index 984f20c1c9..ffdb939724 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.html
@@ -102,7 +102,15 @@ Interface CDOPackageRegistry</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>CDOPackageRegistry</B><DT>extends <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/EPackage.Registry.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EPackage.Registry</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../../spi/common/model/InternalCDOPackageRegistry.html" title="&#171;interface&#187; InternalCDOPackageRegistry (org.eclipse.emf.cdo.spi.common.model)" alt="" coords="5,179,261,234"/>
+<area shape="rect" id="node2" title="&#171;interface&#187; EPackage.Registry (org.eclipse.emf.ecore)" alt="" coords="56,6,211,61"/>
+<area shape="rect" id="node3" href="CDOPackageRegistry.html" title="&#171;interface&#187; CDOPackageRegistry" alt="" coords="59,100,208,140"/>
+</map>
+
+<CENTER><IMG SRC="CDOPackageRegistry.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 An EMF <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/EPackage.Registry.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>package registry</CODE></A> that is used by CDO <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repositories</CODE></A> and
@@ -113,8 +121,6 @@ An EMF <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/e
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>No Implement</B></DT>
   <DD>This interface is not intended to be implemented by clients.</DD>
 <DT><B>No Extend</B></DT>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.png
new file mode 100644
index 0000000000..ca53c911f2
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.Descriptor.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.Descriptor.html
index 67290f50eb..86eff508a3 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.Descriptor.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.Descriptor.html
@@ -103,7 +103,14 @@ Class CDOPackageRegistryPopulator.Descriptor</H2>
 <HR>
 <DL>
 <DT><PRE>public static class <B>CDOPackageRegistryPopulator.Descriptor</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/EPackage.Descriptor.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EPackage.Descriptor</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; EPackage.Descriptor (org.eclipse.emf.ecore)" alt="" coords="61,6,216,61"/>
+<area shape="rect" id="node2" href="CDOPackageRegistryPopulator.Descriptor.html" title="CDOPackageRegistryPopulator.Descriptor" alt="" coords="5,101,272,126"/>
+</map>
+
+<CENTER><IMG SRC="CDOPackageRegistryPopulator.Descriptor.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 A package <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/EPackage.Descriptor.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>descriptor</CODE></A> that resolves <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/EPackage.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>packages</CODE></A> from
@@ -111,10 +118,6 @@ A package <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/or
 <P>
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.Descriptor.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.Descriptor.png
new file mode 100644
index 0000000000..5a28eca834
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.Descriptor.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.html
index fe54476e38..578a4305bc 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.html
@@ -103,7 +103,14 @@ Class CDOPackageRegistryPopulator</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>CDOPackageRegistryPopulator</B><DT>extends <A HREF="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">Worker</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="Worker (org.eclipse.net4j.util.concurrent)" alt="" coords="5,5,216,45"/>
+<area shape="rect" id="node2" href="CDOPackageRegistryPopulator.html" title="CDOPackageRegistryPopulator" alt="" coords="9,85,212,110"/>
+</map>
+
+<CENTER><IMG SRC="CDOPackageRegistryPopulator.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Populates a <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.html#getTarget()"><CODE>target</CODE></A> package registry by asynchronously polling a <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.html#getSource()"><CODE>source</CODE></A>
@@ -114,8 +121,6 @@ Populates a <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPacka
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.png
new file mode 100644
index 0000000000..fe9081734a
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.CDOObjectMarker.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.CDOObjectMarker.html
index 43cc3b7b51..201511a2b4 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.CDOObjectMarker.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.CDOObjectMarker.html
@@ -102,7 +102,14 @@ Interface CDOPackageTypeRegistry.CDOObjectMarker</H2>
 <HR>
 <DL>
 <DT><PRE>public static interface <B>CDOPackageTypeRegistry.CDOObjectMarker</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../../../spi/cdo/InternalCDOObject.html" title="&#171;interface&#187; InternalCDOObject (org.eclipse.emf.spi.cdo)" alt="" coords="66,85,229,139"/>
+<area shape="rect" id="node2" href="CDOPackageTypeRegistry.CDOObjectMarker.html" title="&#171;interface&#187; CDOPackageTypeRegistry.CDOObjectMarker" alt="" coords="5,5,291,45"/>
+</map>
+
+<CENTER><IMG SRC="CDOPackageTypeRegistry.CDOObjectMarker.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 A common marker interface for CDO (native) objects.
@@ -110,8 +117,6 @@ A common marker interface for CDO (native) objects.
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>No Implement</B></DT>
   <DD>This interface is not intended to be implemented by clients.</DD>
 <DT><B>No Extend</B></DT>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.CDOObjectMarker.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.CDOObjectMarker.png
new file mode 100644
index 0000000000..e7038668e1
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.CDOObjectMarker.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.html
index 2d8adc6b53..60b90775b4 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.html
@@ -97,7 +97,13 @@ Class CDOPackageTypeRegistry</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>CDOPackageTypeRegistry</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="CDOPackageTypeRegistry.html" title="CDOPackageTypeRegistry" alt="" coords="5,6,181,31"/>
+</map>
+
+<CENTER><IMG SRC="CDOPackageTypeRegistry.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 A <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.html#INSTANCE"><CODE>singleton</CODE></A> registry for the <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageUnit.Type.html" title="enum in org.eclipse.emf.cdo.common.model"><CODE>package unit types</CODE></A> of EMF <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/EPackage.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>packages</CODE></A>.
@@ -107,8 +113,6 @@ A <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageTypeRegi
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.png
new file mode 100644
index 0000000000..7c6fd41425
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.State.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.State.html
index 39efa58ea2..ae67631b31 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.State.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.State.html
@@ -104,17 +104,19 @@ Enum CDOPackageUnit.State</H2>
 <HR>
 <DL>
 <DT><PRE>public static enum <B>CDOPackageUnit.State</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</A>&lt;<A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageUnit.State.html" title="enum in org.eclipse.emf.cdo.common.model">CDOPackageUnit.State</A>&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="CDOPackageUnit.State.html" title="&#171;enum&#187; CDOPackageUnit.State" alt="" coords="5,5,163,45"/>
+</map>
+
+<CENTER><IMG SRC="CDOPackageUnit.State.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Describes the possible states a <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageUnit.html" title="interface in org.eclipse.emf.cdo.common.model"><CODE>package unit</CODE></A> may be in during its lifecycle.
 <P>
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.State.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.State.png
new file mode 100644
index 0000000000..5b0b05abbf
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.State.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.Type.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.Type.html
index 13f90f1e3b..eb184019d5 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.Type.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.Type.html
@@ -104,17 +104,19 @@ Enum CDOPackageUnit.Type</H2>
 <HR>
 <DL>
 <DT><PRE>public static enum <B>CDOPackageUnit.Type</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</A>&lt;<A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageUnit.Type.html" title="enum in org.eclipse.emf.cdo.common.model">CDOPackageUnit.Type</A>&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="CDOPackageUnit.Type.html" title="&#171;enum&#187; CDOPackageUnit.Type" alt="" coords="5,5,160,45"/>
+</map>
+
+<CENTER><IMG SRC="CDOPackageUnit.Type.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Describes the instances of <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/EClass.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>classes</CODE></A> of a <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageUnit.html" title="interface in org.eclipse.emf.cdo.common.model"><CODE>package unit</CODE></A>.
 <P>
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.Type.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.Type.png
new file mode 100644
index 0000000000..dc317c2f8c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.Type.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.html
index b60129c271..1aef7b758b 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.html
@@ -99,7 +99,15 @@ Interface CDOPackageUnit</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>CDOPackageUnit</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</A>&lt;<A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageUnit.html" title="interface in org.eclipse.emf.cdo.common.model">CDOPackageUnit</A>&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../../spi/common/model/InternalCDOPackageUnit.html" title="&#171;interface&#187; InternalCDOPackageUnit (org.eclipse.emf.cdo.spi.common.model)" alt="" coords="5,179,261,234"/>
+<area shape="rect" id="node2" title="&#171;interface&#187; Comparable (java.lang)" alt="" coords="88,6,179,61"/>
+<area shape="rect" id="node3" href="CDOPackageUnit.html" title="&#171;interface&#187; CDOPackageUnit" alt="" coords="71,100,195,140"/>
+</map>
+
+<CENTER><IMG SRC="CDOPackageUnit.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Represents a tree structure of nested <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/EPackage.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>packages</CODE></A> that are registered with a <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageRegistry.html" title="interface in org.eclipse.emf.cdo.common.model"><CODE>package registry</CODE></A> and that can only be serialized as a whole.
@@ -113,8 +121,6 @@ Represents a tree structure of nested <A HREF="http://download.eclipse.org/model
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>No Implement</B></DT>
   <DD>This interface is not intended to be implemented by clients.</DD>
 <DT><B>No Extend</B></DT>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.png
new file mode 100644
index 0000000000..26036e9383
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOPackageUnit.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOType.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOType.html
index ca9819cf8f..bb35b7d4e4 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOType.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOType.html
@@ -93,14 +93,18 @@ Interface CDOType</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>CDOType</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="CDOType.html" title="&#171;interface&#187; CDOType" alt="" coords="5,5,91,45"/>
+</map>
+
+<CENTER><IMG SRC="CDOType.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>No Implement</B></DT>
   <DD>This interface is not intended to be implemented by clients.</DD>
 </DL>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOType.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOType.png
new file mode 100644
index 0000000000..0a9284df26
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOType.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.ExtResourceSet.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.ExtResourceSet.html
index 53ccbf07b8..ca5fc58462 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.ExtResourceSet.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.ExtResourceSet.html
@@ -106,7 +106,14 @@ Class EMFUtil.ExtResourceSet</H2>
 <HR>
 <DL>
 <DT><PRE>public static class <B>EMFUtil.ExtResourceSet</B><DT>extends <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/resource/impl/ResourceSetImpl.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.resource.impl">ResourceSetImpl</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="ResourceSetImpl (org.eclipse.emf.ecore.resource.impl)" alt="" coords="5,5,240,45"/>
+<area shape="rect" id="node2" href="EMFUtil.ExtResourceSet.html" title="EMFUtil.ExtResourceSet" alt="" coords="39,85,207,110"/>
+</map>
+
+<CENTER><IMG SRC="EMFUtil.ExtResourceSet.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 An extension of <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/resource/impl/ResourceSetImpl.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.resource.impl"><CODE>ResourceSetImpl</CODE></A> that allows demandLoading of resources and delegation of resource lookups,
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.ExtResourceSet.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.ExtResourceSet.png
new file mode 100644
index 0000000000..460e3973f1
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.ExtResourceSet.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.html
index 1674df0ace..13096261d9 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.html
@@ -97,7 +97,13 @@ Class EMFUtil</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>EMFUtil</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="EMFUtil.html" title="&#171;static&#187; EMFUtil" alt="" coords="5,5,75,45"/>
+</map>
+
+<CENTER><IMG SRC="EMFUtil.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Various static helper methods for dealing with EMF meta models.
@@ -107,8 +113,6 @@ Various static helper methods for dealing with EMF meta models.
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.png
new file mode 100644
index 0000000000..5a0ccc01f5
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageInfo.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageInfo.html
index 3f926e8c11..96a93a2dbf 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageInfo.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageInfo.html
@@ -98,8 +98,7 @@ Packages that use <A HREF="../../../../../../../org/eclipse/emf/cdo/common/model
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD><A HREF="#org.eclipse.emf.cdo.spi.common.model"><B>org.eclipse.emf.cdo.spi.common.model</B></A></TD>
-<TD>Common service provider interfaces and useful base implementations for dealing with models and types
-&nbsp;</TD>
+<TD>Common service provider interfaces and useful base implementations for dealing with models and types&nbsp;</TD>
 </TR>
 </TABLE>
 &nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageRegistry.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageRegistry.html
index acbc38c48a..4fbf1b425a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageRegistry.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageRegistry.html
@@ -122,8 +122,7 @@ Packages that use <A HREF="../../../../../../../org/eclipse/emf/cdo/common/model
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD><A HREF="#org.eclipse.emf.cdo.spi.common.model"><B>org.eclipse.emf.cdo.spi.common.model</B></A></TD>
-<TD>Common service provider interfaces and useful base implementations for dealing with models and types
-&nbsp;</TD>
+<TD>Common service provider interfaces and useful base implementations for dealing with models and types&nbsp;</TD>
 </TR>
 </TABLE>
 &nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageUnit.State.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageUnit.State.html
index 096627a5eb..2c324e2b24 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageUnit.State.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageUnit.State.html
@@ -94,8 +94,7 @@ Packages that use <A HREF="../../../../../../../org/eclipse/emf/cdo/common/model
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD><A HREF="#org.eclipse.emf.cdo.spi.common.model"><B>org.eclipse.emf.cdo.spi.common.model</B></A></TD>
-<TD>Common service provider interfaces and useful base implementations for dealing with models and types
-&nbsp;</TD>
+<TD>Common service provider interfaces and useful base implementations for dealing with models and types&nbsp;</TD>
 </TR>
 </TABLE>
 &nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageUnit.Type.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageUnit.Type.html
index 0dff692489..fd993c0c7e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageUnit.Type.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageUnit.Type.html
@@ -102,8 +102,7 @@ Packages that use <A HREF="../../../../../../../org/eclipse/emf/cdo/common/model
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD><A HREF="#org.eclipse.emf.cdo.spi.common.model"><B>org.eclipse.emf.cdo.spi.common.model</B></A></TD>
-<TD>Common service provider interfaces and useful base implementations for dealing with models and types
-&nbsp;</TD>
+<TD>Common service provider interfaces and useful base implementations for dealing with models and types&nbsp;</TD>
 </TR>
 </TABLE>
 &nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageUnit.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageUnit.html
index 5ad26a81e8..898f518d7c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageUnit.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageUnit.html
@@ -102,8 +102,7 @@ Packages that use <A HREF="../../../../../../../org/eclipse/emf/cdo/common/model
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD><A HREF="#org.eclipse.emf.cdo.spi.common.model"><B>org.eclipse.emf.cdo.spi.common.model</B></A></TD>
-<TD>Common service provider interfaces and useful base implementations for dealing with models and types
-&nbsp;</TD>
+<TD>Common service provider interfaces and useful base implementations for dealing with models and types&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD><A HREF="#org.eclipse.emf.cdo.transaction"><B>org.eclipse.emf.cdo.transaction</B></A></TD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.html
index 9411cf8016..e341c18b24 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.html
@@ -88,6 +88,38 @@ Common concepts for dealing with models and types.
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="#package_description"><B>Description</B></A>
 <P>
 
+<map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="CDOClassifierRef.html" title="CDOClassifierRef" alt="" coords="88,965,211,990"/>
+<area shape="rect" id="node2" href="CDOPackageRegistryPopulator.html" title="CDOPackageRegistryPopulator" alt="" coords="354,907,558,933"/>
+<area shape="rect" id="node3" href="CDOPackageRegistryPopulator.Descriptor.html" title="CDOPackageRegistryPopulator.Descriptor" alt="" coords="323,657,589,682"/>
+<area shape="rect" id="node4" href="CDOPackageTypeRegistry.html" title="CDOPackageTypeRegistry" alt="" coords="61,598,238,623"/>
+<area shape="rect" id="node5" href="EMFUtil.ExtResourceSet.html" title="EMFUtil.ExtResourceSet" alt="" coords="372,541,540,566"/>
+<area shape="rect" id="node6" title="ResourceSetImpl (org.eclipse.emf.ecore.resource.impl)" alt="" coords="31,533,267,573"/>
+<area shape="rect" id="node7" title="Worker (org.eclipse.net4j.util.concurrent)" alt="" coords="44,900,255,940"/>
+<area shape="rect" id="node8" title="&#171;interface&#187; Adapter (org.eclipse.emf.common.notify)" alt="" coords="46,731,253,786"/>
+<area shape="rect" id="node9" href="CDOClassInfo.html" title="&#171;interface&#187; CDOClassInfo" alt="" coords="405,771,507,811"/>
+<area shape="rect" id="node10" href="CDOClassifierRef.Provider.html" title="&#171;interface&#187; CDOClassifierRef.Provider" alt="" coords="63,469,235,509"/>
+<area shape="rect" id="node11" href="CDOModelConstants.html" title="&#171;interface&#187; CDOModelConstants" alt="" coords="77,405,221,445"/>
+<area shape="rect" id="node12" href="CDOPackageInfo.html" title="&#171;interface&#187; CDOPackageInfo" alt="" coords="395,707,517,747"/>
+<area shape="rect" id="node13" href="CDOPackageRegistry.html" title="&#171;interface&#187; CDOPackageRegistry" alt="" coords="381,333,531,373"/>
+<area shape="rect" id="node14" href="CDOPackageTypeRegistry.CDOObjectMarker.html" title="&#171;interface&#187; CDOPackageTypeRegistry.CDOObjectMarker" alt="" coords="6,261,293,301"/>
+<area shape="rect" id="node15" href="CDOPackageUnit.html" title="&#171;interface&#187; CDOPackageUnit" alt="" coords="394,835,518,875"/>
+<area shape="rect" id="node16" href="CDOType.html" title="&#171;interface&#187; CDOType" alt="" coords="107,197,192,237"/>
+<area shape="rect" id="node17" title="&#171;interface&#187; Comparable (java.lang)" alt="" coords="104,821,195,875"/>
+<area shape="rect" id="node18" title="&#171;interface&#187; EPackage.Descriptor (org.eclipse.emf.ecore)" alt="" coords="72,647,227,702"/>
+<area shape="rect" id="node19" title="&#171;interface&#187; EPackage.Registry (org.eclipse.emf.ecore)" alt="" coords="72,326,227,381"/>
+<area shape="rect" id="node20" href="../../../spi/cdo/InternalCDOObject.html" title="&#171;interface&#187; InternalCDOObject (org.eclipse.emf.spi.cdo)" alt="" coords="374,254,538,309"/>
+<area shape="rect" id="node21" href="../../spi/common/model/InternalCDOPackageInfo.html" title="&#171;interface&#187; InternalCDOPackageInfo (org.eclipse.emf.cdo.spi.common.model)" alt="" coords="619,699,877,754"/>
+<area shape="rect" id="node22" href="../../spi/common/model/InternalCDOPackageRegistry.html" title="&#171;interface&#187; InternalCDOPackageRegistry (org.eclipse.emf.cdo.spi.common.model)" alt="" coords="619,326,877,381"/>
+<area shape="rect" id="node23" href="../../spi/common/model/InternalCDOPackageUnit.html" title="&#171;interface&#187; InternalCDOPackageUnit (org.eclipse.emf.cdo.spi.common.model)" alt="" coords="619,827,877,882"/>
+<area shape="rect" id="node24" href="CDOModelUtil.html" title="&#171;static&#187; CDOModelUtil" alt="" coords="404,405,508,445"/>
+<area shape="rect" id="node25" href="EMFUtil.html" title="&#171;static&#187; EMFUtil" alt="" coords="115,133,184,173"/>
+<area shape="rect" id="node26" href="CDOPackageUnit.State.html" title="&#171;enum&#187; CDOPackageUnit.State" alt="" coords="70,69,229,109"/>
+<area shape="rect" id="node27" href="CDOPackageUnit.Type.html" title="&#171;enum&#187; CDOPackageUnit.Type" alt="" coords="71,5,227,45"/>
+</map>
+
+<CENTER><IMG SRC="package-summary.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+<BR>
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
 <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
@@ -196,7 +228,6 @@ Package org.eclipse.emf.cdo.common.model Description
 
 <P>
 Common concepts for dealing with models and types.
-<p>
 <P>
 
 <P>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.png
new file mode 100644
index 0000000000..e7dcd1c1aa
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.png
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-use.html
index 943e69712f..e5149df11e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-use.html
@@ -142,8 +142,7 @@ Packages that use <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/pa
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD><A HREF="#org.eclipse.emf.cdo.spi.common.model"><B>org.eclipse.emf.cdo.spi.common.model</B></A></TD>
-<TD>Common service provider interfaces and useful base implementations for dealing with models and types
-&nbsp;</TD>
+<TD>Common service provider interfaces and useful base implementations for dealing with models and types&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD><A HREF="#org.eclipse.emf.cdo.spi.common.revision"><B>org.eclipse.emf.cdo.spi.common.revision</B></A></TD>