tutorials

37 files changed, 2449 insertions, 161 deletions

diff --git a/plugins/org.eclipse.emf.cdo.doc/html/connectors/CreatingTransportConnections.html b/plugins/org.eclipse.emf.cdo.doc/html/connectors/CreatingTransportConnections.html
index 924e639bb3..5d055ac23e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/connectors/CreatingTransportConnections.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/connectors/CreatingTransportConnections.html
@@ -1,6 +1,6 @@
 <h1>Creating Transport Connections</h1>
 <a name="CreatingTransportConnections.html"/><p>
- This tutorial outlines the steps needed to create a Net4j <a href="../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/connector/IConnector.html">IConnector</a> and connect it to an <a href="../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/acceptor/IAcceptor.html">IAcceptor</a>.
+ This tutorial outlines the steps needed to create a Net4j <a href="../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/connector/IConnector.html" title="Interface in org.eclipse.net4j.connector"><code>IConnector</code></a> and connect it to an <a href="../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/acceptor/IAcceptor.html" title="Interface in org.eclipse.net4j.acceptor"><code>IAcceptor</code></a>.
  <p>
  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu nibh in erat dapibus accumsan. Aenean cursus
  lacinia dictum. Mauris non sem sapien. Vivamus sem ante, posuere a rhoncus ac, varius in nisi. Sed pulvinar urna ac
@@ -11,18 +11,18 @@
  convallis id a est. Donec quam nisl, scelerisque a feugiat id, mattis vel urna. Suspendisse facilisis, libero ac
  ultricies dictum, mi sem feugiat purus, ac aliquam metus purus sed leo. Sed a viverra metus.
 
-<h1>Select a Transport Type</h1>
+<h2>1 Select a Transport Type</h2>
 <a name="SelectTransportType"/><p>
  Currently supported transport types are:
  <ul>
- <li><b>JVM</b> to connect to an <a href="../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/IJVMAcceptor.html">IJVMAcceptor</a> in the same Java Virtual Machine.
- <li><b>TCP</b> to connect to an <a href="../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/ITCPAcceptor.html">ITCPAcceptor</a> by means of a <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/channels/SocketChannel.html">SocketChannel</a>.
+ <li><b>JVM</b> to connect to an <a href="../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/IJVMAcceptor.html" title="Interface in org.eclipse.net4j.jvm"><code>IJVMAcceptor</code></a> in the same Java Virtual Machine.
+ <li><b>TCP</b> to connect to an <a href="../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/ITCPAcceptor.html" title="Interface in org.eclipse.net4j.tcp"><code>ITCPAcceptor</code></a> by means of a <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/channels/SocketChannel.html" title="Class in java.nio.channels"><code>SocketChannel</code></a>.
  <li><b>SSL</b> an extension to the TCP transport that adds TLS/SSL security.
- <li><b>HTTP</b> to connect to an <a href="../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/server/IHTTPAcceptor.html">IHTTPAcceptor</a> that is made available by a servlet.
+ <li><b>HTTP</b> to connect to an <a href="../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/server/IHTTPAcceptor.html" title="Interface in org.eclipse.net4j.http.server"><code>IHTTPAcceptor</code></a> that is made available by a servlet.
  </ul>
- Continue with <a href="../sessions/ConnectingToRepositories.html#SetConnectionTimeout">SetConnectionTimeout</a>.
+ Continue with <a href="../sessions/ConnectingToRepositories.html#SetConnectionTimeout" title="Chapter in CDO Model Repository Documentation">Set Connection Timeout</a>.
 
-<h1>Setup a Wiring Container</h1>
+<h2>2 Setup a Wiring Container</h2>
 <a name="SetupWiringContainer"/><p>
  Ut eget massa felis, nec volutpat purus. In id aliquet mi. Duis euismod sapien sollicitudin nisi vestibulum nec
  vulputate urna euismod. Proin pulvinar ornare nunc, ac auctor elit placerat eget. Integer eu erat ac risus
@@ -74,10 +74,18 @@
   </table>
 </div>
 <p/>
-<div style="margin-left:24px;"><a name="callout_snippet1_1" href="#callout_snippet1_1_code" alt="Jump to snippet..." title="Jump to snippet..."><img src="../../images/callout-1.png" width="16" height="16" border="0" align="top"/></a>&nbsp;Create a separate IManagedContainer.</div>
-<div style="margin-left:24px;"><a name="callout_snippet1_2" href="#callout_snippet1_2_code" alt="Jump to snippet..." title="Jump to snippet..."><img src="../../images/callout-2.png" width="16" height="16" border="0" align="top"/></a>&nbsp;Create a factory of <i>type</i> "jms" in the <i>productGroup</i> "org.eclipse.net4j.connectors".</div>
-<div style="margin-left:24px;"><a name="callout_snippet1_3" href="#callout_snippet1_3_code" alt="Jump to snippet..." title="Jump to snippet..."><img src="../../images/callout-3.png" width="16" height="16" border="0" align="top"/></a>&nbsp;Create a JMS connector.</div>
-<div style="margin-left:24px;"><a name="callout_snippet1_4" href="#callout_snippet1_4_code" alt="Jump to snippet..." title="Jump to snippet..."><img src="../../images/callout-4.png" width="16" height="16" border="0" align="top"/></a>&nbsp;The new container can not be used when inactive.</div>
+<div style="margin-left:24px;"><a name="callout_snippet1_1" href="#callout_snippet1_1_code" alt="Jump to snippet..." title="Jump to snippet..."><img src="../../images/callout-1.png" width="16" height="16" border="0" align="top"/></a>&nbsp;Create a separate <a href="../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IManagedContainer.html" title="Interface in org.eclipse.net4j.util.container"><code>IManagedContainer</code></a>.
+
+</div>
+<div style="margin-left:24px;"><a name="callout_snippet1_2" href="#callout_snippet1_2_code" alt="Jump to snippet..." title="Jump to snippet..."><img src="../../images/callout-2.png" width="16" height="16" border="0" align="top"/></a>&nbsp;Create a factory of <i>type</i> "jms" in the <i>productGroup</i> "org.eclipse.net4j.connectors".
+
+</div>
+<div style="margin-left:24px;"><a name="callout_snippet1_3" href="#callout_snippet1_3_code" alt="Jump to snippet..." title="Jump to snippet..."><img src="../../images/callout-3.png" width="16" height="16" border="0" align="top"/></a>&nbsp;Create a JMS connector.
+
+</div>
+<div style="margin-left:24px;"><a name="callout_snippet1_4" href="#callout_snippet1_4_code" alt="Jump to snippet..." title="Jump to snippet..."><img src="../../images/callout-4.png" width="16" height="16" border="0" align="top"/></a>&nbsp;The new container can not be used when inactive.
+
+</div>
 <p/>
  Lorem ipsum dolor sit amet,
  consectetur adipiscing elit. Etiam eu nibh in erat dapibus accumsan. Aenean cursus lacinia dictum. Mauris non sem
@@ -89,10 +97,10 @@
  a est. Donec quam nisl, scelerisque a feugiat id, mattis vel urna. Suspendisse facilisis, libero ac ultricies
  dictum, mi sem feugiat purus, ac aliquam metus purus sed leo. Sed a viverra metus.
 
-<h1>Add Configuration Parameters</h1>
+<h2>3 Add Configuration Parameters</h2>
 <a name="AddConfigurationParameters"/>
 
-<h1>Set the Buffer Capacity</h1>
+<h3>3.1 Set the Buffer Capacity</h3>
 <a name="SetBufferCapacity"/><p>
  
 
@@ -101,7 +109,7 @@
   <table border="0" cellspacing="0" cellpadding="0">
     <tr>
       <td><img src="../../images/editor-top-left.png"/></td>
-      <td style="background-image:url(../../images/editor-top1.png); background-repeat:repeat-x;" width="1px"><font face="Segoe UI,Arial" size="-1"></font></td>
+      <td style="background-image:url(../../images/editor-top1.png); background-repeat:repeat-x;" width="1px"><font face="Segoe UI,Arial" size="-1">JMSConnector.java</font></td>
       <td width="1px"><img src="../../images/editor-close.png"/></td>
       <td style="background-image:url(../../images/editor-top2.png); background-repeat:repeat-x;">&nbsp;</td>
       <td><img src="../../images/editor-top-right.png"/></td>
@@ -136,11 +144,13 @@
   </table>
 </div>
 <p/>
-<div style="margin-left:24px;"><a name="callout_JMSConnector_1" href="#callout_JMSConnector_1_code" alt="Jump to snippet..." title="Jump to snippet..."><img src="../../images/callout-1.png" width="16" height="16" border="0" align="top"/></a>&nbsp;The channel must not be <code>null</code>.</div>
+<div style="margin-left:24px;"><a name="callout_JMSConnector_1" href="#callout_JMSConnector_1_code" alt="Jump to snippet..." title="Jump to snippet..."><img src="../../images/callout-1.png" width="16" height="16" border="0" align="top"/></a>&nbsp;The channel must not be <code>null</code>.
+
+</div>
 <p/>
 
 
-<h1>Set the Connection Timeout</h1>
+<h3>3.2 Set the Connection Timeout</h3>
 <a name="SetConnectionTimeout"/><p>
  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu nibh in erat dapibus accumsan. Aenean cursus
  lacinia dictum. Mauris non sem sapien. Vivamus sem ante, posuere a rhoncus ac, varius in nisi. Sed pulvinar urna
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/sessions/ConnectingToRepositories.html b/plugins/org.eclipse.emf.cdo.doc/html/sessions/ConnectingToRepositories.html
index 4eb1e7b8b4..c4e0877463 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/sessions/ConnectingToRepositories.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/sessions/ConnectingToRepositories.html
@@ -1,9 +1,9 @@
 <h1>Connecting To Repositories</h1>
 <a name="ConnectingToRepositories.html"/>
 
-<h1>Set Buffer Capacity</h1>
+<h2>1 Set Buffer Capacity</h2>
 <a name="SetBufferCapacity"/>
 
-<h1>Set Connection Timeout</h1>
+<h2>2 Set Connection Timeout</h2>
 <a name="SetConnectionTimeout"/>
 
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/toc.xmi b/plugins/org.eclipse.emf.cdo.doc/javadoc/toc.xmi
new file mode 100644
index 0000000000..23b4666d31
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/toc.xmi
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="ASCII"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:article="http://www.eclipse.org/ARTICLE/1.0">

+  <article:JavadocGroup name="CDO Model Repository Client">

+    <packages name="org.eclipse.emf.cdo"/>

+    <packages name="org.eclipse.emf.cdo.eresource"/>

+    <packages name="org.eclipse.emf.cdo.eresource.impl"/>

+    <packages name="org.eclipse.emf.cdo.eresource.util"/>

+    <packages name="org.eclipse.emf.cdo.etypes"/>

+    <packages name="org.eclipse.emf.cdo.etypes.impl"/>

+    <packages name="org.eclipse.emf.cdo.etypes.util"/>

+    <packages name="org.eclipse.emf.cdo.session"/>

+    <packages name="org.eclipse.emf.cdo.session.remote"/>

+    <packages name="org.eclipse.emf.cdo.transaction"/>

+    <packages name="org.eclipse.emf.cdo.util"/>

+    <packages name="org.eclipse.emf.cdo.view"/>

+    <packages name="org.eclipse.emf.internal.cdo"/>

+    <packages name="org.eclipse.emf.spi.cdo"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="CDO Model Repository Client Edit Support">

+    <packages name="org.eclipse.emf.cdo.edit"/>

+    <packages name="org.eclipse.emf.cdo.eresource.provider"/>

+    <packages name="org.eclipse.emf.cdo.etypes.provider"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="CDO Model Repository Client Location">

+    <packages name="org.eclipse.emf.cdo.location"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="CDO Model Repository Client Net4j Support">

+    <packages name="org.eclipse.emf.cdo.net4j"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="CDO Model Repository Client UI">

+    <packages name="org.eclipse.emf.cdo.ui"/>

+    <packages name="org.eclipse.emf.cdo.ui.widgets"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="CDO Model Repository Client UI IDE">

+    <packages name="org.eclipse.emf.cdo.ui.ide"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="CDO Model Repository Common">

+    <packages name="org.eclipse.emf.cdo.common"/>

+    <packages name="org.eclipse.emf.cdo.common.branch"/>

+    <packages name="org.eclipse.emf.cdo.common.commit"/>

+    <packages name="org.eclipse.emf.cdo.common.commit.handler"/>

+    <packages name="org.eclipse.emf.cdo.common.id"/>

+    <packages name="org.eclipse.emf.cdo.common.lob"/>

+    <packages name="org.eclipse.emf.cdo.common.lock"/>

+    <packages name="org.eclipse.emf.cdo.common.model"/>

+    <packages name="org.eclipse.emf.cdo.common.protocol"/>

+    <packages name="org.eclipse.emf.cdo.common.revision"/>

+    <packages name="org.eclipse.emf.cdo.common.revision.delta"/>

+    <packages name="org.eclipse.emf.cdo.common.util"/>

+    <packages name="org.eclipse.emf.cdo.spi.common"/>

+    <packages name="org.eclipse.emf.cdo.spi.common.branch"/>

+    <packages name="org.eclipse.emf.cdo.spi.common.commit"/>

+    <packages name="org.eclipse.emf.cdo.spi.common.id"/>

+    <packages name="org.eclipse.emf.cdo.spi.common.lock"/>

+    <packages name="org.eclipse.emf.cdo.spi.common.model"/>

+    <packages name="org.eclipse.emf.cdo.spi.common.revision"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="CDO Model Repository Server">

+    <packages name="org.eclipse.emf.cdo.server"/>

+    <packages name="org.eclipse.emf.cdo.server.embedded"/>

+    <packages name="org.eclipse.emf.cdo.server.mem"/>

+    <packages name="org.eclipse.emf.cdo.spi.server"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="CDO Model Repository Server DB">

+    <packages name="org.eclipse.emf.cdo.server.db"/>

+    <packages name="org.eclipse.emf.cdo.server.db.mapping"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="CDO Model Repository Server DB4O">

+    <packages name="org.eclipse.emf.cdo.server.db4o"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="CDO Model Repository Server Hibernate">

+    <packages name="org.eclipse.emf.cdo.server.hibernate"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="CDO Model Repository Server MongoDB">

+    <packages name="org.eclipse.emf.cdo.server.mongodb"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="CDO Model Repository Server Net4j Support">

+    <packages name="org.eclipse.emf.cdo.server.net4j"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="CDO Model Repository Server OCL Support">

+    <packages name="org.eclipse.emf.cdo.server.ocl"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="CDO Model Repository Server Objectivity">

+    <packages name="org.eclipse.emf.cdo.server.objectivity"/>

+  </article:JavadocGroup>

+</xmi:XMI>

diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/api/Dummy.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/api/Dummy.java
new file mode 100644
index 0000000000..3a69b637e5
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/api/Dummy.java
@@ -0,0 +1,19 @@
+/**

+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *    Eike Stepper - initial API and implementation

+ */

+package org.eclipse.emf.cdo.doc.reference.api;

+

+/**

+ * @author Eike Stepper

+ */

+public class Dummy

+{

+

+}

diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/api/package-info.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/api/package-info.java
new file mode 100644
index 0000000000..5565466c59
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/api/package-info.java
@@ -0,0 +1,17 @@
+/*

+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *    Eike Stepper - initial API and implementation

+ */

+

+/**

+ * API Reference

+ * @javadoc

+ */

+package org.eclipse.emf.cdo.doc.reference.api;

+

diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/package-info.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/package-info.java
new file mode 100644
index 0000000000..157b3040e1
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/package-info.java
@@ -0,0 +1,16 @@
+/*

+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *    Eike Stepper - initial API and implementation

+ */

+

+/**

+ * Reference

+ */

+package org.eclipse.emf.cdo.doc.reference;

+

diff --git a/plugins/org.eclipse.emf.cdo.doc/toc.xml b/plugins/org.eclipse.emf.cdo.doc/toc.xml
index 97a45b8801..c5f850cf8c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/toc.xml
+++ b/plugins/org.eclipse.emf.cdo.doc/toc.xml
@@ -3,91 +3,99 @@
 <?NLS TYPE="org.eclipse.help.toc"?>
 
 <toc label="CDO Model Repository Documentation" topic="javadoc/overview-summary.html">
-	<topic label="API Reference" href="javadoc/overview-summary.html">
-		<topic label="CDO Model Repository Client" href="javadoc/org/eclipse/emf/cdo/package-summary.html">
-			<topic label="org.eclipse.emf.cdo" href="javadoc/org/eclipse/emf/cdo/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.eresource" href="javadoc/org/eclipse/emf/cdo/eresource/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.eresource.impl" href="javadoc/org/eclipse/emf/cdo/eresource/impl/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.eresource.util" href="javadoc/org/eclipse/emf/cdo/eresource/util/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.etypes" href="javadoc/org/eclipse/emf/cdo/etypes/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.etypes.impl" href="javadoc/org/eclipse/emf/cdo/etypes/impl/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.etypes.util" href="javadoc/org/eclipse/emf/cdo/etypes/util/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.session" href="javadoc/org/eclipse/emf/cdo/session/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.session.remote" href="javadoc/org/eclipse/emf/cdo/session/remote/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.transaction" href="javadoc/org/eclipse/emf/cdo/transaction/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.util" href="javadoc/org/eclipse/emf/cdo/util/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.view" href="javadoc/org/eclipse/emf/cdo/view/package-summary.html" />
-			<topic label="org.eclipse.emf.internal.cdo" href="javadoc/org/eclipse/emf/internal/cdo/package-summary.html" />
-			<topic label="org.eclipse.emf.spi.cdo" href="javadoc/org/eclipse/emf/spi/cdo/package-summary.html" />
+	<topic label="Connectors" href="html/connectors">
+		<topic label="Creating Transport Connections" href="html/connectors/CreatingTransportConnections.html">
 		</topic>
-		<topic label="CDO Model Repository Client Edit Support" href="javadoc/org/eclipse/emf/cdo/edit/package-summary.html">
-			<topic label="org.eclipse.emf.cdo.edit" href="javadoc/org/eclipse/emf/cdo/edit/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.eresource.provider" href="javadoc/org/eclipse/emf/cdo/eresource/provider/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.etypes.provider" href="javadoc/org/eclipse/emf/cdo/etypes/provider/package-summary.html" />
-		</topic>
-		<topic label="CDO Model Repository Client Location" href="javadoc/org/eclipse/emf/cdo/location/package-summary.html">
-			<topic label="org.eclipse.emf.cdo.location" href="javadoc/org/eclipse/emf/cdo/location/package-summary.html" />
-		</topic>
-		<topic label="CDO Model Repository Client Net4j Support" href="javadoc/org/eclipse/emf/cdo/net4j/package-summary.html">
-			<topic label="org.eclipse.emf.cdo.net4j" href="javadoc/org/eclipse/emf/cdo/net4j/package-summary.html" />
-		</topic>
-		<topic label="CDO Model Repository Client UI" href="javadoc/org/eclipse/emf/cdo/ui/package-summary.html">
-			<topic label="org.eclipse.emf.cdo.ui" href="javadoc/org/eclipse/emf/cdo/ui/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.ui.widgets" href="javadoc/org/eclipse/emf/cdo/ui/widgets/package-summary.html" />
-		</topic>
-		<topic label="CDO Model Repository Client UI IDE" href="javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html">
-			<topic label="org.eclipse.emf.cdo.ui.ide" href="javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html" />
-		</topic>
-		<topic label="CDO Model Repository Common" href="javadoc/org/eclipse/emf/cdo/common/package-summary.html">
-			<topic label="org.eclipse.emf.cdo.common" href="javadoc/org/eclipse/emf/cdo/common/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.common.branch" href="javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.common.commit" href="javadoc/org/eclipse/emf/cdo/common/commit/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.common.commit.handler" href="javadoc/org/eclipse/emf/cdo/common/commit/handler/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.common.id" href="javadoc/org/eclipse/emf/cdo/common/id/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.common.lob" href="javadoc/org/eclipse/emf/cdo/common/lob/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.common.lock" href="javadoc/org/eclipse/emf/cdo/common/lock/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.common.model" href="javadoc/org/eclipse/emf/cdo/common/model/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.common.protocol" href="javadoc/org/eclipse/emf/cdo/common/protocol/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.common.revision" href="javadoc/org/eclipse/emf/cdo/common/revision/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.common.revision.delta" href="javadoc/org/eclipse/emf/cdo/common/revision/delta/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.common.util" href="javadoc/org/eclipse/emf/cdo/common/util/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.spi.common" href="javadoc/org/eclipse/emf/cdo/spi/common/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.spi.common.branch" href="javadoc/org/eclipse/emf/cdo/spi/common/branch/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.spi.common.commit" href="javadoc/org/eclipse/emf/cdo/spi/common/commit/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.spi.common.id" href="javadoc/org/eclipse/emf/cdo/spi/common/id/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.spi.common.lock" href="javadoc/org/eclipse/emf/cdo/spi/common/lock/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.spi.common.model" href="javadoc/org/eclipse/emf/cdo/spi/common/model/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.spi.common.revision" href="javadoc/org/eclipse/emf/cdo/spi/common/revision/package-summary.html" />
-		</topic>
-		<topic label="CDO Model Repository Server" href="javadoc/org/eclipse/emf/cdo/server/package-summary.html">
-			<topic label="org.eclipse.emf.cdo.server" href="javadoc/org/eclipse/emf/cdo/server/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.server.embedded" href="javadoc/org/eclipse/emf/cdo/server/embedded/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.server.mem" href="javadoc/org/eclipse/emf/cdo/server/mem/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.spi.server" href="javadoc/org/eclipse/emf/cdo/spi/server/package-summary.html" />
-		</topic>
-		<topic label="CDO Model Repository Server DB" href="javadoc/org/eclipse/emf/cdo/server/db/package-summary.html">
-			<topic label="org.eclipse.emf.cdo.server.db" href="javadoc/org/eclipse/emf/cdo/server/db/package-summary.html" />
-			<topic label="org.eclipse.emf.cdo.server.db.mapping" href="javadoc/org/eclipse/emf/cdo/server/db/mapping/package-summary.html" />
-		</topic>
-		<topic label="CDO Model Repository Server DB4O" href="javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html">
-			<topic label="org.eclipse.emf.cdo.server.db4o" href="javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html" />
-		</topic>
-		<topic label="CDO Model Repository Server Hibernate" href="javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html">
-			<topic label="org.eclipse.emf.cdo.server.hibernate" href="javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html" />
-		</topic>
-		<topic label="CDO Model Repository Server MongoDB" href="javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html">
-			<topic label="org.eclipse.emf.cdo.server.mongodb" href="javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html" />
-		</topic>
-		<topic label="CDO Model Repository Server Net4j Support" href="javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html">
-			<topic label="org.eclipse.emf.cdo.server.net4j" href="javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html" />
-		</topic>
-		<topic label="CDO Model Repository Server OCL Support" href="javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html">
-			<topic label="org.eclipse.emf.cdo.server.ocl" href="javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html" />
+	</topic>
+	<topic label="Sessions" href="html/sessions">
+		<topic label="Connecting To Repositories" href="html/sessions/ConnectingToRepositories.html">
 		</topic>
-		<topic label="CDO Model Repository Server Objectivity" href="javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html">
-			<topic label="org.eclipse.emf.cdo.server.objectivity" href="javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html" />
+	</topic>
+	<topic label="Reference" href="html/reference">
+		<topic label="API Reference" href="javadoc/overview-summary.html">
+			<topic label="CDO Model Repository Client" href="javadoc/org/eclipse/emf/cdo/package-summary.html">
+				<topic label="org.eclipse.emf.cdo" href="javadoc/org/eclipse/emf/cdo/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.eresource" href="javadoc/org/eclipse/emf/cdo/eresource/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.eresource.impl" href="javadoc/org/eclipse/emf/cdo/eresource/impl/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.eresource.util" href="javadoc/org/eclipse/emf/cdo/eresource/util/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.etypes" href="javadoc/org/eclipse/emf/cdo/etypes/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.etypes.impl" href="javadoc/org/eclipse/emf/cdo/etypes/impl/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.etypes.util" href="javadoc/org/eclipse/emf/cdo/etypes/util/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.session" href="javadoc/org/eclipse/emf/cdo/session/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.session.remote" href="javadoc/org/eclipse/emf/cdo/session/remote/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.transaction" href="javadoc/org/eclipse/emf/cdo/transaction/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.util" href="javadoc/org/eclipse/emf/cdo/util/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.view" href="javadoc/org/eclipse/emf/cdo/view/package-summary.html" />
+				<topic label="org.eclipse.emf.internal.cdo" href="javadoc/org/eclipse/emf/internal/cdo/package-summary.html" />
+				<topic label="org.eclipse.emf.spi.cdo" href="javadoc/org/eclipse/emf/spi/cdo/package-summary.html" />
+			</topic>
+			<topic label="CDO Model Repository Client Edit Support" href="javadoc/org/eclipse/emf/cdo/edit/package-summary.html">
+				<topic label="org.eclipse.emf.cdo.edit" href="javadoc/org/eclipse/emf/cdo/edit/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.eresource.provider" href="javadoc/org/eclipse/emf/cdo/eresource/provider/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.etypes.provider" href="javadoc/org/eclipse/emf/cdo/etypes/provider/package-summary.html" />
+			</topic>
+			<topic label="CDO Model Repository Client Location" href="javadoc/org/eclipse/emf/cdo/location/package-summary.html">
+				<topic label="org.eclipse.emf.cdo.location" href="javadoc/org/eclipse/emf/cdo/location/package-summary.html" />
+			</topic>
+			<topic label="CDO Model Repository Client Net4j Support" href="javadoc/org/eclipse/emf/cdo/net4j/package-summary.html">
+				<topic label="org.eclipse.emf.cdo.net4j" href="javadoc/org/eclipse/emf/cdo/net4j/package-summary.html" />
+			</topic>
+			<topic label="CDO Model Repository Client UI" href="javadoc/org/eclipse/emf/cdo/ui/package-summary.html">
+				<topic label="org.eclipse.emf.cdo.ui" href="javadoc/org/eclipse/emf/cdo/ui/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.ui.widgets" href="javadoc/org/eclipse/emf/cdo/ui/widgets/package-summary.html" />
+			</topic>
+			<topic label="CDO Model Repository Client UI IDE" href="javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html">
+				<topic label="org.eclipse.emf.cdo.ui.ide" href="javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html" />
+			</topic>
+			<topic label="CDO Model Repository Common" href="javadoc/org/eclipse/emf/cdo/common/package-summary.html">
+				<topic label="org.eclipse.emf.cdo.common" href="javadoc/org/eclipse/emf/cdo/common/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.common.branch" href="javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.common.commit" href="javadoc/org/eclipse/emf/cdo/common/commit/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.common.commit.handler" href="javadoc/org/eclipse/emf/cdo/common/commit/handler/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.common.id" href="javadoc/org/eclipse/emf/cdo/common/id/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.common.lob" href="javadoc/org/eclipse/emf/cdo/common/lob/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.common.lock" href="javadoc/org/eclipse/emf/cdo/common/lock/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.common.model" href="javadoc/org/eclipse/emf/cdo/common/model/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.common.protocol" href="javadoc/org/eclipse/emf/cdo/common/protocol/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.common.revision" href="javadoc/org/eclipse/emf/cdo/common/revision/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.common.revision.delta" href="javadoc/org/eclipse/emf/cdo/common/revision/delta/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.common.util" href="javadoc/org/eclipse/emf/cdo/common/util/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.spi.common" href="javadoc/org/eclipse/emf/cdo/spi/common/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.spi.common.branch" href="javadoc/org/eclipse/emf/cdo/spi/common/branch/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.spi.common.commit" href="javadoc/org/eclipse/emf/cdo/spi/common/commit/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.spi.common.id" href="javadoc/org/eclipse/emf/cdo/spi/common/id/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.spi.common.lock" href="javadoc/org/eclipse/emf/cdo/spi/common/lock/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.spi.common.model" href="javadoc/org/eclipse/emf/cdo/spi/common/model/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.spi.common.revision" href="javadoc/org/eclipse/emf/cdo/spi/common/revision/package-summary.html" />
+			</topic>
+			<topic label="CDO Model Repository Server" href="javadoc/org/eclipse/emf/cdo/server/package-summary.html">
+				<topic label="org.eclipse.emf.cdo.server" href="javadoc/org/eclipse/emf/cdo/server/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.server.embedded" href="javadoc/org/eclipse/emf/cdo/server/embedded/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.server.mem" href="javadoc/org/eclipse/emf/cdo/server/mem/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.spi.server" href="javadoc/org/eclipse/emf/cdo/spi/server/package-summary.html" />
+			</topic>
+			<topic label="CDO Model Repository Server DB" href="javadoc/org/eclipse/emf/cdo/server/db/package-summary.html">
+				<topic label="org.eclipse.emf.cdo.server.db" href="javadoc/org/eclipse/emf/cdo/server/db/package-summary.html" />
+				<topic label="org.eclipse.emf.cdo.server.db.mapping" href="javadoc/org/eclipse/emf/cdo/server/db/mapping/package-summary.html" />
+			</topic>
+			<topic label="CDO Model Repository Server DB4O" href="javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html">
+				<topic label="org.eclipse.emf.cdo.server.db4o" href="javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html" />
+			</topic>
+			<topic label="CDO Model Repository Server Hibernate" href="javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html">
+				<topic label="org.eclipse.emf.cdo.server.hibernate" href="javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html" />
+			</topic>
+			<topic label="CDO Model Repository Server MongoDB" href="javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html">
+				<topic label="org.eclipse.emf.cdo.server.mongodb" href="javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html" />
+			</topic>
+			<topic label="CDO Model Repository Server Net4j Support" href="javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html">
+				<topic label="org.eclipse.emf.cdo.server.net4j" href="javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html" />
+			</topic>
+			<topic label="CDO Model Repository Server OCL Support" href="javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html">
+				<topic label="org.eclipse.emf.cdo.server.ocl" href="javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html" />
+			</topic>
+			<topic label="CDO Model Repository Server Objectivity" href="javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html">
+				<topic label="org.eclipse.emf.cdo.server.objectivity" href="javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html" />
+			</topic>
 		</topic>
 	</topic>
-	<topic label="Homepage" href="http://www.eclipse.org/cdo"/>
-	<topic label="Wiki" href="http://wiki.eclipse.org/CDO"/>
 </toc>
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.doc/META-INF/MANIFEST.MF
index 8bca579999..94006b4a0e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.osgi.util;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.osgi;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.emf.cdo.releng.doc.supplemental;bundle-version="[1.0.0,2.0.0)";resolution:=optional
 Export-Package: org.eclipse.emf.cdo.releng.doc;version="4.1.0";x-internal:=true,
  org.eclipse.emf.cdo.releng.doc.article;version="4.1.0";x-internal:=true,
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore
index 403a25aef2..0ba1ea5b75 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore
@@ -95,6 +95,8 @@
   <eClassifiers xsi:type="ecore:EClass" name="Body" abstract="true" eSuperTypes="#//StructuralElement #//BodyElementContainer">

     <eStructuralFeatures xsi:type="ecore:EReference" name="category" eType="#//Category"

         changeable="false" volatile="true" transient="true" derived="true" resolveProxies="false"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="number" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"

+        changeable="false" derived="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="BodyElementContainer" abstract="true">

     <eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"

@@ -118,4 +120,19 @@
   <eClassifiers xsi:type="ecore:EClass" name="SourceCode" eSuperTypes="#//ExternalTarget"/>

   <eClassifiers xsi:type="ecore:EDataType" name="Tag" instanceClassName="com.sun.javadoc.Tag"

       serializable="false"/>

+  <eClassifiers xsi:type="ecore:EClass" name="JavadocGroup">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="packages" lowerBound="1"

+        upperBound="-1" eType="#//JavadocPackage" containment="true" eOpposite="#//JavadocPackage/group"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="JavadocPackage">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="group" lowerBound="1" eType="#//JavadocGroup"

+        eOpposite="#//JavadocGroup/packages"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Javadoc" eSuperTypes="#//Category">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="groups" lowerBound="1"

+        upperBound="-1" eType="#//JavadocGroup" changeable="false" volatile="true"

+        transient="true" derived="true"/>

+  </eClassifiers>

 </ecore:EPackage>

diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag
index 13b8eb9c4e..86c04fb8ce 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag
@@ -62,7 +62,7 @@
     </children>

     <styles xmi:type="notation:ShapeStyle" xmi:id="_9akHEdxOEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="10011046" lineColor="8421504"/>

     <element xmi:type="ecore:EClass" href="article.ecore#//Category"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9akHEtxOEeCpIJpgvmzkYA" x="808" y="812"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9akHEtxOEeCpIJpgvmzkYA" x="765" y="772"/>

   </children>

   <children xmi:type="notation:Node" xmi:id="_-tAmYNxOEeCpIJpgvmzkYA" type="1001">

     <children xmi:type="notation:Node" xmi:id="_-tAmY9xOEeCpIJpgvmzkYA" type="4001"/>

@@ -78,7 +78,7 @@
     </children>

     <styles xmi:type="notation:ShapeStyle" xmi:id="_-tAmYdxOEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="10011046" lineColor="8421504"/>

     <element xmi:type="ecore:EClass" href="article.ecore#//Article"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-tAmYtxOEeCpIJpgvmzkYA" x="665" y="896"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-tAmYtxOEeCpIJpgvmzkYA" x="622" y="896"/>

   </children>

   <children xmi:type="notation:Node" xmi:id="__ov14NxOEeCpIJpgvmzkYA" type="1001">

     <children xmi:type="notation:Node" xmi:id="__owc8NxOEeCpIJpgvmzkYA" type="4001"/>

@@ -94,7 +94,7 @@
     </children>

     <styles xmi:type="notation:ShapeStyle" xmi:id="__ov14dxOEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="10011046" lineColor="8421504"/>

     <element xmi:type="ecore:EClass" href="article.ecore#//Chapter"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="__ov14txOEeCpIJpgvmzkYA" x="665" y="812"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="__ov14txOEeCpIJpgvmzkYA" x="622" y="772"/>

   </children>

   <children xmi:type="notation:Node" xmi:id="_Aoro4NxPEeCpIJpgvmzkYA" type="1001">

     <children xmi:type="notation:Node" xmi:id="_AosP8NxPEeCpIJpgvmzkYA" type="4001"/>

@@ -299,6 +299,10 @@
   <children xmi:type="notation:Node" xmi:id="_OGiwoNxZEeCpIJpgvmzkYA" type="1001">

     <children xmi:type="notation:Node" xmi:id="_OGj-wNxZEeCpIJpgvmzkYA" type="4001"/>

     <children xmi:type="notation:Node" xmi:id="_OGj-wdxZEeCpIJpgvmzkYA" type="5001">

+      <children xmi:type="notation:Node" xmi:id="_yKp0sN6hEeCgeMAkr6dR9Q" type="2001">

+        <element xmi:type="ecore:EAttribute" href="article.ecore#//Body/number"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yKp0sd6hEeCgeMAkr6dR9Q"/>

+      </children>

       <styles xmi:type="notation:DrawerStyle" xmi:id="_OGj-wtxZEeCpIJpgvmzkYA"/>

       <styles xmi:type="notation:SortingStyle" xmi:id="_OGj-w9xZEeCpIJpgvmzkYA"/>

       <styles xmi:type="notation:FilteringStyle" xmi:id="_OGj-xNxZEeCpIJpgvmzkYA"/>

@@ -412,6 +416,62 @@
     <element xmi:type="ecore:EClass" href="article.ecore#//BodyElementContainer"/>

     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C9Orwt57EeCgeMAkr6dR9Q" x="217" y="673"/>

   </children>

+  <children xmi:type="notation:Node" xmi:id="_LJYjIN6iEeCgeMAkr6dR9Q" type="1001">

+    <children xmi:type="notation:Node" xmi:id="_LJZKMN6iEeCgeMAkr6dR9Q" type="4001"/>

+    <children xmi:type="notation:Node" xmi:id="_LJZKMd6iEeCgeMAkr6dR9Q" type="5001">

+      <children xmi:type="notation:Node" xmi:id="_M4z5YN6iEeCgeMAkr6dR9Q" type="2001">

+        <element xmi:type="ecore:EAttribute" href="article.ecore#//JavadocGroup/name"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_M4z5Yd6iEeCgeMAkr6dR9Q"/>

+      </children>

+      <styles xmi:type="notation:DrawerStyle" xmi:id="_LJZKMt6iEeCgeMAkr6dR9Q"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_LJZxQN6iEeCgeMAkr6dR9Q"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_LJZxQd6iEeCgeMAkr6dR9Q"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_LJZxQt6iEeCgeMAkr6dR9Q" type="5002">

+      <styles xmi:type="notation:DrawerStyle" xmi:id="_LJZxQ96iEeCgeMAkr6dR9Q"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_LJZxRN6iEeCgeMAkr6dR9Q"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_LJZxRd6iEeCgeMAkr6dR9Q"/>

+    </children>

+    <styles xmi:type="notation:ShapeStyle" xmi:id="_LJYjId6iEeCgeMAkr6dR9Q" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

+    <element xmi:type="ecore:EClass" href="article.ecore#//JavadocGroup"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LJYjIt6iEeCgeMAkr6dR9Q" x="1085" y="892" width="119"/>

+  </children>

+  <children xmi:type="notation:Node" xmi:id="_Q8ejIN6iEeCgeMAkr6dR9Q" type="1001">

+    <children xmi:type="notation:Node" xmi:id="_Q8fKMN6iEeCgeMAkr6dR9Q" type="4001"/>

+    <children xmi:type="notation:Node" xmi:id="_Q8fKMd6iEeCgeMAkr6dR9Q" type="5001">

+      <children xmi:type="notation:Node" xmi:id="_S1iWgN6iEeCgeMAkr6dR9Q" type="2001">

+        <element xmi:type="ecore:EAttribute" href="article.ecore#//JavadocPackage/name"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S1iWgd6iEeCgeMAkr6dR9Q"/>

+      </children>

+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Q8fKMt6iEeCgeMAkr6dR9Q"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_Q8fKM96iEeCgeMAkr6dR9Q"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Q8fKNN6iEeCgeMAkr6dR9Q"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_Q8fKNd6iEeCgeMAkr6dR9Q" type="5002">

+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Q8fxQN6iEeCgeMAkr6dR9Q"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_Q8fxQd6iEeCgeMAkr6dR9Q"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Q8fxQt6iEeCgeMAkr6dR9Q"/>

+    </children>

+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Q8ejId6iEeCgeMAkr6dR9Q" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

+    <element xmi:type="ecore:EClass" href="article.ecore#//JavadocPackage"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q8ejIt6iEeCgeMAkr6dR9Q" x="1315" y="892" width="132"/>

+  </children>

+  <children xmi:type="notation:Node" xmi:id="_RD3vIN6jEeCgeMAkr6dR9Q" type="1001">

+    <children xmi:type="notation:Node" xmi:id="_RD4WMN6jEeCgeMAkr6dR9Q" type="4001"/>

+    <children xmi:type="notation:Node" xmi:id="_RD4WMd6jEeCgeMAkr6dR9Q" type="5001">

+      <styles xmi:type="notation:DrawerStyle" xmi:id="_RD4WMt6jEeCgeMAkr6dR9Q"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_RD4WM96jEeCgeMAkr6dR9Q"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_RD4WNN6jEeCgeMAkr6dR9Q"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_RD49QN6jEeCgeMAkr6dR9Q" type="5002">

+      <styles xmi:type="notation:DrawerStyle" xmi:id="_RD49Qd6jEeCgeMAkr6dR9Q"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_RD49Qt6jEeCgeMAkr6dR9Q"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_RD49Q96jEeCgeMAkr6dR9Q"/>

+    </children>

+    <styles xmi:type="notation:ShapeStyle" xmi:id="_RD3vId6jEeCgeMAkr6dR9Q" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

+    <element xmi:type="ecore:EClass" href="article.ecore#//Javadoc"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RD3vIt6jEeCgeMAkr6dR9Q" x="769" y="896"/>

+  </children>

   <styles xmi:type="notation:DiagramStyle" xmi:id="_x6vqQNxNEeCpIJpgvmzkYA"/>

   <element xmi:type="ecore:EPackage" href="article.ecore#/"/>

   <edges xmi:type="notation:Edge" xmi:id="_qxw_8NxOEeCpIJpgvmzkYA" type="3002" source="_9P3IYNxNEeCpIJpgvmzkYA" target="_zVqwINxNEeCpIJpgvmzkYA">

@@ -550,7 +610,7 @@
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_kreS8dxVEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_kreS8txVEeCpIJpgvmzkYA" fontName="Segoe UI"/>

     <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kreS89xVEeCpIJpgvmzkYA" points="[12, -30, -356, 394]$[12, -368, -356, 56]$[367, -368, -1, 56]$[367, -399, -1, 25]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kreS89xVEeCpIJpgvmzkYA" points="[12, -21, -358, 391]$[12, -356, -358, 56]$[369, -356, -1, 56]$[369, -387, -1, 25]"/>

   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_DI4QkNxWEeCpIJpgvmzkYA" type="3002" source="_zVqwINxNEeCpIJpgvmzkYA" target="_bhQRANxTEeCpIJpgvmzkYA">

     <children xmi:type="notation:Node" xmi:id="_DI4QlNxWEeCpIJpgvmzkYA" type="4011">

@@ -591,13 +651,13 @@
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_G9qM8dxaEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_G9qM8txaEeCpIJpgvmzkYA" fontName="Segoe UI"/>

     <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_G9qM89xaEeCpIJpgvmzkYA" points="[1, -20, 83, 88]$[1, -47, 83, 61]$[-83, -47, -1, 61]$[-83, -83, -1, 25]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_G9qM89xaEeCpIJpgvmzkYA" points="[16, -20, 53, 75]$[16, -42, 53, 53]$[-37, -42, 0, 53]$[-37, -70, 0, 25]"/>

   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_HbG98NxaEeCpIJpgvmzkYA" type="3003" source="__ov14NxOEeCpIJpgvmzkYA" target="_OGiwoNxZEeCpIJpgvmzkYA">

     <styles xmi:type="notation:ConnectorStyle" xmi:id="_HbG98dxaEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_HbG98txaEeCpIJpgvmzkYA" fontName="Segoe UI"/>

     <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HbG989xaEeCpIJpgvmzkYA" points="[-1, -20, -62, 88]$[-1, -47, -62, 61]$[60, -47, -1, 61]$[60, -83, -1, 25]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HbG989xaEeCpIJpgvmzkYA" points="[14, -20, -92, 75]$[14, -42, -92, 53]$[106, -42, 0, 53]$[106, -70, 0, 25]"/>

   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_pSB1ENxaEeCpIJpgvmzkYA" type="3003" source="_hvZKENxaEeCpIJpgvmzkYA" target="_yWi_ANxZEeCpIJpgvmzkYA">

     <styles xmi:type="notation:ConnectorStyle" xmi:id="_pSB1EdxaEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

@@ -627,7 +687,7 @@
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_MrPI4dxcEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_MrPI4txcEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

     <element xmi:type="ecore:EReference" href="article.ecore#//Embedding/element"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MrPI49xcEeCpIJpgvmzkYA" points="[-14, 21, 28, 464]$[-14, 40, 28, 483]$[-202, 40, -160, 483]$[-202, -441, -160, 2]$[-147, -441, -105, 2]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MrPI49xcEeCpIJpgvmzkYA" points="[-1, 21, 43, 476]$[-1, 54, 43, 509]$[-204, 54, -160, 509]$[-204, -450, -160, 5]$[-122, -450, -78, 5]"/>

   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_UGQI8NxcEeCpIJpgvmzkYA" type="3003" source="_-69sYNxaEeCpIJpgvmzkYA" target="_yWi_ANxZEeCpIJpgvmzkYA">

     <styles xmi:type="notation:ConnectorStyle" xmi:id="_UGQI8dxcEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

@@ -645,7 +705,7 @@
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_VIxV4dxcEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_VIxV4txcEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

     <element xmi:type="ecore:EReference" href="article.ecore#//Link/target"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VIxV49xcEeCpIJpgvmzkYA" points="[-4, 21, -393, 775]$[-4, 39, -393, 793]$[647, 39, 258, 793]$[647, -755, 258, -1]$[509, -755, 120, -1]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VIxV49xcEeCpIJpgvmzkYA" points="[-4, 21, -393, 775]$[-4, 54, -393, 808]$[647, 54, 258, 808]$[647, -755, 258, -1]$[509, -755, 120, -1]"/>

   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_fZ-DcNxdEeCpIJpgvmzkYA" type="3002" source="_zVqwINxNEeCpIJpgvmzkYA" target="_zVqwINxNEeCpIJpgvmzkYA">

     <children xmi:type="notation:Node" xmi:id="_fZ-DdNxdEeCpIJpgvmzkYA" type="4011">

@@ -690,7 +750,7 @@
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_TgH44dxjEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_TgH44txjEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

     <element xmi:type="ecore:EReference" href="article.ecore#//Chapter/article"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TgH449xjEeCpIJpgvmzkYA" points="[-11, -1, -15, -66]$[-58, -1, -62, -66]$[-58, 83, -62, 18]$[-11, 83, -15, 18]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TgH449xjEeCpIJpgvmzkYA" points="[-11, 2, -15, -95]$[-58, 2, -62, -95]$[-58, 114, -62, 17]$[-11, 114, -15, 17]"/>

     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TgJuENxjEeCpIJpgvmzkYA" id="(0.11764705882352941,0.5581395348837209)"/>

     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TgJuEdxjEeCpIJpgvmzkYA" id="(0.1568627450980392,0.09302325581395349)"/>

   </edges>

@@ -704,7 +764,7 @@
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_YY7a4dxjEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_YY7a4txjEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

     <element xmi:type="ecore:EReference" href="article.ecore#//Body/category"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YY7a49xjEeCpIJpgvmzkYA" points="[53, -4, -25, -139]$[175, -4, 97, -139]$[175, 127, 97, -8]$[128, 127, 50, -8]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YY7a49xjEeCpIJpgvmzkYA" points="[50, 0, -13, -111]$[200, 0, 137, -111]$[200, 111, 137, 0]$[136, 111, 73, 0]"/>

   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_C9X1sN57EeCgeMAkr6dR9Q" type="3002" source="_C9OrwN57EeCgeMAkr6dR9Q" target="_yWi_ANxZEeCpIJpgvmzkYA">

     <children xmi:type="notation:Node" xmi:id="_C9YcwN57EeCgeMAkr6dR9Q" type="4011">

@@ -746,4 +806,50 @@
     <element xsi:nil="true"/>

     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_C9d8U957EeCgeMAkr6dR9Q" points="[-53, -4, 437, 0]$[-417, -4, 73, 0]"/>

   </edges>

+  <edges xmi:type="notation:Edge" xmi:id="_c6FkoN6iEeCgeMAkr6dR9Q" type="3002" source="_LJYjIN6iEeCgeMAkr6dR9Q" target="_Q8ejIN6iEeCgeMAkr6dR9Q">

+    <children xmi:type="notation:Node" xmi:id="_c6GLsN6iEeCgeMAkr6dR9Q" type="4011">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_c6GLsd6iEeCgeMAkr6dR9Q" x="-16" y="-12"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_c6GLst6iEeCgeMAkr6dR9Q" type="4012">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_c6GLs96iEeCgeMAkr6dR9Q" x="1" y="12"/>

+    </children>

+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_c6Fkod6iEeCgeMAkr6dR9Q" routing="Rectilinear" lineColor="4210752"/>

+    <styles xmi:type="notation:FontStyle" xmi:id="_c6Fkot6iEeCgeMAkr6dR9Q" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

+    <element xmi:type="ecore:EReference" href="article.ecore#//JavadocGroup/packages"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_c6Fko96iEeCgeMAkr6dR9Q" points="[59, 0, -178, 0]$[172, 0, -65, 0]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jNyh4N6jEeCgeMAkr6dR9Q" id="(0.5,0.5)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jNyh4d6jEeCgeMAkr6dR9Q" id="(0.5,0.5)"/>

+  </edges>

+  <edges xmi:type="notation:Edge" xmi:id="_fsdloN6iEeCgeMAkr6dR9Q" type="3002" source="_Q8ejIN6iEeCgeMAkr6dR9Q" target="_LJYjIN6iEeCgeMAkr6dR9Q">

+    <children xmi:type="notation:Node" xmi:id="_fseMsN6iEeCgeMAkr6dR9Q" type="4011">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fseMsd6iEeCgeMAkr6dR9Q" x="-9" y="-12"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_fseMst6iEeCgeMAkr6dR9Q" type="4012">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fseMs96iEeCgeMAkr6dR9Q" x="5" y="16"/>

+    </children>

+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_fsdlod6iEeCgeMAkr6dR9Q" routing="Rectilinear" lineColor="4210752"/>

+    <styles xmi:type="notation:FontStyle" xmi:id="_fsdlot6iEeCgeMAkr6dR9Q" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

+    <element xmi:type="ecore:EReference" href="article.ecore#//JavadocPackage/group"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fsdlo96iEeCgeMAkr6dR9Q" points="[-65, 0, 172, 0]$[-178, 0, 59, 0]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oUNekN6iEeCgeMAkr6dR9Q" id="(0.5,0.5)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oUNekd6iEeCgeMAkr6dR9Q" id="(0.5,0.5)"/>

+  </edges>

+  <edges xmi:type="notation:Edge" xmi:id="_YnpCkN6jEeCgeMAkr6dR9Q" type="3003" source="_RD3vIN6jEeCgeMAkr6dR9Q" target="_9akHENxOEeCpIJpgvmzkYA">

+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_YnpCkd6jEeCgeMAkr6dR9Q" routing="Rectilinear" lineColor="4210752"/>

+    <styles xmi:type="notation:FontStyle" xmi:id="_YnpCkt6jEeCgeMAkr6dR9Q" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YnpCk96jEeCgeMAkr6dR9Q" points="[4, -20, 5, 100]$[4, -144, 5, -24]"/>

+  </edges>

+  <edges xmi:type="notation:Edge" xmi:id="_elbPoN6jEeCgeMAkr6dR9Q" type="3002" source="_RD3vIN6jEeCgeMAkr6dR9Q" target="_LJYjIN6iEeCgeMAkr6dR9Q">

+    <children xmi:type="notation:Node" xmi:id="_elb2sN6jEeCgeMAkr6dR9Q" type="4011">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_elb2sd6jEeCgeMAkr6dR9Q" x="-10" y="-10"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_elb2st6jEeCgeMAkr6dR9Q" type="4012">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_elb2s96jEeCgeMAkr6dR9Q" x="10" y="10"/>

+    </children>

+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_elbPod6jEeCgeMAkr6dR9Q" routing="Rectilinear" lineColor="4210752"/>

+    <styles xmi:type="notation:FontStyle" xmi:id="_elbPot6jEeCgeMAkr6dR9Q" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

+    <element xmi:type="ecore:EReference" href="article.ecore#//Javadoc/groups"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_elbPo96jEeCgeMAkr6dR9Q" points="[19, -20, -409, 423]$[425, -418, -3, 25]"/>

+  </edges>

 </notation:Diagram>

diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java
index a3af60b168..a88c75e9c3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java
@@ -10,6 +10,17 @@
  */

 package org.eclipse.emf.cdo.releng.doc;

 

+import org.eclipse.emf.cdo.releng.doc.article.ArticleFactory;

+import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage;

+import org.eclipse.emf.cdo.releng.doc.article.JavadocGroup;

+import org.eclipse.emf.cdo.releng.doc.article.JavadocPackage;

+

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;

+

 import org.eclipse.osgi.util.ManifestElement;

 

 import org.osgi.framework.BundleException;

@@ -295,7 +306,7 @@ public class AssembleScripts
   /**

    * @author Eike Stepper

    */

-  private static class AntLib

+  public static class AntLib

   {

     private Map<String, SourcePlugin> sourcePlugins = new HashMap<String, SourcePlugin>();

 

@@ -465,7 +476,7 @@ public class AssembleScripts
   /**

    * @author Eike Stepper

    */

-  private static class SourcePlugin implements Comparable<SourcePlugin>

+  public static class SourcePlugin implements Comparable<SourcePlugin>

   {

     private String projectName;

 

@@ -613,7 +624,7 @@ public class AssembleScripts
   /**

    * @author Eike Stepper

    */

-  private static class JavaDoc

+  public static class JavaDoc

   {

     private String projectName;

 

@@ -857,6 +868,45 @@ public class AssembleScripts
 

     public void generateToc() throws IOException

     {

+      Resource resource = getTocResource(getProject(), true);

+      System.out.println("Generating " + resource.getURI().path());

+

+      for (SourcePlugin sourcePlugin : getSortedSourcePlugins())

+      {

+        JavadocGroup javadocGroup = ArticleFactory.eINSTANCE.createJavadocGroup();

+        javadocGroup.setName(sourcePlugin.getLabel());

+        resource.getContents().add(javadocGroup);

+

+        for (String packageName : sourcePlugin.getSortedPackageNames())

+        {

+          JavadocPackage javadocPackage = ArticleFactory.eINSTANCE.createJavadocPackage();

+          javadocPackage.setName(packageName);

+          javadocGroup.getPackages().add(javadocPackage);

+        }

+      }

+

+      resource.save(null);

+    }

+

+    public static Resource getTocResource(File project, boolean create) throws IOException

+    {

+      ArticlePackage.eINSTANCE.eClass();

+

+      ResourceSet resourceSet = new ResourceSetImpl();

+      Map<String, Object> map = resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap();

+      map.put("xmi", new XMIResourceFactoryImpl());

+

+      File javadoc = new File(project, "javadoc");

+      javadoc.mkdirs();

+

+      File target = new File(javadoc, "toc.xmi");

+

+      URI uri = URI.createFileURI(target.getCanonicalPath());

+      return create ? resourceSet.createResource(uri) : resourceSet.getResource(uri, true);

+    }

+

+    public void _generateToc() throws IOException

+    {

       File project = getProject();

       FileWriter out = null;

       FileReader in = null;

diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/TestCDODocumentation.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/TestCDODocumentation.java
index 5d6869efb2..86ec8c3c80 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/TestCDODocumentation.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/TestCDODocumentation.java
@@ -39,7 +39,7 @@ public class TestCDODocumentation
   public static void main(String[] args)
   {
     add("-sourcepath /develop/ws/cdo/plugins/org.eclipse.net4j.util.doc/src;/develop/ws/cdo/plugins/org.eclipse.net4j.db.doc/src;/develop/ws/cdo/plugins/org.eclipse.net4j.doc/src;/develop/ws/cdo/plugins/org.eclipse.emf.cdo.doc/src");
-    add("-subpackages org.eclipse.net4j.util.doc:org.eclipse.emf.cdo.doc.connectors:org.eclipse.emf.cdo.doc.sessions");
+    add("-subpackages org.eclipse.net4j.util.doc:org.eclipse.emf.cdo.doc.connectors:org.eclipse.emf.cdo.doc.sessions:org.eclipse.emf.cdo.doc.reference:org.eclipse.emf.cdo.doc.reference.api");
     add("-doclet org.eclipse.emf.cdo.releng.doc.article.impl.ArticleDoclet");
     add("-docletpath /develop/ws/cdo/plugins/org.eclipse.emf.cdo.releng.doc/bin;/develop/bin/org.eclipse.emf.cdo.releng.doc.supplemental/bin;/develop/ws/cdo/_target/plugins/org.eclipse.emf.ecore_2.7.0.v20110605-0747.jar;/develop/ws/cdo/_target/plugins/org.eclipse.emf.common_2.7.0.v20110605-0747.jar");
     add("-encoding ISO-8859-1");
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java
index 9d5378d94e..dfc6fb57fa 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java
@@ -145,6 +145,30 @@ public interface ArticleFactory extends EFactory
   SourceCode createSourceCode();
 
   /**
+   * Returns a new object of class '<em>Javadoc Group</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>Javadoc Group</em>'.
+   * @generated
+   */
+  JavadocGroup createJavadocGroup();
+
+  /**
+   * Returns a new object of class '<em>Javadoc Package</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>Javadoc Package</em>'.
+   * @generated
+   */
+  JavadocPackage createJavadocPackage();
+
+  /**
+   * Returns a new object of class '<em>Javadoc</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>Javadoc</em>'.
+   * @generated
+   */
+  Javadoc createJavadoc();
+
+  /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @return the package supported by this factory.
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java
index ac5a03cfa8..b5f4923cb4 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java
@@ -543,12 +543,20 @@ public interface ArticlePackage extends EPackage
   int BODY__CATEGORY = STRUCTURAL_ELEMENT_FEATURE_COUNT + 1;
 
   /**
+   * The feature id for the '<em><b>Number</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int BODY__NUMBER = STRUCTURAL_ELEMENT_FEATURE_COUNT + 2;
+
+  /**
    * The number of structural features of the '<em>Body</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
    * @ordered
    */
-  int BODY_FEATURE_COUNT = STRUCTURAL_ELEMENT_FEATURE_COUNT + 2;
+  int BODY_FEATURE_COUNT = STRUCTURAL_ELEMENT_FEATURE_COUNT + 3;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.CategoryImpl <em>Category</em>}'
@@ -667,6 +675,14 @@ public interface ArticlePackage extends EPackage
   int CATEGORY__CATEGORY = BODY__CATEGORY;
 
   /**
+   * The feature id for the '<em><b>Number</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CATEGORY__NUMBER = BODY__NUMBER;
+
+  /**
    * The number of structural features of the '<em>Category</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -791,6 +807,14 @@ public interface ArticlePackage extends EPackage
   int CHAPTER__CATEGORY = BODY__CATEGORY;
 
   /**
+   * The feature id for the '<em><b>Number</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CHAPTER__NUMBER = BODY__NUMBER;
+
+  /**
    * The feature id for the '<em><b>Article</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -923,6 +947,14 @@ public interface ArticlePackage extends EPackage
   int ARTICLE__CATEGORY = CHAPTER__CATEGORY;
 
   /**
+   * The feature id for the '<em><b>Number</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int ARTICLE__NUMBER = CHAPTER__NUMBER;
+
+  /**
    * The feature id for the '<em><b>Article</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -1462,13 +1494,224 @@ public interface ArticlePackage extends EPackage
   int SOURCE_CODE_FEATURE_COUNT = EXTERNAL_TARGET_FEATURE_COUNT + 0;
 
   /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavadocGroupImpl
+   * <em>Javadoc Group</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavadocGroupImpl
+   * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavadocGroup()
+   * @generated
+   */
+  int JAVADOC_GROUP = 22;
+
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC_GROUP__NAME = 0;
+
+  /**
+   * The feature id for the '<em><b>Packages</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC_GROUP__PACKAGES = 1;
+
+  /**
+   * The number of structural features of the '<em>Javadoc Group</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC_GROUP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavadocPackageImpl
+   * <em>Javadoc Package</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavadocPackageImpl
+   * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavadocPackage()
+   * @generated
+   */
+  int JAVADOC_PACKAGE = 23;
+
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC_PACKAGE__NAME = 0;
+
+  /**
+   * The feature id for the '<em><b>Group</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC_PACKAGE__GROUP = 1;
+
+  /**
+   * The number of structural features of the '<em>Javadoc Package</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC_PACKAGE_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavadocImpl <em>Javadoc</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavadocImpl
+   * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavadoc()
+   * @generated
+   */
+  int JAVADOC = 24;
+
+  /**
+   * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__ID = CATEGORY__ID;
+
+  /**
+   * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__DEFAULT_LABEL = CATEGORY__DEFAULT_LABEL;
+
+  /**
+   * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__TOOLTIP = CATEGORY__TOOLTIP;
+
+  /**
+   * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__CHILDREN = CATEGORY__CHILDREN;
+
+  /**
+   * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__PARENT = CATEGORY__PARENT;
+
+  /**
+   * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__TITLE = CATEGORY__TITLE;
+
+  /**
+   * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__PATH = CATEGORY__PATH;
+
+  /**
+   * The feature id for the '<em><b>Full Path</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__FULL_PATH = CATEGORY__FULL_PATH;
+
+  /**
+   * The feature id for the '<em><b>Output File</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__OUTPUT_FILE = CATEGORY__OUTPUT_FILE;
+
+  /**
+   * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__DOCUMENTATION = CATEGORY__DOCUMENTATION;
+
+  /**
+   * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__DOC = CATEGORY__DOC;
+
+  /**
+   * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__ELEMENTS = CATEGORY__ELEMENTS;
+
+  /**
+   * The feature id for the '<em><b>Category</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__CATEGORY = CATEGORY__CATEGORY;
+
+  /**
+   * The feature id for the '<em><b>Number</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__NUMBER = CATEGORY__NUMBER;
+
+  /**
+   * The feature id for the '<em><b>Groups</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC__GROUPS = CATEGORY_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>Javadoc</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int JAVADOC_FEATURE_COUNT = CATEGORY_FEATURE_COUNT + 1;
+
+  /**
    * The meta object id for the '<em>Root Doc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @see com.sun.javadoc.RootDoc
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getRootDoc()
    * @generated
    */
-  int ROOT_DOC = 22;
+  int ROOT_DOC = 25;
 
   /**
    * The meta object id for the '<em>File</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1477,7 +1720,7 @@ public interface ArticlePackage extends EPackage
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getFile()
    * @generated
    */
-  int FILE = 23;
+  int FILE = 26;
 
   /**
    * The meta object id for the '<em>Doc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1486,7 +1729,7 @@ public interface ArticlePackage extends EPackage
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getDoc()
    * @generated
    */
-  int DOC = 24;
+  int DOC = 27;
 
   /**
    * The meta object id for the '<em>Tag</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1495,7 +1738,7 @@ public interface ArticlePackage extends EPackage
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getTag()
    * @generated
    */
-  int TAG = 25;
+  int TAG = 28;
 
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Documentation
@@ -1958,6 +2201,17 @@ public interface ArticlePackage extends EPackage
   EReference getBody_Category();
 
   /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.Body#getNumber
+   * <em>Number</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Number</em>'.
+   * @see org.eclipse.emf.cdo.releng.doc.article.Body#getNumber()
+   * @see #getBody()
+   * @generated
+   */
+  EAttribute getBody_Number();
+
+  /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.BodyElementContainer
    * <em>Body Element Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
@@ -2075,6 +2329,93 @@ public interface ArticlePackage extends EPackage
   EClass getSourceCode();
 
   /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.JavadocGroup
+   * <em>Javadoc Group</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Javadoc Group</em>'.
+   * @see org.eclipse.emf.cdo.releng.doc.article.JavadocGroup
+   * @generated
+   */
+  EClass getJavadocGroup();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.JavadocGroup#getName
+   * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Name</em>'.
+   * @see org.eclipse.emf.cdo.releng.doc.article.JavadocGroup#getName()
+   * @see #getJavadocGroup()
+   * @generated
+   */
+  EAttribute getJavadocGroup_Name();
+
+  /**
+   * Returns the meta object for the containment reference list '
+   * {@link org.eclipse.emf.cdo.releng.doc.article.JavadocGroup#getPackages <em>Packages</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for the containment reference list '<em>Packages</em>'.
+   * @see org.eclipse.emf.cdo.releng.doc.article.JavadocGroup#getPackages()
+   * @see #getJavadocGroup()
+   * @generated
+   */
+  EReference getJavadocGroup_Packages();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.JavadocPackage
+   * <em>Javadoc Package</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Javadoc Package</em>'.
+   * @see org.eclipse.emf.cdo.releng.doc.article.JavadocPackage
+   * @generated
+   */
+  EClass getJavadocPackage();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.JavadocPackage#getName
+   * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Name</em>'.
+   * @see org.eclipse.emf.cdo.releng.doc.article.JavadocPackage#getName()
+   * @see #getJavadocPackage()
+   * @generated
+   */
+  EAttribute getJavadocPackage_Name();
+
+  /**
+   * Returns the meta object for the container reference '
+   * {@link org.eclipse.emf.cdo.releng.doc.article.JavadocPackage#getGroup <em>Group</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for the container reference '<em>Group</em>'.
+   * @see org.eclipse.emf.cdo.releng.doc.article.JavadocPackage#getGroup()
+   * @see #getJavadocPackage()
+   * @generated
+   */
+  EReference getJavadocPackage_Group();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Javadoc <em>Javadoc</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Javadoc</em>'.
+   * @see org.eclipse.emf.cdo.releng.doc.article.Javadoc
+   * @generated
+   */
+  EClass getJavadoc();
+
+  /**
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.releng.doc.article.Javadoc#getGroups
+   * <em>Groups</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference list '<em>Groups</em>'.
+   * @see org.eclipse.emf.cdo.releng.doc.article.Javadoc#getGroups()
+   * @see #getJavadoc()
+   * @generated
+   */
+  EReference getJavadoc_Groups();
+
+  /**
    * Returns the meta object for data type '{@link com.sun.javadoc.RootDoc <em>Root Doc</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * 
@@ -2509,6 +2850,14 @@ public interface ArticlePackage extends EPackage
     EReference BODY__CATEGORY = eINSTANCE.getBody_Category();
 
     /**
+     * The meta object literal for the '<em><b>Number</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute BODY__NUMBER = eINSTANCE.getBody_Number();
+
+    /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.BodyElementContainerImpl
      * <em>Body Element Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
@@ -2609,6 +2958,76 @@ public interface ArticlePackage extends EPackage
     EClass SOURCE_CODE = eINSTANCE.getSourceCode();
 
     /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavadocGroupImpl
+     * <em>Javadoc Group</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavadocGroupImpl
+     * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavadocGroup()
+     * @generated
+     */
+    EClass JAVADOC_GROUP = eINSTANCE.getJavadocGroup();
+
+    /**
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute JAVADOC_GROUP__NAME = eINSTANCE.getJavadocGroup_Name();
+
+    /**
+     * The meta object literal for the '<em><b>Packages</b></em>' containment reference list feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference JAVADOC_GROUP__PACKAGES = eINSTANCE.getJavadocGroup_Packages();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavadocPackageImpl
+     * <em>Javadoc Package</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavadocPackageImpl
+     * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavadocPackage()
+     * @generated
+     */
+    EClass JAVADOC_PACKAGE = eINSTANCE.getJavadocPackage();
+
+    /**
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute JAVADOC_PACKAGE__NAME = eINSTANCE.getJavadocPackage_Name();
+
+    /**
+     * The meta object literal for the '<em><b>Group</b></em>' container reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference JAVADOC_PACKAGE__GROUP = eINSTANCE.getJavadocPackage_Group();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavadocImpl <em>Javadoc</em>}
+     * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavadocImpl
+     * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavadoc()
+     * @generated
+     */
+    EClass JAVADOC = eINSTANCE.getJavadoc();
+
+    /**
+     * The meta object literal for the '<em><b>Groups</b></em>' reference list feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference JAVADOC__GROUPS = eINSTANCE.getJavadoc_Groups();
+
+    /**
      * The meta object literal for the '<em>Root Doc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @see com.sun.javadoc.RootDoc
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Body.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Body.java
index 45de3cac67..0bb0e9dffd 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Body.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Body.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
  * The following features are supported:
  * <ul>
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Body#getCategory <em>Category</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Body#getNumber <em>Number</em>}</li>
  * </ul>
  * </p>
  * 
@@ -36,4 +37,18 @@ public interface Body extends StructuralElement, BodyElementContainer
    */
   Category getCategory();
 
+  /**
+   * Returns the value of the '<em><b>Number</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Number</em>' attribute isn't clear, there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Number</em>' attribute.
+   * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getBody_Number()
+   * @model changeable="false" derived="true"
+   * @generated
+   */
+  int getNumber();
+
 } // Body
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Javadoc.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Javadoc.java
new file mode 100644
index 0000000000..798d400e59
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Javadoc.java
@@ -0,0 +1,42 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.releng.doc.article;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Javadoc</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Javadoc#getGroups <em>Groups</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavadoc()
+ * @model
+ * @generated
+ */
+public interface Javadoc extends Category
+{
+  /**
+   * Returns the value of the '<em><b>Groups</b></em>' reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.releng.doc.article.JavadocGroup}. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Groups</em>' reference list isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Groups</em>' reference list.
+   * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavadoc_Groups()
+   * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
+   * @generated
+   */
+  EList<JavadocGroup> getGroups();
+
+} // Javadoc
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavadocGroup.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavadocGroup.java
new file mode 100644
index 0000000000..cf1ffe8077
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavadocGroup.java
@@ -0,0 +1,72 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.releng.doc.article;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Javadoc Group</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.JavadocGroup#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.JavadocGroup#getPackages <em>Packages</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavadocGroup()
+ * @model
+ * @generated
+ */
+public interface JavadocGroup extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavadocGroup_Name()
+   * @model required="true"
+   * @generated
+   */
+  String getName();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.JavadocGroup#getName <em>Name</em>}'
+   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
+
+  /**
+   * Returns the value of the '<em><b>Packages</b></em>' containment reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.releng.doc.article.JavadocPackage}. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.releng.doc.article.JavadocPackage#getGroup <em>Group</em>}'. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Packages</em>' containment reference list isn't clear, there really should be more of a
+   * description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Packages</em>' containment reference list.
+   * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavadocGroup_Packages()
+   * @see org.eclipse.emf.cdo.releng.doc.article.JavadocPackage#getGroup
+   * @model opposite="group" containment="true" required="true"
+   * @generated
+   */
+  EList<JavadocPackage> getPackages();
+
+} // JavadocGroup
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavadocPackage.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavadocPackage.java
new file mode 100644
index 0000000000..fede59d931
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavadocPackage.java
@@ -0,0 +1,82 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.releng.doc.article;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Javadoc Package</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.JavadocPackage#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.JavadocPackage#getGroup <em>Group</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavadocPackage()
+ * @model
+ * @generated
+ */
+public interface JavadocPackage extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavadocPackage_Name()
+   * @model required="true"
+   * @generated
+   */
+  String getName();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.JavadocPackage#getName <em>Name</em>}'
+   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
+
+  /**
+   * Returns the value of the '<em><b>Group</b></em>' container reference. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.releng.doc.article.JavadocGroup#getPackages <em>Packages</em>}'. <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Group</em>' container reference isn't clear, there really should be more of a
+   * description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Group</em>' container reference.
+   * @see #setGroup(JavadocGroup)
+   * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavadocPackage_Group()
+   * @see org.eclipse.emf.cdo.releng.doc.article.JavadocGroup#getPackages
+   * @model opposite="packages" required="true" transient="false"
+   * @generated
+   */
+  JavadocGroup getGroup();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.JavadocPackage#getGroup <em>Group</em>}'
+   * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Group</em>' container reference.
+   * @see #getGroup()
+   * @generated
+   */
+  void setGroup(JavadocGroup value);
+
+} // JavadocPackage
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java
index 6fd47b46d1..c6af010c10 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java
@@ -19,6 +19,9 @@ import org.eclipse.emf.cdo.releng.doc.article.Embedding;
 import org.eclipse.emf.cdo.releng.doc.article.ExternalTarget;
 import org.eclipse.emf.cdo.releng.doc.article.Factory;
 import org.eclipse.emf.cdo.releng.doc.article.JavaElement;
+import org.eclipse.emf.cdo.releng.doc.article.Javadoc;
+import org.eclipse.emf.cdo.releng.doc.article.JavadocGroup;
+import org.eclipse.emf.cdo.releng.doc.article.JavadocPackage;
 import org.eclipse.emf.cdo.releng.doc.article.Link;
 import org.eclipse.emf.cdo.releng.doc.article.Snippet;
 import org.eclipse.emf.cdo.releng.doc.article.SourceCode;
@@ -113,6 +116,12 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
       return createEmbedding();
     case ArticlePackage.SOURCE_CODE:
       return createSourceCode();
+    case ArticlePackage.JAVADOC_GROUP:
+      return createJavadocGroup();
+    case ArticlePackage.JAVADOC_PACKAGE:
+      return createJavadocPackage();
+    case ArticlePackage.JAVADOC:
+      return createJavadoc();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -322,6 +331,39 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
    * 
    * @generated
    */
+  public JavadocGroup createJavadocGroup()
+  {
+    JavadocGroupImpl javadocGroup = new JavadocGroupImpl();
+    return javadocGroup;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public JavadocPackage createJavadocPackage()
+  {
+    JavadocPackageImpl javadocPackage = new JavadocPackageImpl();
+    return javadocPackage;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Javadoc createJavadoc()
+  {
+    JavadocImpl javadoc = new JavadocImpl();
+    return javadoc;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public File createFileFromString(EDataType eDataType, String initialValue)
   {
     return (File)super.createFromString(eDataType, initialValue);
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java
index db2a66ff17..4db47b640a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java
@@ -24,6 +24,9 @@ import org.eclipse.emf.cdo.releng.doc.article.ExternalTarget;
 import org.eclipse.emf.cdo.releng.doc.article.Factory;
 import org.eclipse.emf.cdo.releng.doc.article.Identifiable;
 import org.eclipse.emf.cdo.releng.doc.article.JavaElement;
+import org.eclipse.emf.cdo.releng.doc.article.Javadoc;
+import org.eclipse.emf.cdo.releng.doc.article.JavadocGroup;
+import org.eclipse.emf.cdo.releng.doc.article.JavadocPackage;
 import org.eclipse.emf.cdo.releng.doc.article.Link;
 import org.eclipse.emf.cdo.releng.doc.article.LinkTarget;
 import org.eclipse.emf.cdo.releng.doc.article.Snippet;
@@ -211,6 +214,27 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
    * 
    * @generated
    */
+  private EClass javadocGroupEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass javadocPackageEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass javadocEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   private EDataType rootDocEDataType = null;
 
   /**
@@ -721,6 +745,16 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
    * 
    * @generated
    */
+  public EAttribute getBody_Number()
+  {
+    return (EAttribute)bodyEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public EClass getBodyElementContainer()
   {
     return bodyElementContainerEClass;
@@ -831,6 +865,86 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
    * 
    * @generated
    */
+  public EClass getJavadocGroup()
+  {
+    return javadocGroupEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getJavadocGroup_Name()
+  {
+    return (EAttribute)javadocGroupEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getJavadocGroup_Packages()
+  {
+    return (EReference)javadocGroupEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getJavadocPackage()
+  {
+    return javadocPackageEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getJavadocPackage_Name()
+  {
+    return (EAttribute)javadocPackageEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getJavadocPackage_Group()
+  {
+    return (EReference)javadocPackageEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getJavadoc()
+  {
+    return javadocEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getJavadoc_Groups()
+  {
+    return (EReference)javadocEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public EDataType getRootDoc()
   {
     return rootDocEDataType;
@@ -953,6 +1067,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
     bodyEClass = createEClass(BODY);
     createEReference(bodyEClass, BODY__CATEGORY);
+    createEAttribute(bodyEClass, BODY__NUMBER);
 
     bodyElementContainerEClass = createEClass(BODY_ELEMENT_CONTAINER);
     createEReference(bodyElementContainerEClass, BODY_ELEMENT_CONTAINER__ELEMENTS);
@@ -971,6 +1086,17 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
     sourceCodeEClass = createEClass(SOURCE_CODE);
 
+    javadocGroupEClass = createEClass(JAVADOC_GROUP);
+    createEAttribute(javadocGroupEClass, JAVADOC_GROUP__NAME);
+    createEReference(javadocGroupEClass, JAVADOC_GROUP__PACKAGES);
+
+    javadocPackageEClass = createEClass(JAVADOC_PACKAGE);
+    createEAttribute(javadocPackageEClass, JAVADOC_PACKAGE__NAME);
+    createEReference(javadocPackageEClass, JAVADOC_PACKAGE__GROUP);
+
+    javadocEClass = createEClass(JAVADOC);
+    createEReference(javadocEClass, JAVADOC__GROUPS);
+
     // Create data types
     rootDocEDataType = createEDataType(ROOT_DOC);
     fileEDataType = createEDataType(FILE);
@@ -1026,6 +1152,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
     linkEClass.getESuperTypes().add(this.getBodyElement());
     embeddingEClass.getESuperTypes().add(this.getBodyElement());
     sourceCodeEClass.getESuperTypes().add(this.getExternalTarget());
+    javadocEClass.getESuperTypes().add(this.getCategory());
 
     // Initialize classes and features; add operations and parameters
     initEClass(documentationEClass, Documentation.class, "Documentation", !IS_ABSTRACT, !IS_INTERFACE,
@@ -1139,6 +1266,8 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
     initEReference(getBody_Category(), this.getCategory(), null, "category", null, 0, 1, Body.class, IS_TRANSIENT,
         IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
         IS_ORDERED);
+    initEAttribute(getBody_Number(), ecorePackage.getEInt(), "number", null, 0, 1, Body.class, !IS_TRANSIENT,
+        !IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
     initEClass(bodyElementContainerEClass, BodyElementContainer.class, "BodyElementContainer", IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1169,6 +1298,27 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
     initEClass(sourceCodeEClass, SourceCode.class, "SourceCode", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
 
+    initEClass(javadocGroupEClass, JavadocGroup.class, "JavadocGroup", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getJavadocGroup_Name(), ecorePackage.getEString(), "name", null, 1, 1, JavadocGroup.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getJavadocGroup_Packages(), this.getJavadocPackage(), this.getJavadocPackage_Group(), "packages",
+        null, 1, -1, JavadocGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(javadocPackageEClass, JavadocPackage.class, "JavadocPackage", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getJavadocPackage_Name(), ecorePackage.getEString(), "name", null, 1, 1, JavadocPackage.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getJavadocPackage_Group(), this.getJavadocGroup(), this.getJavadocGroup_Packages(), "group", null,
+        1, 1, JavadocPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(javadocEClass, Javadoc.class, "Javadoc", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getJavadoc_Groups(), this.getJavadocGroup(), null, "groups", null, 1, -1, Javadoc.class,
+        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        IS_DERIVED, IS_ORDERED);
+
     // Initialize data types
     initEDataType(rootDocEDataType, RootDoc.class, "RootDoc", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
     initEDataType(fileEDataType, File.class, "File", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java
index 6c2c32b3bd..4f1153a536 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java
@@ -81,9 +81,7 @@ public abstract class BodyElementImpl extends EObjectImpl implements BodyElement
   public BodyElementContainer getContainer()
   {
     if (eContainerFeatureID() != ArticlePackage.BODY_ELEMENT__CONTAINER)
-    {
       return null;
-    }
     return (BodyElementContainer)eContainer();
   }
 
@@ -105,34 +103,24 @@ public abstract class BodyElementImpl extends EObjectImpl implements BodyElement
    */
   public void setContainer(BodyElementContainer newContainer)
   {
-    if (newContainer != eInternalContainer() || eContainerFeatureID() != ArticlePackage.BODY_ELEMENT__CONTAINER
-        && newContainer != null)
+    if (newContainer != eInternalContainer()
+        || (eContainerFeatureID() != ArticlePackage.BODY_ELEMENT__CONTAINER && newContainer != null))
     {
       if (EcoreUtil.isAncestor(this, newContainer))
-      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
-      {
         msgs = eBasicRemoveFromContainer(msgs);
-      }
       if (newContainer != null)
-      {
         msgs = ((InternalEObject)newContainer).eInverseAdd(this, ArticlePackage.BODY_ELEMENT_CONTAINER__ELEMENTS,
             BodyElementContainer.class, msgs);
-      }
       msgs = basicSetContainer(newContainer, msgs);
       if (msgs != null)
-      {
         msgs.dispatch();
-      }
     }
     else if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.BODY_ELEMENT__CONTAINER, newContainer,
           newContainer));
-    }
   }
 
   /**
@@ -157,9 +145,7 @@ public abstract class BodyElementImpl extends EObjectImpl implements BodyElement
     {
     case ArticlePackage.BODY_ELEMENT__CONTAINER:
       if (eInternalContainer() != null)
-      {
         msgs = eBasicRemoveFromContainer(msgs);
-      }
       return basicSetContainer((BodyElementContainer)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java
index b90a57ac07..d8bc675331 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 import com.sun.javadoc.Doc;
+import com.sun.javadoc.Tag;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -34,6 +35,7 @@ import java.util.Collection;
  * <ul>
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.BodyImpl#getElements <em>Elements</em>}</li>
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.BodyImpl#getCategory <em>Category</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.BodyImpl#getNumber <em>Number</em>}</li>
  * </ul>
  * </p>
  * 
@@ -52,6 +54,26 @@ public abstract class BodyImpl extends StructuralElementImpl implements Body
   protected EList<BodyElement> elements;
 
   /**
+   * The default value of the '{@link #getNumber() <em>Number</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getNumber()
+   * @generated
+   * @ordered
+   */
+  protected static final int NUMBER_EDEFAULT = 0;
+
+  /**
+   * The cached value of the '{@link #getNumber() <em>Number</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getNumber()
+   * @generated
+   * @ordered
+   */
+  protected int number = NUMBER_EDEFAULT;
+
+  /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -65,6 +87,16 @@ public abstract class BodyImpl extends StructuralElementImpl implements Body
   {
     super(parent, path, doc);
 
+    Tag[] tags = doc.tags("@number");
+    if (tags != null && tags.length != 0)
+    {
+      Tag[] inlineTags = tags[0].inlineTags();
+      if (inlineTags != null && inlineTags.length != 0)
+      {
+        number = Integer.parseInt(inlineTags[0].text());
+      }
+    }
+
     String title = BodyElementContainerImpl.analyzeTags(getElements(), doc.inlineTags(), true);
     if (title != null)
     {
@@ -135,6 +167,16 @@ public abstract class BodyImpl extends StructuralElementImpl implements Body
    * 
    * @generated
    */
+  public int getNumber()
+  {
+    return number;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   @SuppressWarnings("unchecked")
   @Override
   public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
@@ -177,6 +219,8 @@ public abstract class BodyImpl extends StructuralElementImpl implements Body
       return getElements();
     case ArticlePackage.BODY__CATEGORY:
       return getCategory();
+    case ArticlePackage.BODY__NUMBER:
+      return getNumber();
     }
     return super.eGet(featureID, resolve, coreType);
   }
@@ -231,6 +275,8 @@ public abstract class BodyImpl extends StructuralElementImpl implements Body
       return elements != null && !elements.isEmpty();
     case ArticlePackage.BODY__CATEGORY:
       return getCategory() != null;
+    case ArticlePackage.BODY__NUMBER:
+      return number != NUMBER_EDEFAULT;
     }
     return super.eIsSet(featureID);
   }
@@ -277,6 +323,26 @@ public abstract class BodyImpl extends StructuralElementImpl implements Body
     return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
   }
 
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+    {
+      return super.toString();
+    }
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (number: ");
+    result.append(number);
+    result.append(')');
+    return result.toString();
+  }
+
   @Override
   public Object getId()
   {
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java
index b7f8b74260..ebdcea0e81 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EClass;
 
 import com.sun.javadoc.ClassDoc;
 
+import java.io.BufferedWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -136,6 +137,15 @@ public class ChapterImpl extends BodyImpl implements Chapter
   }
 
   @Override
+  protected void generateTocEntry(BufferedWriter writer, String prefix) throws IOException
+  {
+    if (this instanceof Article)
+    {
+      super.generateTocEntry(writer, prefix);
+    }
+  }
+
+  @Override
   public void generate(HtmlWriter out) throws IOException
   {
     String title = getTitle();
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
index cd3bd282ab..382deb990f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
@@ -31,8 +31,12 @@ import com.sun.javadoc.ClassDoc;
 import com.sun.javadoc.MethodDoc;
 import com.sun.javadoc.PackageDoc;
 import com.sun.javadoc.RootDoc;
+import com.sun.javadoc.Tag;
 
+import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.util.Collection;
 
 /**
@@ -149,6 +153,13 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
       if (ArticleUtil.isDocumented(packageDoc))
       {
         StructuralElement parent = analyzePackage(parentDoc);
+
+        Tag[] tags = packageDoc.tags("@javadoc");
+        if (tags != null && tags.length != 0)
+        {
+          return new JavadocImpl(parent, packageDoc);
+        }
+
         return new CategoryImpl(parent, packageDoc);
       }
 
@@ -252,7 +263,9 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
   public Context getContext()
   {
     if (eContainerFeatureID() != ArticlePackage.DOCUMENTATION__CONTEXT)
+    {
       return null;
+    }
     return (Context)eContainer();
   }
 
@@ -274,24 +287,34 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
    */
   public void setContext(Context newContext)
   {
-    if (newContext != eInternalContainer()
-        || (eContainerFeatureID() != ArticlePackage.DOCUMENTATION__CONTEXT && newContext != null))
+    if (newContext != eInternalContainer() || eContainerFeatureID() != ArticlePackage.DOCUMENTATION__CONTEXT
+        && newContext != null)
     {
       if (EcoreUtil.isAncestor(this, newContext))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newContext != null)
+      {
         msgs = ((InternalEObject)newContext).eInverseAdd(this, ArticlePackage.CONTEXT__DOCUMENTATIONS, Context.class,
             msgs);
+      }
       msgs = basicSetContext(newContext, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.DOCUMENTATION__CONTEXT, newContext,
           newContext));
+    }
   }
 
   /**
@@ -347,7 +370,9 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
     {
     case ArticlePackage.DOCUMENTATION__CONTEXT:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetContext((Context)otherEnd, msgs);
     case ArticlePackage.DOCUMENTATION__EMBEDDABLE_ELEMENTS:
       return ((InternalEList<InternalEObject>)(InternalEList<?>)getEmbeddableElements()).basicAdd(otherEnd, msgs);
@@ -491,7 +516,9 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (project: ");
@@ -518,4 +545,45 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
     return project;
   }
 
+  @Override
+  public void generate() throws IOException
+  {
+    super.generate();
+    generateToc();
+  }
+
+  private void generateToc() throws IOException
+  {
+    File project = getOutputFile().getParentFile();
+    FileWriter out = null;
+
+    try
+    {
+      File target = new File(project, "toc.xml");
+      System.out.println("Generating " + target.getCanonicalPath());
+
+      out = new FileWriter(target);
+      BufferedWriter writer = new BufferedWriter(out);
+
+      try
+      {
+
+        writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n");
+        writer.write("<?NLS TYPE=\"org.eclipse.help.toc\"?>\n\n");
+        writer.write("<toc label=\"CDO Model Repository Documentation\" topic=\"javadoc/overview-summary.html\">\n");
+
+        generateTocEntries(writer, "\t");
+
+        writer.write("</toc>\n");
+        writer.flush();
+      }
+      finally
+      {
+      }
+    }
+    finally
+    {
+      ArticleUtil.close(out);
+    }
+  }
 } // DocumentationImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddableElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddableElementImpl.java
index a712766336..8e3e9d99c8 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddableElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddableElementImpl.java
@@ -79,9 +79,7 @@ public abstract class EmbeddableElementImpl extends EObjectImpl implements Embed
   public Documentation getDocumentation()
   {
     if (eContainerFeatureID() != ArticlePackage.EMBEDDABLE_ELEMENT__DOCUMENTATION)
-    {
       return null;
-    }
     return (Documentation)eContainer();
   }
 
@@ -104,33 +102,23 @@ public abstract class EmbeddableElementImpl extends EObjectImpl implements Embed
   public void setDocumentation(Documentation newDocumentation)
   {
     if (newDocumentation != eInternalContainer()
-        || eContainerFeatureID() != ArticlePackage.EMBEDDABLE_ELEMENT__DOCUMENTATION && newDocumentation != null)
+        || (eContainerFeatureID() != ArticlePackage.EMBEDDABLE_ELEMENT__DOCUMENTATION && newDocumentation != null))
     {
       if (EcoreUtil.isAncestor(this, newDocumentation))
-      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
-      {
         msgs = eBasicRemoveFromContainer(msgs);
-      }
       if (newDocumentation != null)
-      {
         msgs = ((InternalEObject)newDocumentation).eInverseAdd(this, ArticlePackage.DOCUMENTATION__EMBEDDABLE_ELEMENTS,
             Documentation.class, msgs);
-      }
       msgs = basicSetDocumentation(newDocumentation, msgs);
       if (msgs != null)
-      {
         msgs.dispatch();
-      }
     }
     else if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.EMBEDDABLE_ELEMENT__DOCUMENTATION,
           newDocumentation, newDocumentation));
-    }
   }
 
   /**
@@ -145,9 +133,7 @@ public abstract class EmbeddableElementImpl extends EObjectImpl implements Embed
     {
     case ArticlePackage.EMBEDDABLE_ELEMENT__DOCUMENTATION:
       if (eInternalContainer() != null)
-      {
         msgs = eBasicRemoveFromContainer(msgs);
-      }
       return basicSetDocumentation((Documentation)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalTargetImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalTargetImpl.java
index 196685fe23..6215125b65 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalTargetImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalTargetImpl.java
@@ -125,9 +125,7 @@ public class ExternalTargetImpl extends LinkTargetImpl implements ExternalTarget
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (url: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java
index c85b21de28..16ae1849c0 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java
@@ -140,9 +140,7 @@ public class JavaElementImpl extends LinkTargetImpl implements JavaElement
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (classFile: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocGroupImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocGroupImpl.java
new file mode 100644
index 0000000000..29678895d4
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocGroupImpl.java
@@ -0,0 +1,256 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.releng.doc.article.impl;
+
+import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage;
+import org.eclipse.emf.cdo.releng.doc.article.JavadocGroup;
+import org.eclipse.emf.cdo.releng.doc.article.JavadocPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import java.util.Collection;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Javadoc Group</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavadocGroupImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavadocGroupImpl#getPackages <em>Packages</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class JavadocGroupImpl extends EObjectImpl implements JavadocGroup
+{
+  /**
+   * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected static final String NAME_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected String name = NAME_EDEFAULT;
+
+  /**
+   * The cached value of the '{@link #getPackages() <em>Packages</em>}' containment reference list. <!-- begin-user-doc
+   * --> <!-- end-user-doc -->
+   * 
+   * @see #getPackages()
+   * @generated
+   * @ordered
+   */
+  protected EList<JavadocPackage> packages;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected JavadocGroupImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return ArticlePackage.Literals.JAVADOC_GROUP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setName(String newName)
+  {
+    String oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.JAVADOC_GROUP__NAME, oldName, name));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EList<JavadocPackage> getPackages()
+  {
+    if (packages == null)
+    {
+      packages = new EObjectContainmentWithInverseEList<JavadocPackage>(JavadocPackage.class, this,
+          ArticlePackage.JAVADOC_GROUP__PACKAGES, ArticlePackage.JAVADOC_PACKAGE__GROUP);
+    }
+    return packages;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case ArticlePackage.JAVADOC_GROUP__PACKAGES:
+      return ((InternalEList<InternalEObject>)(InternalEList<?>)getPackages()).basicAdd(otherEnd, msgs);
+    }
+    return super.eInverseAdd(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case ArticlePackage.JAVADOC_GROUP__PACKAGES:
+      return ((InternalEList<?>)getPackages()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case ArticlePackage.JAVADOC_GROUP__NAME:
+      return getName();
+    case ArticlePackage.JAVADOC_GROUP__PACKAGES:
+      return getPackages();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case ArticlePackage.JAVADOC_GROUP__NAME:
+      setName((String)newValue);
+      return;
+    case ArticlePackage.JAVADOC_GROUP__PACKAGES:
+      getPackages().clear();
+      getPackages().addAll((Collection<? extends JavadocPackage>)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case ArticlePackage.JAVADOC_GROUP__NAME:
+      setName(NAME_EDEFAULT);
+      return;
+    case ArticlePackage.JAVADOC_GROUP__PACKAGES:
+      getPackages().clear();
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case ArticlePackage.JAVADOC_GROUP__NAME:
+      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+    case ArticlePackage.JAVADOC_GROUP__PACKAGES:
+      return packages != null && !packages.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (name: ");
+    result.append(name);
+    result.append(')');
+    return result.toString();
+  }
+
+} // JavadocGroupImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocImpl.java
new file mode 100644
index 0000000000..7f37da762b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocImpl.java
@@ -0,0 +1,160 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.releng.doc.article.impl;
+
+import org.eclipse.emf.cdo.releng.doc.AssembleScripts;
+import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage;
+import org.eclipse.emf.cdo.releng.doc.article.Javadoc;
+import org.eclipse.emf.cdo.releng.doc.article.JavadocGroup;
+import org.eclipse.emf.cdo.releng.doc.article.JavadocPackage;
+import org.eclipse.emf.cdo.releng.doc.article.StructuralElement;
+
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.ECollections;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+
+import com.sun.javadoc.PackageDoc;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Javadoc</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavadocImpl#getGroups <em>Groups</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class JavadocImpl extends CategoryImpl implements Javadoc
+{
+  private EList<JavadocGroup> groups = new BasicEList<JavadocGroup>();
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected JavadocImpl()
+  {
+    super();
+  }
+
+  JavadocImpl(StructuralElement parent, PackageDoc packageDoc)
+  {
+    super(parent, packageDoc);
+
+    try
+    {
+      File projectFolder = getDocumentation().getOutputFile().getParentFile();
+      Resource resource = AssembleScripts.JavaDoc.getTocResource(projectFolder, false);
+
+      for (EObject eObject : resource.getContents())
+      {
+        groups.add((JavadocGroup)eObject);
+      }
+    }
+    catch (IOException ex)
+    {
+      ex.printStackTrace();
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return ArticlePackage.Literals.JAVADOC;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated NOT
+   */
+  public EList<JavadocGroup> getGroups()
+  {
+    return ECollections.unmodifiableEList(groups);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case ArticlePackage.JAVADOC__GROUPS:
+      return getGroups();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case ArticlePackage.JAVADOC__GROUPS:
+      return !getGroups().isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
+
+  @Override
+  public void generate() throws IOException
+  {
+    // Do nothing
+  }
+
+  @Override
+  protected void generateTocEntry(BufferedWriter writer, String prefix) throws IOException
+  {
+    writer.write(prefix + "<topic label=\"" + getTitle() + "\" href=\"javadoc/overview-summary.html\">\n");
+
+    for (JavadocGroup javadocGroup : getGroups())
+    {
+      EList<JavadocPackage> packages = javadocGroup.getPackages();
+      String href = getHref(packages.get(0));
+      writer.write(prefix + "\t<topic label=\"" + javadocGroup.getName() + "\" href=\"" + href + "\">\n");
+
+      for (JavadocPackage javadocPackage : packages)
+      {
+        href = getHref(javadocPackage);
+        writer.write(prefix + "\t\t<topic label=\"" + javadocPackage.getName() + "\" href=\"" + href + "\" />\n");
+      }
+
+      writer.write(prefix + "\t</topic>\n");
+    }
+
+    writer.write(prefix + "</topic>\n");
+  }
+
+  private String getHref(JavadocPackage javadocPackage)
+  {
+    return "javadoc/" + javadocPackage.getName().replace('.', '/') + "/package-summary.html";
+  }
+} // JavadocImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocPackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocPackageImpl.java
new file mode 100644
index 0000000000..67e0a2b388
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocPackageImpl.java
@@ -0,0 +1,293 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.releng.doc.article.impl;
+
+import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage;
+import org.eclipse.emf.cdo.releng.doc.article.JavadocGroup;
+import org.eclipse.emf.cdo.releng.doc.article.JavadocPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Javadoc Package</b></em>'. <!-- end-user-doc
+ * -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavadocPackageImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavadocPackageImpl#getGroup <em>Group</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class JavadocPackageImpl extends EObjectImpl implements JavadocPackage
+{
+  /**
+   * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected static final String NAME_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected String name = NAME_EDEFAULT;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected JavadocPackageImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return ArticlePackage.Literals.JAVADOC_PACKAGE;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setName(String newName)
+  {
+    String oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.JAVADOC_PACKAGE__NAME, oldName, name));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public JavadocGroup getGroup()
+  {
+    if (eContainerFeatureID() != ArticlePackage.JAVADOC_PACKAGE__GROUP)
+      return null;
+    return (JavadocGroup)eContainer();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public NotificationChain basicSetGroup(JavadocGroup newGroup, NotificationChain msgs)
+  {
+    msgs = eBasicSetContainer((InternalEObject)newGroup, ArticlePackage.JAVADOC_PACKAGE__GROUP, msgs);
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setGroup(JavadocGroup newGroup)
+  {
+    if (newGroup != eInternalContainer()
+        || (eContainerFeatureID() != ArticlePackage.JAVADOC_PACKAGE__GROUP && newGroup != null))
+    {
+      if (EcoreUtil.isAncestor(this, newGroup))
+        throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      NotificationChain msgs = null;
+      if (eInternalContainer() != null)
+        msgs = eBasicRemoveFromContainer(msgs);
+      if (newGroup != null)
+        msgs = ((InternalEObject)newGroup).eInverseAdd(this, ArticlePackage.JAVADOC_GROUP__PACKAGES,
+            JavadocGroup.class, msgs);
+      msgs = basicSetGroup(newGroup, msgs);
+      if (msgs != null)
+        msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.JAVADOC_PACKAGE__GROUP, newGroup, newGroup));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case ArticlePackage.JAVADOC_PACKAGE__GROUP:
+      if (eInternalContainer() != null)
+        msgs = eBasicRemoveFromContainer(msgs);
+      return basicSetGroup((JavadocGroup)otherEnd, msgs);
+    }
+    return super.eInverseAdd(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case ArticlePackage.JAVADOC_PACKAGE__GROUP:
+      return basicSetGroup(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs)
+  {
+    switch (eContainerFeatureID())
+    {
+    case ArticlePackage.JAVADOC_PACKAGE__GROUP:
+      return eInternalContainer()
+          .eInverseRemove(this, ArticlePackage.JAVADOC_GROUP__PACKAGES, JavadocGroup.class, msgs);
+    }
+    return super.eBasicRemoveFromContainerFeature(msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case ArticlePackage.JAVADOC_PACKAGE__NAME:
+      return getName();
+    case ArticlePackage.JAVADOC_PACKAGE__GROUP:
+      return getGroup();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case ArticlePackage.JAVADOC_PACKAGE__NAME:
+      setName((String)newValue);
+      return;
+    case ArticlePackage.JAVADOC_PACKAGE__GROUP:
+      setGroup((JavadocGroup)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case ArticlePackage.JAVADOC_PACKAGE__NAME:
+      setName(NAME_EDEFAULT);
+      return;
+    case ArticlePackage.JAVADOC_PACKAGE__GROUP:
+      setGroup((JavadocGroup)null);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case ArticlePackage.JAVADOC_PACKAGE__NAME:
+      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+    case ArticlePackage.JAVADOC_PACKAGE__GROUP:
+      return getGroup() != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (name: ");
+    result.append(name);
+    result.append(')');
+    return result.toString();
+  }
+
+} // JavadocPackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkImpl.java
index 1f08a448b8..bf618bfa17 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkImpl.java
@@ -91,9 +91,7 @@ public class LinkImpl extends BodyElementImpl implements Link
     LinkTarget oldTarget = target;
     target = newTarget;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.LINK__TARGET, oldTarget, target));
-    }
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java
index bde375f73f..2ac15cdfef 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java
@@ -7,6 +7,7 @@
 package org.eclipse.emf.cdo.releng.doc.article.impl;
 
 import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage;
+import org.eclipse.emf.cdo.releng.doc.article.Body;
 import org.eclipse.emf.cdo.releng.doc.article.Documentation;
 import org.eclipse.emf.cdo.releng.doc.article.StructuralElement;
 import org.eclipse.emf.cdo.releng.doc.article.util.ArticleUtil;
@@ -24,9 +25,14 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 import com.sun.javadoc.Doc;
 
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Structural Element</b></em>'. <!-- end-user-doc
@@ -188,7 +194,9 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
   public StructuralElement getParent()
   {
     if (eContainerFeatureID() != ArticlePackage.STRUCTURAL_ELEMENT__PARENT)
+    {
       return null;
+    }
     return (StructuralElement)eContainer();
   }
 
@@ -210,24 +218,34 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
    */
   public void setParent(StructuralElement newParent)
   {
-    if (newParent != eInternalContainer()
-        || (eContainerFeatureID() != ArticlePackage.STRUCTURAL_ELEMENT__PARENT && newParent != null))
+    if (newParent != eInternalContainer() || eContainerFeatureID() != ArticlePackage.STRUCTURAL_ELEMENT__PARENT
+        && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this, ArticlePackage.STRUCTURAL_ELEMENT__CHILDREN,
             StructuralElement.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.STRUCTURAL_ELEMENT__PARENT, newParent,
           newParent));
+    }
   }
 
   /**
@@ -348,7 +366,9 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
       return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
     case ArticlePackage.STRUCTURAL_ELEMENT__PARENT:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetParent((StructuralElement)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -500,7 +520,9 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (title: ");
@@ -540,4 +562,32 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
       child.generate(out);
     }
   }
+
+  protected void generateTocEntries(BufferedWriter writer, String prefix) throws IOException
+  {
+    List<StructuralElement> children = new ArrayList<StructuralElement>(getChildren());
+    Collections.sort(children, new Comparator<StructuralElement>()
+    {
+      public int compare(StructuralElement body1, StructuralElement body2)
+      {
+        return new Integer(((Body)body1).getNumber()).compareTo(((Body)body2).getNumber());
+      }
+    });
+
+    for (StructuralElement child : children)
+    {
+      BodyImpl body = (BodyImpl)child;
+      body.generateTocEntry(writer, prefix);
+    }
+  }
+
+  protected void generateTocEntry(BufferedWriter writer, String prefix) throws IOException
+  {
+    File projectFolder = getDocumentation().getOutputFile().getParentFile();
+    String href = ArticleUtil.createLink(projectFolder, getOutputFile());
+
+    writer.write(prefix + "<topic label=\"" + getTitle() + "\" href=\"" + href + "\">\n");
+    generateTocEntries(writer, prefix + "\t");
+    writer.write(prefix + "</topic>\n");
+  }
 } // StructuralElementImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java
index c5f6d67970..d3ae285b99 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java
@@ -23,6 +23,9 @@ import org.eclipse.emf.cdo.releng.doc.article.ExternalTarget;
 import org.eclipse.emf.cdo.releng.doc.article.Factory;
 import org.eclipse.emf.cdo.releng.doc.article.Identifiable;
 import org.eclipse.emf.cdo.releng.doc.article.JavaElement;
+import org.eclipse.emf.cdo.releng.doc.article.Javadoc;
+import org.eclipse.emf.cdo.releng.doc.article.JavadocGroup;
+import org.eclipse.emf.cdo.releng.doc.article.JavadocPackage;
 import org.eclipse.emf.cdo.releng.doc.article.Link;
 import org.eclipse.emf.cdo.releng.doc.article.LinkTarget;
 import org.eclipse.emf.cdo.releng.doc.article.Snippet;
@@ -226,6 +229,24 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
     }
 
     @Override
+    public Adapter caseJavadocGroup(JavadocGroup object)
+    {
+      return createJavadocGroupAdapter();
+    }
+
+    @Override
+    public Adapter caseJavadocPackage(JavadocPackage object)
+    {
+      return createJavadocPackageAdapter();
+    }
+
+    @Override
+    public Adapter caseJavadoc(Javadoc object)
+    {
+      return createJavadocAdapter();
+    }
+
+    @Override
     public Adapter defaultCase(EObject object)
     {
       return createEObjectAdapter();
@@ -558,6 +579,48 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.JavadocGroup
+   * <em>Javadoc Group</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.releng.doc.article.JavadocGroup
+   * @generated
+   */
+  public Adapter createJavadocGroupAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.JavadocPackage
+   * <em>Javadoc Package</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.releng.doc.article.JavadocPackage
+   * @generated
+   */
+  public Adapter createJavadocPackageAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Javadoc
+   * <em>Javadoc</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
+   * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.releng.doc.article.Javadoc
+   * @generated
+   */
+  public Adapter createJavadocAdapter()
+  {
+    return null;
+  }
+
+  /**
    * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
    * 
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java
index 8b20c95672..1956342e5f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java
@@ -23,6 +23,9 @@ import org.eclipse.emf.cdo.releng.doc.article.ExternalTarget;
 import org.eclipse.emf.cdo.releng.doc.article.Factory;
 import org.eclipse.emf.cdo.releng.doc.article.Identifiable;
 import org.eclipse.emf.cdo.releng.doc.article.JavaElement;
+import org.eclipse.emf.cdo.releng.doc.article.Javadoc;
+import org.eclipse.emf.cdo.releng.doc.article.JavadocGroup;
+import org.eclipse.emf.cdo.releng.doc.article.JavadocPackage;
 import org.eclipse.emf.cdo.releng.doc.article.Link;
 import org.eclipse.emf.cdo.releng.doc.article.LinkTarget;
 import org.eclipse.emf.cdo.releng.doc.article.Snippet;
@@ -352,6 +355,42 @@ public class ArticleSwitch<T> extends Switch<T>
         result = defaultCase(theEObject);
       return result;
     }
+    case ArticlePackage.JAVADOC_GROUP:
+    {
+      JavadocGroup javadocGroup = (JavadocGroup)theEObject;
+      T result = caseJavadocGroup(javadocGroup);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case ArticlePackage.JAVADOC_PACKAGE:
+    {
+      JavadocPackage javadocPackage = (JavadocPackage)theEObject;
+      T result = caseJavadocPackage(javadocPackage);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case ArticlePackage.JAVADOC:
+    {
+      Javadoc javadoc = (Javadoc)theEObject;
+      T result = caseJavadoc(javadoc);
+      if (result == null)
+        result = caseCategory(javadoc);
+      if (result == null)
+        result = caseBody(javadoc);
+      if (result == null)
+        result = caseStructuralElement(javadoc);
+      if (result == null)
+        result = caseBodyElementContainer(javadoc);
+      if (result == null)
+        result = caseLinkTarget(javadoc);
+      if (result == null)
+        result = caseIdentifiable(javadoc);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
     default:
       return defaultCase(theEObject);
     }
@@ -689,6 +728,51 @@ public class ArticleSwitch<T> extends Switch<T>
   }
 
   /**
+   * Returns the result of interpreting the object as an instance of '<em>Javadoc Group</em>'. <!-- begin-user-doc -->
+   * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+   * 
+   * @param object
+   *          the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Javadoc Group</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseJavadocGroup(JavadocGroup object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Javadoc Package</em>'. <!-- begin-user-doc -->
+   * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+   * 
+   * @param object
+   *          the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Javadoc Package</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseJavadocPackage(JavadocPackage object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Javadoc</em>'. <!-- begin-user-doc --> This
+   * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+   * 
+   * @param object
+   *          the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Javadoc</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseJavadoc(Javadoc object)
+  {
+    return null;
+  }
+
+  /**
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.net4j.db.doc/javadoc/toc.xmi b/plugins/org.eclipse.net4j.db.doc/javadoc/toc.xmi
new file mode 100644
index 0000000000..c55d0a3bc5
--- /dev/null
+++ b/plugins/org.eclipse.net4j.db.doc/javadoc/toc.xmi
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ASCII"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:article="http://www.eclipse.org/ARTICLE/1.0">

+  <article:JavadocGroup name="Net4j DB Framework">

+    <packages name="org.eclipse.net4j.db"/>

+    <packages name="org.eclipse.net4j.db.ddl"/>

+    <packages name="org.eclipse.net4j.db.dml"/>

+    <packages name="org.eclipse.net4j.spi.db"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="Net4j DB Framework Derby Adapter">

+    <packages name="org.eclipse.net4j.db.derby"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="Net4j DB Framework H2 Adapter">

+    <packages name="org.eclipse.net4j.db.h2"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="Net4j DB Framework HSQLDB Adapter">

+    <packages name="org.eclipse.net4j.db.hsqldb"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="Net4j DB Framework MYSQL Adapter">

+    <packages name="org.eclipse.net4j.db.mysql"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="Net4j DB Framework PostgreSQL Adapter">

+    <packages name="org.eclipse.net4j.db.postgresql"/>

+  </article:JavadocGroup>

+</xmi:XMI>

diff --git a/plugins/org.eclipse.net4j.doc/javadoc/toc.xmi b/plugins/org.eclipse.net4j.doc/javadoc/toc.xmi
new file mode 100644
index 0000000000..856a328356
--- /dev/null
+++ b/plugins/org.eclipse.net4j.doc/javadoc/toc.xmi
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ASCII"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:article="http://www.eclipse.org/ARTICLE/1.0">

+  <article:JavadocGroup name="Net4j Signalling Platform Transport">

+    <packages name="org.eclipse.net4j"/>

+    <packages name="org.eclipse.net4j.acceptor"/>

+    <packages name="org.eclipse.net4j.buffer"/>

+    <packages name="org.eclipse.net4j.channel"/>

+    <packages name="org.eclipse.net4j.connector"/>

+    <packages name="org.eclipse.net4j.protocol"/>

+    <packages name="org.eclipse.net4j.signal"/>

+    <packages name="org.eclipse.net4j.signal.heartbeat"/>

+    <packages name="org.eclipse.net4j.signal.wrapping"/>

+    <packages name="org.eclipse.spi.net4j"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="Net4j Signalling Platform Transport HTTP">

+    <packages name="org.eclipse.net4j.http"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="Net4j Signalling Platform Transport HTTP Common">

+    <packages name="org.eclipse.net4j.http.common"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="Net4j Signalling Platform Transport HTTP Server">

+    <packages name="org.eclipse.net4j.http.server"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="Net4j Signalling Platform Transport JVM">

+    <packages name="org.eclipse.net4j.jvm"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="Net4j Signalling Platform Transport TCP">

+    <packages name="org.eclipse.net4j.tcp"/>

+    <packages name="org.eclipse.net4j.tcp.ssl"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="Net4j Signalling Platform UI">

+    <packages name="org.eclipse.net4j.ui"/>

+  </article:JavadocGroup>

+</xmi:XMI>

diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/toc.xmi b/plugins/org.eclipse.net4j.util.doc/javadoc/toc.xmi
new file mode 100644
index 0000000000..87cb214970
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/toc.xmi
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ASCII"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:article="http://www.eclipse.org/ARTICLE/1.0">

+  <article:JavadocGroup name="Net4j Utilities">

+    <packages name="org.eclipse.net4j.util"/>

+    <packages name="org.eclipse.net4j.util.cache"/>

+    <packages name="org.eclipse.net4j.util.collection"/>

+    <packages name="org.eclipse.net4j.util.concurrent"/>

+    <packages name="org.eclipse.net4j.util.container"/>

+    <packages name="org.eclipse.net4j.util.container.delegate"/>

+    <packages name="org.eclipse.net4j.util.event"/>

+    <packages name="org.eclipse.net4j.util.factory"/>

+    <packages name="org.eclipse.net4j.util.fsm"/>

+    <packages name="org.eclipse.net4j.util.io"/>

+    <packages name="org.eclipse.net4j.util.lifecycle"/>

+    <packages name="org.eclipse.net4j.util.om"/>

+    <packages name="org.eclipse.net4j.util.om.log"/>

+    <packages name="org.eclipse.net4j.util.om.monitor"/>

+    <packages name="org.eclipse.net4j.util.om.pref"/>

+    <packages name="org.eclipse.net4j.util.om.trace"/>

+    <packages name="org.eclipse.net4j.util.options"/>

+    <packages name="org.eclipse.net4j.util.properties"/>

+    <packages name="org.eclipse.net4j.util.ref"/>

+    <packages name="org.eclipse.net4j.util.registry"/>

+    <packages name="org.eclipse.net4j.util.security"/>

+    <packages name="org.eclipse.net4j.util.transaction"/>

+  </article:JavadocGroup>

+  <article:JavadocGroup name="Net4j Utilities UI">

+    <packages name="org.eclipse.net4j.util.ui"/>

+    <packages name="org.eclipse.net4j.util.ui.actions"/>

+    <packages name="org.eclipse.net4j.util.ui.container"/>

+    <packages name="org.eclipse.net4j.util.ui.dnd"/>

+    <packages name="org.eclipse.net4j.util.ui.prefs"/>

+    <packages name="org.eclipse.net4j.util.ui.proposals"/>

+    <packages name="org.eclipse.net4j.util.ui.security"/>

+    <packages name="org.eclipse.net4j.util.ui.views"/>

+    <packages name="org.eclipse.net4j.util.ui.widgets"/>

+  </article:JavadocGroup>

+</xmi:XMI>