Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-05-28 18:59:37 +0000
committerEike Stepper2011-05-28 18:59:37 +0000
commitd323219ca22d27b0de56222a480d622e32e57c3e (patch)
tree0bd4c27ea210e39bc23dc2e1554bdd0432f74eb7
parent65b3beaf64c1454ac0d880ad9760eb0b5cb5c4d2 (diff)
downloadcdo-d323219ca22d27b0de56222a480d622e32e57c3e.tar.gz
cdo-d323219ca22d27b0de56222a480d622e32e57c3e.tar.xz
cdo-d323219ca22d27b0de56222a480d622e32e57c3e.zip
javadoc -> doc plugin
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc.ant126
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-tree.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-tree.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-tree.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/overview-summary.html282
-rw-r--r--plugins/org.eclipse.net4j.doc/javadoc.ant98
-rw-r--r--plugins/org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/util/lifecycle/package-tree.html2
-rw-r--r--plugins/org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/util/security/package-tree.html2
-rw-r--r--plugins/org.eclipse.net4j.doc/javadoc/overview-summary.html125
-rw-r--r--releng/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java16
10 files changed, 418 insertions, 239 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc.ant b/plugins/org.eclipse.emf.cdo.doc/javadoc.ant
index 29c548beb7..ab91e964cb 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc.ant
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc.ant
@@ -92,81 +92,81 @@
<include name="org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/*.java" />
</fileset>
- <group title="CDO Model Repository Server OCL Support>
- <package name="org.eclipse.emf.cdo.server.ocl />
+ <group title="CDO Model Repository Client">
+ <package name="org.eclipse.emf.cdo.etypes" />
+ <package name="org.eclipse.emf.cdo.eresource.impl" />
+ <package name="org.eclipse.emf.cdo.view" />
+ <package name="org.eclipse.emf.cdo.eresource" />
+ <package name="org.eclipse.emf.internal.cdo" />
+ <package name="org.eclipse.emf.cdo.transaction" />
+ <package name="org.eclipse.emf.spi.cdo" />
+ <package name="org.eclipse.emf.cdo.etypes.util" />
+ <package name="org.eclipse.emf.cdo.session.remote" />
+ <package name="org.eclipse.emf.cdo.session" />
+ <package name="org.eclipse.emf.cdo" />
+ <package name="org.eclipse.emf.cdo.util" />
+ <package name="org.eclipse.emf.cdo.eresource.util" />
+ <package name="org.eclipse.emf.cdo.etypes.impl" />
+ <package name="org.eclipse.emf.cdo.eresource.validation" />
</group>
- <group title="CDO Model Repository Server Objectivity>
- <package name="org.eclipse.emf.cdo.server.objectivity />
+ <group title="CDO Model Repository Client Edit Support">
+ <package name="org.eclipse.emf.cdo.eresource.provider" />
+ <package name="org.eclipse.emf.cdo.edit" />
+ <package name="org.eclipse.emf.cdo.etypes.provider" />
</group>
- <group title="CDO Model Repository Server Hibernate>
- <package name="org.eclipse.emf.cdo.server.hibernate />
+ <group title="CDO Model Repository Client Location">
+ <package name="org.eclipse.emf.cdo.location" />
</group>
- <group title="CDO Model Repository Client Net4j Support>
- <package name="org.eclipse.emf.cdo.net4j />
+ <group title="CDO Model Repository Client Net4j Support">
+ <package name="org.eclipse.emf.cdo.net4j" />
</group>
- <group title="CDO Model Repository Server>
- <package name="org.eclipse.emf.cdo.server />
- <package name="org.eclipse.emf.cdo.server.embedded />
- <package name="org.eclipse.emf.cdo.spi.server />
- <package name="org.eclipse.emf.cdo.server.mem />
+ <group title="CDO Model Repository Common">
+ <package name="org.eclipse.emf.cdo.spi.common.revision" />
+ <package name="org.eclipse.emf.cdo.spi.common.id" />
+ <package name="org.eclipse.emf.cdo.common" />
+ <package name="org.eclipse.emf.cdo.common.commit.handler" />
+ <package name="org.eclipse.emf.cdo.common.revision" />
+ <package name="org.eclipse.emf.cdo.common.revision.delta" />
+ <package name="org.eclipse.emf.cdo.common.lock" />
+ <package name="org.eclipse.emf.cdo.common.util" />
+ <package name="org.eclipse.emf.cdo.spi.common.commit" />
+ <package name="org.eclipse.emf.cdo.common.id" />
+ <package name="org.eclipse.emf.cdo.common.model" />
+ <package name="org.eclipse.emf.cdo.spi.common.branch" />
+ <package name="org.eclipse.emf.cdo.spi.common" />
+ <package name="org.eclipse.emf.cdo.common.lob" />
+ <package name="org.eclipse.emf.cdo.common.protocol" />
+ <package name="org.eclipse.emf.cdo.common.branch" />
+ <package name="org.eclipse.emf.cdo.common.commit" />
+ <package name="org.eclipse.emf.cdo.spi.common.model" />
</group>
- <group title="CDO Model Repository Server Net4j Support>
- <package name="org.eclipse.emf.cdo.server.net4j />
+ <group title="CDO Model Repository Server">
+ <package name="org.eclipse.emf.cdo.server" />
+ <package name="org.eclipse.emf.cdo.server.embedded" />
+ <package name="org.eclipse.emf.cdo.spi.server" />
+ <package name="org.eclipse.emf.cdo.server.mem" />
</group>
- <group title="CDO Model Repository Edit Support>
- <package name="org.eclipse.emf.cdo.eresource.provider />
- <package name="org.eclipse.emf.cdo.edit />
- <package name="org.eclipse.emf.cdo.etypes.provider />
+ <group title="CDO Model Repository Server DB">
+ <package name="org.eclipse.emf.cdo.server.db" />
+ <package name="org.eclipse.emf.cdo.server.db.mapping" />
</group>
- <group title="CDO Model Repository Server MongoDB>
- <package name="org.eclipse.emf.cdo.server.mongodb />
+ <group title="CDO Model Repository Server DB4O">
+ <package name="org.eclipse.emf.cdo.server.db4o" />
</group>
- <group title="CDO Model Repository Client>
- <package name="org.eclipse.emf.cdo.etypes />
- <package name="org.eclipse.emf.cdo.eresource.impl />
- <package name="org.eclipse.emf.cdo.view />
- <package name="org.eclipse.emf.cdo.eresource />
- <package name="org.eclipse.emf.internal.cdo />
- <package name="org.eclipse.emf.cdo.transaction />
- <package name="org.eclipse.emf.spi.cdo />
- <package name="org.eclipse.emf.cdo.etypes.util />
- <package name="org.eclipse.emf.cdo.session.remote />
- <package name="org.eclipse.emf.cdo.session />
- <package name="org.eclipse.emf.cdo />
- <package name="org.eclipse.emf.cdo.util />
- <package name="org.eclipse.emf.cdo.eresource.util />
- <package name="org.eclipse.emf.cdo.etypes.impl />
- <package name="org.eclipse.emf.cdo.eresource.validation />
+ <group title="CDO Model Repository Server Hibernate">
+ <package name="org.eclipse.emf.cdo.server.hibernate" />
</group>
- <group title="CDO Model Repository Client Location>
- <package name="org.eclipse.emf.cdo.location />
+ <group title="CDO Model Repository Server MongoDB">
+ <package name="org.eclipse.emf.cdo.server.mongodb" />
</group>
- <group title="CDO Model Repository Server DB4O>
- <package name="org.eclipse.emf.cdo.server.db4o />
+ <group title="CDO Model Repository Server Net4j Support">
+ <package name="org.eclipse.emf.cdo.server.net4j" />
</group>
- <group title="CDO Model Repository Common>
- <package name="org.eclipse.emf.cdo.spi.common.revision />
- <package name="org.eclipse.emf.cdo.spi.common.id />
- <package name="org.eclipse.emf.cdo.common />
- <package name="org.eclipse.emf.cdo.common.commit.handler />
- <package name="org.eclipse.emf.cdo.common.revision />
- <package name="org.eclipse.emf.cdo.common.revision.delta />
- <package name="org.eclipse.emf.cdo.common.lock />
- <package name="org.eclipse.emf.cdo.common.util />
- <package name="org.eclipse.emf.cdo.spi.common.commit />
- <package name="org.eclipse.emf.cdo.common.id />
- <package name="org.eclipse.emf.cdo.common.model />
- <package name="org.eclipse.emf.cdo.spi.common.branch />
- <package name="org.eclipse.emf.cdo.spi.common />
- <package name="org.eclipse.emf.cdo.common.lob />
- <package name="org.eclipse.emf.cdo.common.protocol />
- <package name="org.eclipse.emf.cdo.common.branch />
- <package name="org.eclipse.emf.cdo.common.commit />
- <package name="org.eclipse.emf.cdo.spi.common.model />
+ <group title="CDO Model Repository Server OCL Support">
+ <package name="org.eclipse.emf.cdo.server.ocl" />
</group>
- <group title="CDO Model Repository Server DB>
- <package name="org.eclipse.emf.cdo.server.db />
- <package name="org.eclipse.emf.cdo.server.db.mapping />
+ <group title="CDO Model Repository Server Objectivity">
+ <package name="org.eclipse.emf.cdo.server.objectivity" />
</group>
<link href="http://download.oracle.com/javase/1.5.0/docs/api" />
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-tree.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-tree.html
index e276da0199..febca17a87 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-tree.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-tree.html
@@ -137,7 +137,7 @@ Enum Hierarchy
<LI TYPE="circle">java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><B>Object</B></A><UL>
<LI TYPE="circle">java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><B>Enum</B></A>&lt;E&gt; (implements java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</A>&lt;T&gt;, java.io.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</A>)
<UL>
-<LI TYPE="circle">org.eclipse.emf.cdo.common.model.<A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageUnit.State.html" title="enum in org.eclipse.emf.cdo.common.model"><B>CDOPackageUnit.State</B></A><LI TYPE="circle">org.eclipse.emf.cdo.common.model.<A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageUnit.Type.html" title="enum in org.eclipse.emf.cdo.common.model"><B>CDOPackageUnit.Type</B></A></UL>
+<LI TYPE="circle">org.eclipse.emf.cdo.common.model.<A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageUnit.Type.html" title="enum in org.eclipse.emf.cdo.common.model"><B>CDOPackageUnit.Type</B></A><LI TYPE="circle">org.eclipse.emf.cdo.common.model.<A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageUnit.State.html" title="enum in org.eclipse.emf.cdo.common.model"><B>CDOPackageUnit.State</B></A></UL>
</UL>
</UL>
<HR>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-tree.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-tree.html
index a29cb3e311..bde8744d87 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-tree.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-tree.html
@@ -131,7 +131,7 @@ Enum Hierarchy
<LI TYPE="circle">java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><B>Object</B></A><UL>
<LI TYPE="circle">java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><B>Enum</B></A>&lt;E&gt; (implements java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</A>&lt;T&gt;, java.io.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</A>)
<UL>
-<LI TYPE="circle">org.eclipse.emf.cdo.common.<A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common"><B>CDOCommonRepository.State</B></A><LI TYPE="circle">org.eclipse.emf.cdo.common.<A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonSession.Options.PassiveUpdateMode.html" title="enum in org.eclipse.emf.cdo.common"><B>CDOCommonSession.Options.PassiveUpdateMode</B></A><LI TYPE="circle">org.eclipse.emf.cdo.common.<A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.Type.html" title="enum in org.eclipse.emf.cdo.common"><B>CDOCommonRepository.Type</B></A></UL>
+<LI TYPE="circle">org.eclipse.emf.cdo.common.<A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.Type.html" title="enum in org.eclipse.emf.cdo.common"><B>CDOCommonRepository.Type</B></A><LI TYPE="circle">org.eclipse.emf.cdo.common.<A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonSession.Options.PassiveUpdateMode.html" title="enum in org.eclipse.emf.cdo.common"><B>CDOCommonSession.Options.PassiveUpdateMode</B></A><LI TYPE="circle">org.eclipse.emf.cdo.common.<A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common"><B>CDOCommonRepository.State</B></A></UL>
</UL>
</UL>
<HR>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-tree.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-tree.html
index 9c4194ab1d..03ed336211 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-tree.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-tree.html
@@ -246,7 +246,7 @@ Enum Hierarchy
<LI TYPE="circle">java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><B>Object</B></A><UL>
<LI TYPE="circle">java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><B>Enum</B></A>&lt;E&gt; (implements java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</A>&lt;T&gt;, java.io.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</A>)
<UL>
-<LI TYPE="circle">org.eclipse.emf.cdo.server.<A HREF="../../../../../org/eclipse/emf/cdo/server/IStore.RevisionTemporality.html" title="enum in org.eclipse.emf.cdo.server"><B>IStore.RevisionTemporality</B></A><LI TYPE="circle">org.eclipse.emf.cdo.server.<A HREF="../../../../../org/eclipse/emf/cdo/server/IStore.ChangeFormat.html" title="enum in org.eclipse.emf.cdo.server"><B>IStore.ChangeFormat</B></A><LI TYPE="circle">org.eclipse.emf.cdo.server.<A HREF="../../../../../org/eclipse/emf/cdo/server/IStore.RevisionParallelism.html" title="enum in org.eclipse.emf.cdo.server"><B>IStore.RevisionParallelism</B></A></UL>
+<LI TYPE="circle">org.eclipse.emf.cdo.server.<A HREF="../../../../../org/eclipse/emf/cdo/server/IStore.ChangeFormat.html" title="enum in org.eclipse.emf.cdo.server"><B>IStore.ChangeFormat</B></A><LI TYPE="circle">org.eclipse.emf.cdo.server.<A HREF="../../../../../org/eclipse/emf/cdo/server/IStore.RevisionParallelism.html" title="enum in org.eclipse.emf.cdo.server"><B>IStore.RevisionParallelism</B></A><LI TYPE="circle">org.eclipse.emf.cdo.server.<A HREF="../../../../../org/eclipse/emf/cdo/server/IStore.RevisionTemporality.html" title="enum in org.eclipse.emf.cdo.server"><B>IStore.RevisionTemporality</B></A></UL>
</UL>
</UL>
<HR>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/overview-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/overview-summary.html
index 7265db8b0e..73a932858c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/overview-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/overview-summary.html
@@ -88,159 +88,171 @@ function windowTitle()
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Packages</B></FONT></TH>
+<B>CDO Model Repository Client</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/package-summary.html">org.eclipse.emf.cdo</A></B></TD>
<TD>Client concepts like <A HREF="org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>CDOObject</CODE></A> and <A HREF="org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo"><CODE>CDOState</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</A></B></TD>
-<TD>Common concepts that are differently extended in clients and servers.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/eresource/package-summary.html">org.eclipse.emf.cdo.eresource</A></B></TD>
+<TD>The generated EMF API of the CDO repository file system.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/branch/package-summary.html">org.eclipse.emf.cdo.common.branch</A></B></TD>
-<TD>Common concepts for dealing with branches.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/eresource/impl/package-summary.html">org.eclipse.emf.cdo.eresource.impl</A></B></TD>
+<TD>The generated EMF implementation of the CDO repository file system.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/commit/package-summary.html">org.eclipse.emf.cdo.common.commit</A></B></TD>
-<TD>Common concepts for dealing with commits and change sets.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/eresource/util/package-summary.html">org.eclipse.emf.cdo.eresource.util</A></B></TD>
+<TD>The generated EMF utilities of the CDO repository file system.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/commit/handler/package-summary.html">org.eclipse.emf.cdo.common.commit.handler</A></B></TD>
-<TD>Some useful commit info handler implementations.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/eresource/validation/package-summary.html">org.eclipse.emf.cdo.eresource.validation</A></B></TD>
+<TD>The generated EMF validation of the CDO repository file system.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/id/package-summary.html">org.eclipse.emf.cdo.common.id</A></B></TD>
-<TD>Common concepts for dealing with object and revision IDs.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/etypes/package-summary.html">org.eclipse.emf.cdo.etypes</A></B></TD>
+<TD>The generated EMF API of the CDO system data types and native annotations.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/lob/package-summary.html">org.eclipse.emf.cdo.common.lob</A></B></TD>
-<TD>Common concepts for dealing with large binary objects and large character objects.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/etypes/impl/package-summary.html">org.eclipse.emf.cdo.etypes.impl</A></B></TD>
+<TD>The generated EMF implementation of the CDO system data types and native annotations.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/lock/package-summary.html">org.eclipse.emf.cdo.common.lock</A></B></TD>
-<TD>Common concepts for dealing with durable locks and views.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/etypes/util/package-summary.html">org.eclipse.emf.cdo.etypes.util</A></B></TD>
+<TD>The generated EMF utilities of the CDO system data types and native annotations.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/model/package-summary.html">org.eclipse.emf.cdo.common.model</A></B></TD>
-<TD>Common concepts for dealing with models and types.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A></B></TD>
+<TD>Client concepts for dealing with sessions to remote repositories.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/protocol/package-summary.html">org.eclipse.emf.cdo.common.protocol</A></B></TD>
-<TD>Common concepts for dealing with protocols and CDO-specific I/O.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/session/remote/package-summary.html">org.eclipse.emf.cdo.session.remote</A></B></TD>
+<TD>Client concepts for the communication and collaboration with other sessions.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/revision/package-summary.html">org.eclipse.emf.cdo.common.revision</A></B></TD>
-<TD>Common concepts for dealing with revisions and revision lists.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A></B></TD>
+<TD>Client concepts for dealing with transactions, distributed transactions and their save points.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A></B></TD>
-<TD>Common concepts for dealing with revision deltas and feature deltas.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</A></B></TD>
+<TD>Client utility classes, some common interfaces and exceptions.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</A></B></TD>
-<TD>Common utility classes, some common interfaces and exceptions.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A></B></TD>
+<TD>Client concepts for dealing with views, view sets, queries, CDO objects and EMF resource sets.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/edit/package-summary.html">org.eclipse.emf.cdo.edit</A></B></TD>
-<TD>Useful base classes that can be referenced from custom EMF generator models.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/internal/cdo/package-summary.html">org.eclipse.emf.internal.cdo</A></B></TD>
+<TD>Exposes <A HREF="org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo"><CODE>CDOObjectImpl</CODE></A> for extension in generated EMF models.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/eresource/package-summary.html">org.eclipse.emf.cdo.eresource</A></B></TD>
-<TD>The generated EMF API of the CDO repository file system.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</A></B></TD>
+<TD>Client service provider interfaces and useful base implementations.</TD>
+</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>CDO Model Repository Client Edit Support</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/eresource/impl/package-summary.html">org.eclipse.emf.cdo.eresource.impl</A></B></TD>
-<TD>The generated EMF implementation of the CDO repository file system.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/edit/package-summary.html">org.eclipse.emf.cdo.edit</A></B></TD>
+<TD>Useful base classes that can be referenced from custom EMF generator models.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/eresource/provider/package-summary.html">org.eclipse.emf.cdo.eresource.provider</A></B></TD>
<TD>The generated EMF edit support of the CDO repository file system.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/eresource/util/package-summary.html">org.eclipse.emf.cdo.eresource.util</A></B></TD>
-<TD>The generated EMF utilities of the CDO repository file system.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/eresource/validation/package-summary.html">org.eclipse.emf.cdo.eresource.validation</A></B></TD>
-<TD>The generated EMF validation of the CDO repository file system.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/etypes/package-summary.html">org.eclipse.emf.cdo.etypes</A></B></TD>
-<TD>The generated EMF API of the CDO system data types and native annotations.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/etypes/impl/package-summary.html">org.eclipse.emf.cdo.etypes.impl</A></B></TD>
-<TD>The generated EMF implementation of the CDO system data types and native annotations.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/etypes/provider/package-summary.html">org.eclipse.emf.cdo.etypes.provider</A></B></TD>
<TD>The generated EMF edit support of the CDO system data types and native annotations.</TD>
</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/etypes/util/package-summary.html">org.eclipse.emf.cdo.etypes.util</A></B></TD>
-<TD>The generated EMF utilities of the CDO system data types and native annotations.</TD>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>CDO Model Repository Client Location</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/location/package-summary.html">org.eclipse.emf.cdo.location</A></B></TD>
<TD>Client concepts for dealing with repository locations and checkout sources.</TD>
</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>CDO Model Repository Client Net4j Support</B></FONT></TH>
+</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/net4j/package-summary.html">org.eclipse.emf.cdo.net4j</A></B></TD>
<TD>Client concepts for dealing with Net4j-based sessions to remote repositories.</TD>
</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/package-summary.html">org.eclipse.emf.cdo.server</A></B></TD>
-<TD>Server concepts for dealing with repositories and stores.</TD>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>CDO Model Repository Common</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/db/package-summary.html">org.eclipse.emf.cdo.server.db</A></B></TD>
-<TD>Server concepts for dealing with DB stores and accessors.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</A></B></TD>
+<TD>Common concepts that are differently extended in clients and servers.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/db/mapping/package-summary.html">org.eclipse.emf.cdo.server.db.mapping</A></B></TD>
-<TD>Server concepts for dealing with mapping strategies and mappings for classes, lists and types.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/branch/package-summary.html">org.eclipse.emf.cdo.common.branch</A></B></TD>
+<TD>Common concepts for dealing with branches.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/db4o/package-summary.html">org.eclipse.emf.cdo.server.db4o</A></B></TD>
-<TD>Server concepts for dealing with DB4O stores and accessors.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/commit/package-summary.html">org.eclipse.emf.cdo.common.commit</A></B></TD>
+<TD>Common concepts for dealing with commits and change sets.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/embedded/package-summary.html">org.eclipse.emf.cdo.server.embedded</A></B></TD>
-<TD>Server concepts for dealing with embedded sessions.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/commit/handler/package-summary.html">org.eclipse.emf.cdo.common.commit.handler</A></B></TD>
+<TD>Some useful commit info handler implementations.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/hibernate/package-summary.html">org.eclipse.emf.cdo.server.hibernate</A></B></TD>
-<TD>Server concepts for dealing with Hibernate stores and accessors.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/id/package-summary.html">org.eclipse.emf.cdo.common.id</A></B></TD>
+<TD>Common concepts for dealing with object and revision IDs.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/mem/package-summary.html">org.eclipse.emf.cdo.server.mem</A></B></TD>
-<TD>Server concepts for dealing with in-memory stores.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/lob/package-summary.html">org.eclipse.emf.cdo.common.lob</A></B></TD>
+<TD>Common concepts for dealing with large binary objects and large character objects.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/mongodb/package-summary.html">org.eclipse.emf.cdo.server.mongodb</A></B></TD>
-<TD>Server concepts for dealing with MongoDB stores and accessors.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/lock/package-summary.html">org.eclipse.emf.cdo.common.lock</A></B></TD>
+<TD>Common concepts for dealing with durable locks and views.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/net4j/package-summary.html">org.eclipse.emf.cdo.server.net4j</A></B></TD>
-<TD>Server concepts for dealing with Net4j-based repositories and fail-over infrastructure.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/model/package-summary.html">org.eclipse.emf.cdo.common.model</A></B></TD>
+<TD>Common concepts for dealing with models and types.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/objectivity/package-summary.html">org.eclipse.emf.cdo.server.objectivity</A></B></TD>
-<TD>Server concepts for dealing with Objectivity/DB stores and accessors.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/protocol/package-summary.html">org.eclipse.emf.cdo.common.protocol</A></B></TD>
+<TD>Common concepts for dealing with protocols and CDO-specific I/O.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/ocl/package-summary.html">org.eclipse.emf.cdo.server.ocl</A></B></TD>
-<TD>Server implementation of a generic OCL query handler.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/revision/package-summary.html">org.eclipse.emf.cdo.common.revision</A></B></TD>
+<TD>Common concepts for dealing with revisions and revision lists.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A></B></TD>
-<TD>Client concepts for dealing with sessions to remote repositories.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A></B></TD>
+<TD>Common concepts for dealing with revision deltas and feature deltas.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/session/remote/package-summary.html">org.eclipse.emf.cdo.session.remote</A></B></TD>
-<TD>Client concepts for the communication and collaboration with other sessions.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</A></B></TD>
+<TD>Common utility classes, some common interfaces and exceptions.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/spi/common/package-summary.html">org.eclipse.emf.cdo.spi.common</A></B></TD>
@@ -267,29 +279,125 @@ function windowTitle()
<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/spi/common/revision/package-summary.html">org.eclipse.emf.cdo.spi.common.revision</A></B></TD>
<TD>Common service provider interfaces and useful base implementations for dealing with revisions and deltas.</TD>
</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>CDO Model Repository Server</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/package-summary.html">org.eclipse.emf.cdo.server</A></B></TD>
+<TD>Server concepts for dealing with repositories and stores.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/embedded/package-summary.html">org.eclipse.emf.cdo.server.embedded</A></B></TD>
+<TD>Server concepts for dealing with embedded sessions.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/mem/package-summary.html">org.eclipse.emf.cdo.server.mem</A></B></TD>
+<TD>Server concepts for dealing with in-memory stores.</TD>
+</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/spi/server/package-summary.html">org.eclipse.emf.cdo.spi.server</A></B></TD>
<TD>Server service provider interfaces and useful base implementations.</TD>
</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>CDO Model Repository Server DB</B></FONT></TH>
+</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A></B></TD>
-<TD>Client concepts for dealing with transactions, distributed transactions and their save points.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/db/package-summary.html">org.eclipse.emf.cdo.server.db</A></B></TD>
+<TD>Server concepts for dealing with DB stores and accessors.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</A></B></TD>
-<TD>Client utility classes, some common interfaces and exceptions.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/db/mapping/package-summary.html">org.eclipse.emf.cdo.server.db.mapping</A></B></TD>
+<TD>Server concepts for dealing with mapping strategies and mappings for classes, lists and types.</TD>
+</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>CDO Model Repository Server DB4O</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A></B></TD>
-<TD>Client concepts for dealing with views, view sets, queries, CDO objects and EMF resource sets.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/db4o/package-summary.html">org.eclipse.emf.cdo.server.db4o</A></B></TD>
+<TD>Server concepts for dealing with DB4O stores and accessors.</TD>
+</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>CDO Model Repository Server Hibernate</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/internal/cdo/package-summary.html">org.eclipse.emf.internal.cdo</A></B></TD>
-<TD>Exposes <A HREF="org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo"><CODE>CDOObjectImpl</CODE></A> for extension in generated EMF models.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/hibernate/package-summary.html">org.eclipse.emf.cdo.server.hibernate</A></B></TD>
+<TD>Server concepts for dealing with Hibernate stores and accessors.</TD>
+</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>CDO Model Repository Server MongoDB</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</A></B></TD>
-<TD>Client service provider interfaces and useful base implementations.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/mongodb/package-summary.html">org.eclipse.emf.cdo.server.mongodb</A></B></TD>
+<TD>Server concepts for dealing with MongoDB stores and accessors.</TD>
+</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>CDO Model Repository Server Net4j Support</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/net4j/package-summary.html">org.eclipse.emf.cdo.server.net4j</A></B></TD>
+<TD>Server concepts for dealing with Net4j-based repositories and fail-over infrastructure.</TD>
+</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>CDO Model Repository Server OCL Support</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/ocl/package-summary.html">org.eclipse.emf.cdo.server.ocl</A></B></TD>
+<TD>Server implementation of a generic OCL query handler.</TD>
+</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>CDO Model Repository Server Objectivity</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="org/eclipse/emf/cdo/server/objectivity/package-summary.html">org.eclipse.emf.cdo.server.objectivity</A></B></TD>
+<TD>Server concepts for dealing with Objectivity/DB stores and accessors.</TD>
</TR>
</TABLE>
diff --git a/plugins/org.eclipse.net4j.doc/javadoc.ant b/plugins/org.eclipse.net4j.doc/javadoc.ant
index 17398d3829..61eb42a045 100644
--- a/plugins/org.eclipse.net4j.doc/javadoc.ant
+++ b/plugins/org.eclipse.net4j.doc/javadoc.ant
@@ -83,62 +83,62 @@
<include name="org.eclipse.net4j/src/org/eclipse/spi/net4j/*.java" />
</fileset>
- <group title="Net4j Signalling Platform Transport HTTP Common>
- <package name="org.eclipse.net4j.http.common />
+ <group title="Net4j DB Framework">
+ <package name="org.eclipse.net4j.db.ddl" />
+ <package name="org.eclipse.net4j.spi.db" />
+ <package name="org.eclipse.net4j.db.dml" />
+ <package name="org.eclipse.net4j.db" />
</group>
- <group title="Net4j Signalling Platform Transport HTTP>
- <package name="org.eclipse.net4j.http />
+ <group title="Net4j Signalling Platform Transport">
+ <package name="org.eclipse.net4j.signal" />
+ <package name="org.eclipse.net4j.connector" />
+ <package name="org.eclipse.net4j.protocol" />
+ <package name="org.eclipse.net4j.channel" />
+ <package name="org.eclipse.net4j.buffer" />
+ <package name="org.eclipse.net4j" />
+ <package name="org.eclipse.spi.net4j" />
+ <package name="org.eclipse.net4j.acceptor" />
+ <package name="org.eclipse.net4j.signal.wrapping" />
+ <package name="org.eclipse.net4j.signal.heartbeat" />
</group>
- <group title="Net4j Signalling Platform Transport JVM>
- <package name="org.eclipse.net4j.jvm />
+ <group title="Net4j Signalling Platform Transport HTTP">
+ <package name="org.eclipse.net4j.http" />
</group>
- <group title="Net4j Signalling Platform Utilities>
- <package name="org.eclipse.net4j.util.container />
- <package name="org.eclipse.net4j.util.registry />
- <package name="org.eclipse.net4j.util.cache />
- <package name="org.eclipse.net4j.util.container.delegate />
- <package name="org.eclipse.net4j.util.om />
- <package name="org.eclipse.net4j.util.collection />
- <package name="org.eclipse.net4j.util.om.trace />
- <package name="org.eclipse.net4j.util.om.pref />
- <package name="org.eclipse.net4j.util.fsm />
- <package name="org.eclipse.net4j.util.io />
- <package name="org.eclipse.net4j.util.transaction />
- <package name="org.eclipse.net4j.util.event />
- <package name="org.eclipse.net4j.util.concurrent />
- <package name="org.eclipse.net4j.util.options />
- <package name="org.eclipse.net4j.util.om.monitor />
- <package name="org.eclipse.net4j.util.om.log />
- <package name="org.eclipse.net4j.util.security />
- <package name="org.eclipse.net4j.util.ref />
- <package name="org.eclipse.net4j.util />
- <package name="org.eclipse.net4j.util.lifecycle />
- <package name="org.eclipse.net4j.util.factory />
+ <group title="Net4j Signalling Platform Transport HTTP Common">
+ <package name="org.eclipse.net4j.http.common" />
</group>
- <group title="Net4j Signalling Platform Transport HTTP Server>
- <package name="org.eclipse.net4j.http.server />
+ <group title="Net4j Signalling Platform Transport HTTP Server">
+ <package name="org.eclipse.net4j.http.server" />
</group>
- <group title="Net4j DB Framework>
- <package name="org.eclipse.net4j.db.ddl />
- <package name="org.eclipse.net4j.spi.db />
- <package name="org.eclipse.net4j.db.dml />
- <package name="org.eclipse.net4j.db />
+ <group title="Net4j Signalling Platform Transport JVM">
+ <package name="org.eclipse.net4j.jvm" />
</group>
- <group title="Net4j Signalling Platform Transport TCP>
- <package name="org.eclipse.net4j.tcp.ssl />
- <package name="org.eclipse.net4j.tcp />
+ <group title="Net4j Signalling Platform Transport TCP">
+ <package name="org.eclipse.net4j.tcp.ssl" />
+ <package name="org.eclipse.net4j.tcp" />
</group>
- <group title="Net4j Signalling Platform Transport>
- <package name="org.eclipse.net4j.signal />
- <package name="org.eclipse.net4j.connector />
- <package name="org.eclipse.net4j.protocol />
- <package name="org.eclipse.net4j.channel />
- <package name="org.eclipse.net4j.buffer />
- <package name="org.eclipse.net4j />
- <package name="org.eclipse.spi.net4j />
- <package name="org.eclipse.net4j.acceptor />
- <package name="org.eclipse.net4j.signal.wrapping />
- <package name="org.eclipse.net4j.signal.heartbeat />
+ <group title="Net4j Signalling Platform Utilities">
+ <package name="org.eclipse.net4j.util.container" />
+ <package name="org.eclipse.net4j.util.registry" />
+ <package name="org.eclipse.net4j.util.cache" />
+ <package name="org.eclipse.net4j.util.container.delegate" />
+ <package name="org.eclipse.net4j.util.om" />
+ <package name="org.eclipse.net4j.util.collection" />
+ <package name="org.eclipse.net4j.util.om.trace" />
+ <package name="org.eclipse.net4j.util.om.pref" />
+ <package name="org.eclipse.net4j.util.fsm" />
+ <package name="org.eclipse.net4j.util.io" />
+ <package name="org.eclipse.net4j.util.transaction" />
+ <package name="org.eclipse.net4j.util.event" />
+ <package name="org.eclipse.net4j.util.concurrent" />
+ <package name="org.eclipse.net4j.util.options" />
+ <package name="org.eclipse.net4j.util.om.monitor" />
+ <package name="org.eclipse.net4j.util.om.log" />
+ <package name="org.eclipse.net4j.util.security" />
+ <package name="org.eclipse.net4j.util.ref" />
+ <package name="org.eclipse.net4j.util" />
+ <package name="org.eclipse.net4j.util.lifecycle" />
+ <package name="org.eclipse.net4j.util.factory" />
</group>
<link href="http://download.oracle.com/javase/1.5.0/docs/api" />
diff --git a/plugins/org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/util/lifecycle/package-tree.html b/plugins/org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/util/lifecycle/package-tree.html
index acf6e42362..89d600ec58 100644
--- a/plugins/org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/util/lifecycle/package-tree.html
+++ b/plugins/org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/util/lifecycle/package-tree.html
@@ -127,8 +127,8 @@ Interface Hierarchy
Annotation Type Hierarchy
</H2>
<UL>
-<LI TYPE="circle">org.eclipse.net4j.util.lifecycle.<A HREF="../../../../../org/eclipse/net4j/util/lifecycle/LifecycleUtil.Activator.html" title="annotation in org.eclipse.net4j.util.lifecycle"><B>LifecycleUtil.Activator</B></A> (implements java.lang.annotation.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</A>)
<LI TYPE="circle">org.eclipse.net4j.util.lifecycle.<A HREF="../../../../../org/eclipse/net4j/util/lifecycle/LifecycleUtil.Deactivator.html" title="annotation in org.eclipse.net4j.util.lifecycle"><B>LifecycleUtil.Deactivator</B></A> (implements java.lang.annotation.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</A>)
+<LI TYPE="circle">org.eclipse.net4j.util.lifecycle.<A HREF="../../../../../org/eclipse/net4j/util/lifecycle/LifecycleUtil.Activator.html" title="annotation in org.eclipse.net4j.util.lifecycle"><B>LifecycleUtil.Activator</B></A> (implements java.lang.annotation.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</A>)
</UL>
<H2>
Enum Hierarchy
diff --git a/plugins/org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/util/security/package-tree.html b/plugins/org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/util/security/package-tree.html
index 79fd291530..8ae6178499 100644
--- a/plugins/org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/util/security/package-tree.html
+++ b/plugins/org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/util/security/package-tree.html
@@ -157,7 +157,7 @@ Enum Hierarchy
<LI TYPE="circle">java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><B>Object</B></A><UL>
<LI TYPE="circle">java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><B>Enum</B></A>&lt;E&gt; (implements java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</A>&lt;T&gt;, java.io.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</A>)
<UL>
-<LI TYPE="circle">org.eclipse.net4j.util.security.<A HREF="../../../../../org/eclipse/net4j/util/security/IChallengeResponse.State.html" title="enum in org.eclipse.net4j.util.security"><B>IChallengeResponse.State</B></A><LI TYPE="circle">org.eclipse.net4j.util.security.<A HREF="../../../../../org/eclipse/net4j/util/security/IChallengeResponse.Event.html" title="enum in org.eclipse.net4j.util.security"><B>IChallengeResponse.Event</B></A></UL>
+<LI TYPE="circle">org.eclipse.net4j.util.security.<A HREF="../../../../../org/eclipse/net4j/util/security/IChallengeResponse.Event.html" title="enum in org.eclipse.net4j.util.security"><B>IChallengeResponse.Event</B></A><LI TYPE="circle">org.eclipse.net4j.util.security.<A HREF="../../../../../org/eclipse/net4j/util/security/IChallengeResponse.State.html" title="enum in org.eclipse.net4j.util.security"><B>IChallengeResponse.State</B></A></UL>
</UL>
</UL>
<HR>
diff --git a/plugins/org.eclipse.net4j.doc/javadoc/overview-summary.html b/plugins/org.eclipse.net4j.doc/javadoc/overview-summary.html
index e38b1f2b44..886ca7d9ab 100644
--- a/plugins/org.eclipse.net4j.doc/javadoc/overview-summary.html
+++ b/plugins/org.eclipse.net4j.doc/javadoc/overview-summary.html
@@ -88,7 +88,32 @@ function windowTitle()
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Packages</B></FONT></TH>
+<B>Net4j DB Framework</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/db/package-summary.html">org.eclipse.net4j.db</A></B></TD>
+<TD>The Net4j DB framework.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/db/ddl/package-summary.html">org.eclipse.net4j.db.ddl</A></B></TD>
+<TD>The Net4j DB framework concepts for the abstraction of the SQL data definition language.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/db/dml/package-summary.html">org.eclipse.net4j.db.dml</A></B></TD>
+<TD>The Net4j DB framework concepts for the abstraction of the SQL data manipulation language.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/spi/db/package-summary.html">org.eclipse.net4j.spi.db</A></B></TD>
+<TD>Server service provider interfaces and useful base implementations for the Net4j DB framework.</TD>
+</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Net4j Signalling Platform Transport</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/package-summary.html">org.eclipse.net4j</A></B></TD>
@@ -111,53 +136,86 @@ function windowTitle()
<TD>The Net4j transport layer concepts for dealing with connectors.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/db/package-summary.html">org.eclipse.net4j.db</A></B></TD>
-<TD>The Net4j DB framework.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/protocol/package-summary.html">org.eclipse.net4j.protocol</A></B></TD>
+<TD>The Net4j transport layer concepts for dealing with protocols.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/db/ddl/package-summary.html">org.eclipse.net4j.db.ddl</A></B></TD>
-<TD>The Net4j DB framework concepts for the abstraction of the SQL data definition language.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/signal/package-summary.html">org.eclipse.net4j.signal</A></B></TD>
+<TD>A framework for request/response based communication on top of
+the Net4j transport layer.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/db/dml/package-summary.html">org.eclipse.net4j.db.dml</A></B></TD>
-<TD>The Net4j DB framework concepts for the abstraction of the SQL data manipulation language.</TD>
+<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/signal/heartbeat/package-summary.html">org.eclipse.net4j.signal.heartbeat</A></B></TD>
+<TD>A signal protocol implementation that realizes a configurable heart beat protocol.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/signal/wrapping/package-summary.html">org.eclipse.net4j.signal.wrapping</A></B></TD>
+<TD>Some container injectors for use with signal protocols.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="org/eclipse/spi/net4j/package-summary.html">org.eclipse.spi.net4j</A></B></TD>
+<TD>Server service provider interfaces and useful base implementations for the Net4j transport layer.</TD>
+</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Net4j Signalling Platform Transport HTTP</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/http/package-summary.html">org.eclipse.net4j.http</A></B></TD>
<TD>Transport layer extension with support for HTTP connections.</TD>
</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Net4j Signalling Platform Transport HTTP Common</B></FONT></TH>
+</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/http/common/package-summary.html">org.eclipse.net4j.http.common</A></B></TD>
<TD>Transport layer extension with support for HTTP connections.</TD>
</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Net4j Signalling Platform Transport HTTP Server</B></FONT></TH>
+</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/http/server/package-summary.html">org.eclipse.net4j.http.server</A></B></TD>
<TD>Transport layer extension with support for HTTP connections.</TD>
</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Net4j Signalling Platform Transport JVM</B></FONT></TH>
+</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/jvm/package-summary.html">org.eclipse.net4j.jvm</A></B></TD>
<TD>Transport layer extension with support for JVM embedded connections.</TD>
</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/protocol/package-summary.html">org.eclipse.net4j.protocol</A></B></TD>
-<TD>The Net4j transport layer concepts for dealing with protocols.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/signal/package-summary.html">org.eclipse.net4j.signal</A></B></TD>
-<TD>A framework for request/response based communication on top of
-the Net4j transport layer.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/signal/heartbeat/package-summary.html">org.eclipse.net4j.signal.heartbeat</A></B></TD>
-<TD>A signal protocol implementation that realizes a configurable heart beat protocol.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/signal/wrapping/package-summary.html">org.eclipse.net4j.signal.wrapping</A></B></TD>
-<TD>Some container injectors for use with signal protocols.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/spi/db/package-summary.html">org.eclipse.net4j.spi.db</A></B></TD>
-<TD>Server service provider interfaces and useful base implementations for the Net4j DB framework.</TD>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Net4j Signalling Platform Transport TCP</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/tcp/package-summary.html">org.eclipse.net4j.tcp</A></B></TD>
@@ -167,6 +225,15 @@ the Net4j transport layer.</TD>
<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/tcp/ssl/package-summary.html">org.eclipse.net4j.tcp.ssl</A></B></TD>
<TD>Transport layer extension with support for TCP/SSL socket connections.</TD>
</TR>
+</TABLE>
+
+<P>
+&nbsp;
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Net4j Signalling Platform Utilities</B></FONT></TH>
+</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/util/package-summary.html">org.eclipse.net4j.util</A></B></TD>
<TD>Utility classes.</TD>
@@ -251,10 +318,6 @@ the Net4j transport layer.</TD>
<TD WIDTH="20%"><B><A HREF="org/eclipse/net4j/util/transaction/package-summary.html">org.eclipse.net4j.util.transaction</A></B></TD>
<TD>A framework for transactional operations.</TD>
</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/eclipse/spi/net4j/package-summary.html">org.eclipse.spi.net4j</A></B></TD>
-<TD>Server service provider interfaces and useful base implementations for the Net4j transport layer.</TD>
-</TR>
</TABLE>
<P>
diff --git a/releng/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java b/releng/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java
index e47112cc18..996857db72 100644
--- a/releng/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java
+++ b/releng/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/AssembleJavaDocOptions.java
@@ -296,7 +296,7 @@ public class AssembleJavaDocOptions
/**
* @author Eike Stepper
*/
- private static class SourcePlugin
+ private static class SourcePlugin implements Comparable<SourcePlugin>
{
private String projectName;
@@ -329,6 +329,11 @@ public class AssembleJavaDocOptions
{
return packageNames;
}
+
+ public int compareTo(SourcePlugin o)
+ {
+ return getLabel().compareTo(o.getLabel());
+ }
}
/**
@@ -464,13 +469,16 @@ public class AssembleJavaDocOptions
}
else if ("<!-- GROUPS -->".equals(id))
{
- for (SourcePlugin sourcePlugin : getSourcePlugins())
+ List<SourcePlugin> sorted = new ArrayList<SourcePlugin>(getSourcePlugins());
+ Collections.sort(sorted);
+
+ for (SourcePlugin sourcePlugin : sorted)
{
- writer.write("\t\t\t<group title=\"" + sourcePlugin.getLabel() + ">\n");
+ writer.write("\t\t\t<group title=\"" + sourcePlugin.getLabel() + "\">\n");
for (String packageName : sourcePlugin.getPackageNames())
{
- writer.write("\t\t\t\t<package name=\"" + packageName + " />\n");
+ writer.write("\t\t\t\t<package name=\"" + packageName + "\" />\n");
}
writer.write("\t\t\t</group>\n");

Back to the top