overview
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/Overview.html b/plugins/org.eclipse.emf.cdo.doc/html/Overview.html
index 088a763..10cf295 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/Overview.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/Overview.html
@@ -19,7 +19,8 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="" title="CDO Model Repository Documentation">CDO Model Repository Documentation</a></div> -->
-<h1><a name="Overview.html"/>Overview</h1>
+
+<h1>Overview</h1>
<p>
CDO is a pure Java <i>model repository</i> for your EMF models and meta models. CDO can also serve as a
<i>persistence and distribution framework</i> for your EMF based application systems. For the sake of this overview a
@@ -128,33 +129,12 @@
<p align="center">
<img src="application-architecture.png"/>
-<h4><a name="OSGi"/>2.1.1 OSGi</h4>
-
-
-<h4><a name="EMF"/>2.1.2 EMF</h4>
-
-
-<h4><a name="CDOClient"/>2.1.3 CDO Client</h4>
-
-
-<h4><a name="Net4j"/>2.1.4 Net4j Core</h4>
-
-
-<h4><a name="Models"/>2.1.5 Models</h4>
-
-
-<h4><a name="Protocol"/>2.1.6 Protocol</h4>
-
-
-<h4><a name="Transport"/>2.1.7 Transport</h4>
-
-
<h3><a name="Repository"/>2.2 Repository Architecture</h3>
<p>
The main building block of a CDO repository is split into two layers, the generic repository layer that client
applications interact with and the database integration layer that providers can hook into to integrate their
- data storage solutions with CDO. A number of such integrations already ship with CDO, as outlined in
- <a href="Overview.html#CDOStore" title="Chapter in CDO Model Repository Documentation">CDO Store</a>.
+ data storage solutions with CDO. A number of such integrations already ship with CDO, making it possible to
+ connect a repository to all sorts of JDBC databases, Hibernate, Objectivity/DB, MongoDB or DB4O.
<p>
While technically a CDO repository depends on EMF this dependency is not of equal importance as it is in a CDO
application. In particular the generated application models are not required to be deployed to the server because
@@ -164,27 +144,6 @@
<p align="center">
<img src="repository-architecture.png"/>.
-<h4><a name="OSGi"/>2.2.1 OSGi</h4>
-
-
-<h4><a name="CDOServerCore"/>2.2.2 CDO Server Core</h4>
-
-
-<h4><a name="CDOStore"/>2.2.3 CDO Store</h4>
-
-
-<h4><a name="OCL"/>2.2.4 OCL</h4>
-
-
-<h4><a name="Net4j"/>2.2.5 Net4j</h4>
-
-
-<h4><a name="Protocol"/>2.2.6 Protocol</h4>
-
-
-<h4><a name="Transport"/>2.2.7 Transport</h4>
-
-
<HR>
<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
</BODY>
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/online/index.html b/plugins/org.eclipse.emf.cdo.doc/html/online/index.html
index d1201aa..785d0cd 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/online/index.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/online/index.html
@@ -19,6 +19,7 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="CDO Model Repository Documentation">CDO Model Repository Documentation</a></div> -->
+
<h1>Online Docs</h1>
<p>
<table border="0">
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/reference/index.html b/plugins/org.eclipse.emf.cdo.doc/html/reference/index.html
index 7261a9c..ba611ce 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/reference/index.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/reference/index.html
@@ -19,6 +19,7 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="CDO Model Repository Documentation">CDO Model Repository Documentation</a></div> -->
+
<h1>Reference</h1>
<p>
<table border="0">
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/index.html b/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/index.html
index 21a5d23..036982f 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/index.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/index.html
@@ -19,6 +19,7 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="../../Overview.html" title="CDO Model Repository Documentation">CDO Model Repository Documentation</a> > <a href="../index.html" title="Category in CDO Model Repository Documentation">Reference</a></div> -->
+
<h1>Extension Point Reference</h1>
<p>
<table border="0">
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Overview.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Overview.java
index 2b6134e..9f64b08 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Overview.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Overview.java
@@ -137,54 +137,54 @@
*/
public class Application
{
- /**
- * OSGi
- */
- public class OSGi
- {
- }
-
- /**
- * EMF
- */
- public class EMF
- {
- }
-
- /**
- * CDO Client
- */
- public class CDOClient
- {
- }
-
- /**
- * Net4j Core
- */
- public class Net4j
- {
- }
-
- /**
- * Models
- */
- public class Models
- {
- }
-
- /**
- * Protocol
- */
- public class Protocol
- {
- }
-
- /**
- * Transport
- */
- public class Transport
- {
- }
+ // /**
+ // * OSGi
+ // */
+ // public class OSGi
+ // {
+ // }
+ //
+ // /**
+ // * EMF
+ // */
+ // public class EMF
+ // {
+ // }
+ //
+ // /**
+ // * CDO Client
+ // */
+ // public class CDOClient
+ // {
+ // }
+ //
+ // /**
+ // * Net4j Core
+ // */
+ // public class Net4j
+ // {
+ // }
+ //
+ // /**
+ // * Models
+ // */
+ // public class Models
+ // {
+ // }
+ //
+ // /**
+ // * Protocol
+ // */
+ // public class Protocol
+ // {
+ // }
+ //
+ // /**
+ // * Transport
+ // */
+ // public class Transport
+ // {
+ // }
}
/**
@@ -192,8 +192,8 @@
* <p>
* The main building block of a CDO repository is split into two layers, the generic repository layer that client
* applications interact with and the database integration layer that providers can hook into to integrate their
- * data storage solutions with CDO. A number of such integrations already ship with CDO, as outlined in
- * {@link CDOStore}.
+ * data storage solutions with CDO. A number of such integrations already ship with CDO, making it possible to
+ * connect a repository to all sorts of JDBC databases, Hibernate, Objectivity/DB, MongoDB or DB4O.
* <p>
* While technically a CDO repository depends on EMF this dependency is not of equal importance as it is in a CDO
* application. In particular the generated application models are not required to be deployed to the server because
@@ -206,54 +206,54 @@
*/
public class Repository
{
- /**
- * OSGi
- */
- public class OSGi
- {
- }
-
- /**
- * CDO Server Core
- */
- public class CDOServerCore
- {
- }
-
- /**
- * CDO Store
- */
- public class CDOStore
- {
- }
-
- /**
- * OCL
- */
- public class OCL
- {
- }
-
- /**
- * Net4j
- */
- public class Net4j
- {
- }
-
- /**
- * Protocol
- */
- public class Protocol
- {
- }
-
- /**
- * Transport
- */
- public class Transport
- {
- }
+ // /**
+ // * OSGi
+ // */
+ // public class RepositoryOSGi
+ // {
+ // }
+ //
+ // /**
+ // * CDO Server Core
+ // */
+ // public class CDOServerCore
+ // {
+ // }
+ //
+ // /**
+ // * CDO Store
+ // */
+ // public class CDOStore
+ // {
+ // }
+ //
+ // /**
+ // * OCL
+ // */
+ // public class OCL
+ // {
+ // }
+ //
+ // /**
+ // * Net4j
+ // */
+ // public class RepositoryNet4j
+ // {
+ // }
+ //
+ // /**
+ // * Protocol
+ // */
+ // public class RepositoryProtocol
+ // {
+ // }
+ //
+ // /**
+ // * Transport
+ // */
+ // public class RepositoryTransport
+ // {
+ // }
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Chapter.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Chapter.java
index 7719ff5..e4e47f6 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Chapter.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Chapter.java
@@ -37,4 +37,5 @@
*/
Article getArticle();
+ public String getName();
} // Chapter
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleImpl.java
index f7f87e4..cb82db2 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleImpl.java
@@ -8,14 +8,18 @@
import org.eclipse.emf.cdo.releng.doc.article.Article;
import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage;
+import org.eclipse.emf.cdo.releng.doc.article.Chapter;
import org.eclipse.emf.cdo.releng.doc.article.StructuralElement;
import org.eclipse.emf.cdo.releng.doc.article.impl.DocumentationImpl.TocWriter;
+import org.eclipse.emf.cdo.releng.doc.article.util.ArticleUtil;
import org.eclipse.emf.ecore.EClass;
import com.sun.javadoc.ClassDoc;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
/**
* <!-- begin-user-doc --> An implementation of the model object '<em><b>Article</b></em>'. <!-- end-user-doc -->
@@ -26,6 +30,8 @@
*/
public class ArticleImpl extends ChapterImpl implements Article
{
+ private Map<String, Chapter> chapters = new HashMap<String, Chapter>();
+
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
@@ -41,6 +47,18 @@
super(parent, classDoc);
}
+ void registerChapter(Chapter chapter)
+ {
+ if (!(chapter instanceof Article))
+ {
+ String name = chapter.getName();
+ if (chapters.put(name, chapter) != null)
+ {
+ throw new AssertionError("Ambiguous chapter name: " + ArticleUtil.makeConsoleLink(chapter.getDoc()));
+ }
+ }
+ }
+
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
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 5d2a214..7c84299 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
@@ -48,6 +48,7 @@
{
super(parent, makePath(classDoc), classDoc);
getDocumentation().getContext().register(getId(), this);
+ ((ArticleImpl)getArticle()).registerChapter(this);
}
private static String makePath(ClassDoc classDoc)
@@ -133,7 +134,7 @@
return super.createFullPath();
}
- return getArticle().getFullPath() + "#" + getPath();
+ return getArticle().getFullPath() + "#" + getName();
}
@Override
@@ -148,16 +149,16 @@
@Override
public void generate(PrintWriter out) throws IOException
{
- String anchor = "<a name=\"" + getPath() + "\"/>";
-
if (this instanceof Article)
{
out.write("<h" + 1 + ">");
- out.write(anchor + getTitle());
+ out.write(getTitle());
out.write("</h" + 1 + ">\n");
}
else
{
+ String anchor = "<a name=\"" + getName() + "\"/>";
+
int level = getChapterNumbers().length + 1;
out.write("<h" + level + ">");
out.write(anchor + getTitleWithNumber());
@@ -167,6 +168,12 @@
super.generate(out);
}
+ public String getName()
+ {
+ return getDoc().simpleTypeName();
+ // return getPath().replace('/', '_').replace('.', '_').replace('-', '_');
+ }
+
public String getTitleWithNumber()
{
return getChapterNumber() + " " + getTitle();
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 e233ffe..09415d6 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
@@ -620,6 +620,7 @@
generateBreadCrumbs(out, this);
out.write("</div>");
out.write(" -->\n");
+ out.write("\n");
generate(out);
diff --git a/plugins/org.eclipse.net4j.db.doc/html/Overview.html b/plugins/org.eclipse.net4j.db.doc/html/Overview.html
index c0c9b1f..8e79dc9 100644
--- a/plugins/org.eclipse.net4j.db.doc/html/Overview.html
+++ b/plugins/org.eclipse.net4j.db.doc/html/Overview.html
@@ -19,7 +19,8 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="" title="Net4j DB Framework Documentation">Net4j DB Framework Documentation</a></div> -->
-<h1><a name="Overview.html"/>Overview</h1>
+
+<h1>Overview</h1>
<p>
<p>
<table border="0">
diff --git a/plugins/org.eclipse.net4j.db.doc/html/online/index.html b/plugins/org.eclipse.net4j.db.doc/html/online/index.html
index cb785ee..f4c58cf 100644
--- a/plugins/org.eclipse.net4j.db.doc/html/online/index.html
+++ b/plugins/org.eclipse.net4j.db.doc/html/online/index.html
@@ -19,6 +19,7 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="Net4j DB Framework Documentation">Net4j DB Framework Documentation</a></div> -->
+
<h1>Online Docs</h1>
<p>
<table border="0">
diff --git a/plugins/org.eclipse.net4j.db.doc/html/reference/index.html b/plugins/org.eclipse.net4j.db.doc/html/reference/index.html
index 6ccfc8f..100bb6a 100644
--- a/plugins/org.eclipse.net4j.db.doc/html/reference/index.html
+++ b/plugins/org.eclipse.net4j.db.doc/html/reference/index.html
@@ -19,6 +19,7 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="Net4j DB Framework Documentation">Net4j DB Framework Documentation</a></div> -->
+
<h1>Reference</h1>
<p>
<table border="0">
diff --git a/plugins/org.eclipse.net4j.db.doc/html/reference/schema/index.html b/plugins/org.eclipse.net4j.db.doc/html/reference/schema/index.html
index 76d9fec..fa48886 100644
--- a/plugins/org.eclipse.net4j.db.doc/html/reference/schema/index.html
+++ b/plugins/org.eclipse.net4j.db.doc/html/reference/schema/index.html
@@ -19,6 +19,7 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="../../Overview.html" title="Net4j DB Framework Documentation">Net4j DB Framework Documentation</a> > <a href="../index.html" title="Category in Net4j DB Framework Documentation">Reference</a></div> -->
+
<h1>Extension Point Reference</h1>
<p>
<table border="0">
diff --git a/plugins/org.eclipse.net4j.doc/html/Overview.html b/plugins/org.eclipse.net4j.doc/html/Overview.html
index a08656a..1ee3b67 100644
--- a/plugins/org.eclipse.net4j.doc/html/Overview.html
+++ b/plugins/org.eclipse.net4j.doc/html/Overview.html
@@ -19,7 +19,8 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="" title="Net4j Signalling Platform Documentation">Net4j Signalling Platform Documentation</a></div> -->
-<h1><a name="Overview.html"/>Overview</h1>
+
+<h1>Overview</h1>
<p>
<p>
<table border="0">
diff --git a/plugins/org.eclipse.net4j.doc/html/online/index.html b/plugins/org.eclipse.net4j.doc/html/online/index.html
index 8239f2d..2e23b16 100644
--- a/plugins/org.eclipse.net4j.doc/html/online/index.html
+++ b/plugins/org.eclipse.net4j.doc/html/online/index.html
@@ -19,6 +19,7 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="Net4j Signalling Platform Documentation">Net4j Signalling Platform Documentation</a></div> -->
+
<h1>Online Docs</h1>
<p>
<table border="0">
diff --git a/plugins/org.eclipse.net4j.doc/html/reference/index.html b/plugins/org.eclipse.net4j.doc/html/reference/index.html
index 93cbdcf..5a967f3 100644
--- a/plugins/org.eclipse.net4j.doc/html/reference/index.html
+++ b/plugins/org.eclipse.net4j.doc/html/reference/index.html
@@ -19,6 +19,7 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="Net4j Signalling Platform Documentation">Net4j Signalling Platform Documentation</a></div> -->
+
<h1>Reference</h1>
<p>
<table border="0">
diff --git a/plugins/org.eclipse.net4j.doc/html/reference/schema/index.html b/plugins/org.eclipse.net4j.doc/html/reference/schema/index.html
index 51f1756..bbb7825 100644
--- a/plugins/org.eclipse.net4j.doc/html/reference/schema/index.html
+++ b/plugins/org.eclipse.net4j.doc/html/reference/schema/index.html
@@ -19,6 +19,7 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="../../Overview.html" title="Net4j Signalling Platform Documentation">Net4j Signalling Platform Documentation</a> > <a href="../index.html" title="Category in Net4j Signalling Platform Documentation">Reference</a></div> -->
+
<h1>Extension Point Reference</h1>
<p>
<table border="0">
diff --git a/plugins/org.eclipse.net4j.util.doc/html/Overview.html b/plugins/org.eclipse.net4j.util.doc/html/Overview.html
index b4cfc86..1cfe3c0 100644
--- a/plugins/org.eclipse.net4j.util.doc/html/Overview.html
+++ b/plugins/org.eclipse.net4j.util.doc/html/Overview.html
@@ -19,7 +19,8 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="" title="Net4j Utilities Documentation">Net4j Utilities Documentation</a></div> -->
-<h1><a name="Overview.html"/>Overview</h1>
+
+<h1>Overview</h1>
<p>
<p>
<table border="0">
diff --git a/plugins/org.eclipse.net4j.util.doc/html/online/index.html b/plugins/org.eclipse.net4j.util.doc/html/online/index.html
index c0424df..28e09a5 100644
--- a/plugins/org.eclipse.net4j.util.doc/html/online/index.html
+++ b/plugins/org.eclipse.net4j.util.doc/html/online/index.html
@@ -19,6 +19,7 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="Net4j Utilities Documentation">Net4j Utilities Documentation</a></div> -->
+
<h1>Online Docs</h1>
<p>
<table border="0">
diff --git a/plugins/org.eclipse.net4j.util.doc/html/reference/index.html b/plugins/org.eclipse.net4j.util.doc/html/reference/index.html
index 279a8d7..788b581 100644
--- a/plugins/org.eclipse.net4j.util.doc/html/reference/index.html
+++ b/plugins/org.eclipse.net4j.util.doc/html/reference/index.html
@@ -19,6 +19,7 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="Net4j Utilities Documentation">Net4j Utilities Documentation</a></div> -->
+
<h1>Reference</h1>
<p>
<table border="0">
diff --git a/plugins/org.eclipse.net4j.util.doc/html/reference/schema/index.html b/plugins/org.eclipse.net4j.util.doc/html/reference/schema/index.html
index aaf85e2..5b7112a 100644
--- a/plugins/org.eclipse.net4j.util.doc/html/reference/schema/index.html
+++ b/plugins/org.eclipse.net4j.util.doc/html/reference/schema/index.html
@@ -19,6 +19,7 @@
<BODY BGCOLOR="white" onload="windowTitle();">
<!-- <div class="help_breadcrumbs"><a href="../../Overview.html" title="Net4j Utilities Documentation">Net4j Utilities Documentation</a> > <a href="../index.html" title="Category in Net4j Utilities Documentation">Reference</a></div> -->
+
<h1>Extension Point Reference</h1>
<p>
<table border="0">
