Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/build.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/html/online/Homepage.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/html/online/Wiki.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/html/reference/schema/Schemadoc.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/toc.xmi (renamed from plugins/org.eclipse.emf.cdo.doc/javadoc/toc.xmi)66
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java12
-rw-r--r--plugins/org.eclipse.net4j.db.doc/build.xml16
-rw-r--r--plugins/org.eclipse.net4j.db.doc/javadoc/toc.xmi24
-rw-r--r--plugins/org.eclipse.net4j.db.doc/toc.xmi25
-rw-r--r--plugins/org.eclipse.net4j.doc/build.xml16
-rw-r--r--plugins/org.eclipse.net4j.doc/toc.xmi (renamed from plugins/org.eclipse.net4j.doc/javadoc/toc.xmi)28
-rw-r--r--plugins/org.eclipse.net4j.util.doc/build.xml16
-rw-r--r--plugins/org.eclipse.net4j.util.doc/toc.xmi (renamed from plugins/org.eclipse.net4j.util.doc/javadoc/toc.xmi)10
13 files changed, 159 insertions, 94 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/build.xml b/plugins/org.eclipse.emf.cdo.doc/build.xml
index 0bfbc6c4ec..3c847a7df1 100644
--- a/plugins/org.eclipse.emf.cdo.doc/build.xml
+++ b/plugins/org.eclipse.emf.cdo.doc/build.xml
@@ -15,6 +15,7 @@
<property file="${project.path}/build.properties" />
<property name="javadoc.name" value="${pluginName}" />
<property name="javadoc.destdir" value="${project.path}/javadoc" />
+ <property name="schemadoc.destdir" value="${project.path}/schemadoc" />
<property name="article.destdir" value="${project.path}/html" />
<property name="article.sources" value="${project.path}/src" />
<property name="supplemental" value="/develop/bin/org.eclipse.emf.cdo.releng.doc.supplemental" />
@@ -226,15 +227,9 @@
<link href="${jdk.link}" />
<link href="${platform.link}" />
<link href="${emf.link}" />
- <link href="MAKE-RELATIVE/org.eclipse.net4j.db.doc/javadoc"
- offline="true"
- packagelistloc="plugins/org.eclipse.net4j.db.doc/javadoc" />
- <link href="MAKE-RELATIVE/org.eclipse.net4j.doc/javadoc"
- offline="true"
- packagelistloc="plugins/org.eclipse.net4j.doc/javadoc" />
- <link href="MAKE-RELATIVE/org.eclipse.net4j.util.doc/javadoc"
- offline="true"
- packagelistloc="plugins/org.eclipse.net4j.util.doc/javadoc" />
+ <link href="MAKE-RELATIVE/org.eclipse.net4j.db.doc/javadoc" offline="true" packagelistloc="plugins/org.eclipse.net4j.db.doc/javadoc" />
+ <link href="MAKE-RELATIVE/org.eclipse.net4j.doc/javadoc" offline="true" packagelistloc="plugins/org.eclipse.net4j.doc/javadoc" />
+ <link href="MAKE-RELATIVE/org.eclipse.net4j.util.doc/javadoc" offline="true" packagelistloc="plugins/org.eclipse.net4j.util.doc/javadoc" />
<tag name="ADDED" description="Added" />
<tag name="Singleton" description="Singleton" />
@@ -283,6 +278,20 @@
</java>
</target>
+ <target name="build.schema" unless="schema.skip">
+ <mkdir dir="${schemadoc.destdir}" />
+ <pde.convertSchemaToHTML manifest="plugins/org.eclipse.emf.cdo/plugin.xml" destination="${schemadoc.destdir}" />
+ <pde.convertSchemaToHTML manifest="plugins/org.eclipse.emf.cdo.server/plugin.xml" destination="${schemadoc.destdir}" />
+ <pde.convertSchemaToHTML manifest="plugins/org.eclipse.emf.cdo.server.db/plugin.xml" destination="${schemadoc.destdir}" />
+ <pde.convertSchemaToHTML manifest="plugins/org.eclipse.emf.cdo.server.hibernate/plugin.xml" destination="${schemadoc.destdir}" />
+
+ <replaceregexp match="\.\./\.\./(.*?)\.css" replace="\1.css" byline="true">
+ <fileset dir="${schemadoc.destdir}">
+ <include name="*.html" />
+ </fileset>
+ </replaceregexp>
+ </target>
+
<target name="build.article" unless="article.skip">
<tstamp>
<format property="start.time" pattern="y-M-D-H-m-s-S" />
@@ -329,8 +338,8 @@
</javadoc>
</target>
- <target name="build" depends="build.java,build.article" />
+ <target name="build" depends="build.java, build.schema, build.article" />
- <target name="build.clean" depends="clean,build" />
+ <target name="build.clean" depends="clean, build" />
</project>
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/online/Homepage.html b/plugins/org.eclipse.emf.cdo.doc/html/online/Homepage.html
new file mode 100644
index 0000000000..5dbe513df9
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/html/online/Homepage.html
@@ -0,0 +1,3 @@
+<h1>Homepage</h1>
+<a name="Homepage.html"/>
+
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/online/Wiki.html b/plugins/org.eclipse.emf.cdo.doc/html/online/Wiki.html
new file mode 100644
index 0000000000..2327e1a175
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/html/online/Wiki.html
@@ -0,0 +1,3 @@
+<h1>Wiki</h1>
+<a name="Wiki.html"/>
+
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/Schemadoc.html b/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/Schemadoc.html
new file mode 100644
index 0000000000..8aafc049b7
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/Schemadoc.html
@@ -0,0 +1,3 @@
+<h1>Schemadoc</h1>
+<a name="Schemadoc.html"/>
+
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/toc.xmi b/plugins/org.eclipse.emf.cdo.doc/toc.xmi
index 23b4666d31..54b89f4cc3 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/toc.xmi
+++ b/plugins/org.eclipse.emf.cdo.doc/toc.xmi
@@ -1,6 +1,6 @@
<?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">
+ <article:Plugin name="org.eclipse.emf.cdo" label="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"/>
@@ -15,26 +15,27 @@
<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">
+ <extensionPoints name="viewProviders"/>
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.emf.cdo.edit" label="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">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.emf.cdo.location" label="CDO Model Repository Client Location">
<packages name="org.eclipse.emf.cdo.location"/>
- </article:JavadocGroup>
- <article:JavadocGroup name="CDO Model Repository Client Net4j Support">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.emf.cdo.net4j" label="CDO Model Repository Client Net4j Support">
<packages name="org.eclipse.emf.cdo.net4j"/>
- </article:JavadocGroup>
- <article:JavadocGroup name="CDO Model Repository Client UI">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.emf.cdo.ui" label="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">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.emf.cdo.ui.ide" label="CDO Model Repository Client UI IDE">
<packages name="org.eclipse.emf.cdo.ui.ide"/>
- </article:JavadocGroup>
- <article:JavadocGroup name="CDO Model Repository Common">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.emf.cdo.common" label="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"/>
@@ -54,33 +55,38 @@
<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">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.emf.cdo.server" label="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">
+ <extensionPoints name="appExtensions"/>
+ <extensionPoints name="repositoryFactories"/>
+ <extensionPoints name="storeFactories"/>
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.emf.cdo.server.db" label="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">
+ <extensionPoints name="mappingStrategies"/>
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.emf.cdo.server.db4o" label="CDO Model Repository Server DB4O">
<packages name="org.eclipse.emf.cdo.server.db4o"/>
- </article:JavadocGroup>
- <article:JavadocGroup name="CDO Model Repository Server Hibernate">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.emf.cdo.server.hibernate" label="CDO Model Repository Server Hibernate">
<packages name="org.eclipse.emf.cdo.server.hibernate"/>
- </article:JavadocGroup>
- <article:JavadocGroup name="CDO Model Repository Server MongoDB">
+ <extensionPoints name="mappingProviderFactories"/>
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.emf.cdo.server.mongodb" label="CDO Model Repository Server MongoDB">
<packages name="org.eclipse.emf.cdo.server.mongodb"/>
- </article:JavadocGroup>
- <article:JavadocGroup name="CDO Model Repository Server Net4j Support">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.emf.cdo.server.net4j" label="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">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.emf.cdo.server.ocl" label="CDO Model Repository Server OCL Support">
<packages name="org.eclipse.emf.cdo.server.ocl"/>
- </article:JavadocGroup>
- <article:JavadocGroup name="CDO Model Repository Server Objectivity">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.emf.cdo.server.objectivity" label="CDO Model Repository Server Objectivity">
<packages name="org.eclipse.emf.cdo.server.objectivity"/>
- </article:JavadocGroup>
+ </article:Plugin>
</xmi:XMI>
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 0f54e7eb6e..9b0ded9116 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
@@ -954,13 +954,15 @@ public class AssembleScripts
Map<String, Object> map = resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap();
map.put("xmi", new XMIResourceFactoryImpl());
- File javadoc = new File(project, "javadoc");
- javadoc.mkdirs();
+ File target = new File(project, "toc.xmi");
+ URI uri = URI.createFileURI(target.getCanonicalPath());
- File target = new File(javadoc, "toc.xmi");
+ if (create)
+ {
+ return resourceSet.createResource(uri);
+ }
- URI uri = URI.createFileURI(target.getCanonicalPath());
- return create ? resourceSet.createResource(uri) : resourceSet.getResource(uri, true);
+ return resourceSet.getResource(uri, true);
}
}
}
diff --git a/plugins/org.eclipse.net4j.db.doc/build.xml b/plugins/org.eclipse.net4j.db.doc/build.xml
index e145a392f0..bdaf7fc067 100644
--- a/plugins/org.eclipse.net4j.db.doc/build.xml
+++ b/plugins/org.eclipse.net4j.db.doc/build.xml
@@ -15,6 +15,7 @@
<property file="${project.path}/build.properties" />
<property name="javadoc.name" value="${pluginName}" />
<property name="javadoc.destdir" value="${project.path}/javadoc" />
+ <property name="schemadoc.destdir" value="${project.path}/schemadoc" />
<property name="article.destdir" value="${project.path}/html" />
<property name="article.sources" value="${project.path}/src" />
<property name="supplemental" value="/develop/bin/org.eclipse.emf.cdo.releng.doc.supplemental" />
@@ -170,6 +171,17 @@
</java>
</target>
+ <target name="build.schema" unless="schema.skip">
+ <mkdir dir="${schemadoc.destdir}" />
+ <pde.convertSchemaToHTML manifest="plugins/org.eclipse.net4j.db/plugin.xml" destination="${schemadoc.destdir}" />
+
+ <replaceregexp match="\.\./\.\./(.*?)\.css" replace="\1.css" byline="true">
+ <fileset dir="${schemadoc.destdir}">
+ <include name="*.html" />
+ </fileset>
+ </replaceregexp>
+ </target>
+
<target name="build.article" unless="article.skip">
<tstamp>
<format property="start.time" pattern="y-M-D-H-m-s-S" />
@@ -212,8 +224,8 @@
</javadoc>
</target>
- <target name="build" depends="build.java,build.article" />
+ <target name="build" depends="build.java, build.schema, build.article" />
- <target name="build.clean" depends="clean,build" />
+ <target name="build.clean" depends="clean, build" />
</project>
diff --git a/plugins/org.eclipse.net4j.db.doc/javadoc/toc.xmi b/plugins/org.eclipse.net4j.db.doc/javadoc/toc.xmi
deleted file mode 100644
index c55d0a3bc5..0000000000
--- a/plugins/org.eclipse.net4j.db.doc/javadoc/toc.xmi
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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.db.doc/toc.xmi b/plugins/org.eclipse.net4j.db.doc/toc.xmi
new file mode 100644
index 0000000000..d71af84abd
--- /dev/null
+++ b/plugins/org.eclipse.net4j.db.doc/toc.xmi
@@ -0,0 +1,25 @@
+<?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:Plugin name="org.eclipse.net4j.db" label="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"/>
+ <extensionPoints name="dbAdapters"/>
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.net4j.db.derby" label="Net4j DB Framework Derby Adapter">
+ <packages name="org.eclipse.net4j.db.derby"/>
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.net4j.db.h2" label="Net4j DB Framework H2 Adapter">
+ <packages name="org.eclipse.net4j.db.h2"/>
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.net4j.db.hsqldb" label="Net4j DB Framework HSQLDB Adapter">
+ <packages name="org.eclipse.net4j.db.hsqldb"/>
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.net4j.db.mysql" label="Net4j DB Framework MYSQL Adapter">
+ <packages name="org.eclipse.net4j.db.mysql"/>
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.net4j.db.postgresql" label="Net4j DB Framework PostgreSQL Adapter">
+ <packages name="org.eclipse.net4j.db.postgresql"/>
+ </article:Plugin>
+</xmi:XMI>
diff --git a/plugins/org.eclipse.net4j.doc/build.xml b/plugins/org.eclipse.net4j.doc/build.xml
index c6c803e5df..19234d6fc3 100644
--- a/plugins/org.eclipse.net4j.doc/build.xml
+++ b/plugins/org.eclipse.net4j.doc/build.xml
@@ -15,9 +15,11 @@
<property file="${project.path}/build.properties" />
<property name="javadoc.name" value="${pluginName}" />
<property name="javadoc.destdir" value="${project.path}/javadoc" />
+ <property name="schemadoc.destdir" value="${project.path}/schemadoc" />
<property name="article.destdir" value="${project.path}/html" />
<property name="article.sources" value="${project.path}/src" />
<property name="supplemental" value="/develop/bin/org.eclipse.emf.cdo.releng.doc.supplemental" />
+ <property name="schema.skip" value="true" />
<property name="article.skip" value="true" />
<path id="javadoc.classpath">
@@ -198,6 +200,16 @@
</java>
</target>
+ <target name="build.schema" unless="schema.skip">
+ <mkdir dir="${schemadoc.destdir}" />
+
+ <replaceregexp match="\.\./\.\./(.*?)\.css" replace="\1.css" byline="true">
+ <fileset dir="${schemadoc.destdir}">
+ <include name="*.html" />
+ </fileset>
+ </replaceregexp>
+ </target>
+
<target name="build.article" unless="article.skip">
<tstamp>
<format property="start.time" pattern="y-M-D-H-m-s-S" />
@@ -240,8 +252,8 @@
</javadoc>
</target>
- <target name="build" depends="build.java,build.article" />
+ <target name="build" depends="build.java, build.schema, build.article" />
- <target name="build.clean" depends="clean,build" />
+ <target name="build.clean" depends="clean, build" />
</project>
diff --git a/plugins/org.eclipse.net4j.doc/javadoc/toc.xmi b/plugins/org.eclipse.net4j.doc/toc.xmi
index 856a328356..0dee74af4a 100644
--- a/plugins/org.eclipse.net4j.doc/javadoc/toc.xmi
+++ b/plugins/org.eclipse.net4j.doc/toc.xmi
@@ -1,6 +1,6 @@
<?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">
+ <article:Plugin name="org.eclipse.net4j" label="Net4j Signalling Platform Transport">
<packages name="org.eclipse.net4j"/>
<packages name="org.eclipse.net4j.acceptor"/>
<packages name="org.eclipse.net4j.buffer"/>
@@ -11,24 +11,24 @@
<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">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.net4j.http" label="Net4j Signalling Platform Transport HTTP">
<packages name="org.eclipse.net4j.http"/>
- </article:JavadocGroup>
- <article:JavadocGroup name="Net4j Signalling Platform Transport HTTP Common">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.net4j.http.common" label="Net4j Signalling Platform Transport HTTP Common">
<packages name="org.eclipse.net4j.http.common"/>
- </article:JavadocGroup>
- <article:JavadocGroup name="Net4j Signalling Platform Transport HTTP Server">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.net4j.http.server" label="Net4j Signalling Platform Transport HTTP Server">
<packages name="org.eclipse.net4j.http.server"/>
- </article:JavadocGroup>
- <article:JavadocGroup name="Net4j Signalling Platform Transport JVM">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.net4j.jvm" label="Net4j Signalling Platform Transport JVM">
<packages name="org.eclipse.net4j.jvm"/>
- </article:JavadocGroup>
- <article:JavadocGroup name="Net4j Signalling Platform Transport TCP">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.net4j.tcp" label="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">
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.net4j.ui" label="Net4j Signalling Platform UI">
<packages name="org.eclipse.net4j.ui"/>
- </article:JavadocGroup>
+ </article:Plugin>
</xmi:XMI>
diff --git a/plugins/org.eclipse.net4j.util.doc/build.xml b/plugins/org.eclipse.net4j.util.doc/build.xml
index 1a9a1b57e4..ab8a789a74 100644
--- a/plugins/org.eclipse.net4j.util.doc/build.xml
+++ b/plugins/org.eclipse.net4j.util.doc/build.xml
@@ -15,6 +15,7 @@
<property file="${project.path}/build.properties" />
<property name="javadoc.name" value="${pluginName}" />
<property name="javadoc.destdir" value="${project.path}/javadoc" />
+ <property name="schemadoc.destdir" value="${project.path}/schemadoc" />
<property name="article.destdir" value="${project.path}/html" />
<property name="article.sources" value="${project.path}/src" />
<property name="supplemental" value="/develop/bin/org.eclipse.emf.cdo.releng.doc.supplemental" />
@@ -204,6 +205,17 @@
</java>
</target>
+ <target name="build.schema" unless="schema.skip">
+ <mkdir dir="${schemadoc.destdir}" />
+ <pde.convertSchemaToHTML manifest="plugins/org.eclipse.net4j.util/plugin.xml" destination="${schemadoc.destdir}" />
+
+ <replaceregexp match="\.\./\.\./(.*?)\.css" replace="\1.css" byline="true">
+ <fileset dir="${schemadoc.destdir}">
+ <include name="*.html" />
+ </fileset>
+ </replaceregexp>
+ </target>
+
<target name="build.article" unless="article.skip">
<tstamp>
<format property="start.time" pattern="y-M-D-H-m-s-S" />
@@ -245,8 +257,8 @@
</javadoc>
</target>
- <target name="build" depends="build.java,build.article" />
+ <target name="build" depends="build.java, build.schema, build.article" />
- <target name="build.clean" depends="clean,build" />
+ <target name="build.clean" depends="clean, build" />
</project>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/toc.xmi b/plugins/org.eclipse.net4j.util.doc/toc.xmi
index 87cb214970..9be2f98b0e 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/toc.xmi
+++ b/plugins/org.eclipse.net4j.util.doc/toc.xmi
@@ -1,6 +1,6 @@
<?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">
+ <article:Plugin name="org.eclipse.net4j.util" label="Net4j Utilities">
<packages name="org.eclipse.net4j.util"/>
<packages name="org.eclipse.net4j.util.cache"/>
<packages name="org.eclipse.net4j.util.collection"/>
@@ -23,8 +23,10 @@
<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">
+ <extensionPoints name="elementProcessors"/>
+ <extensionPoints name="factories"/>
+ </article:Plugin>
+ <article:Plugin name="org.eclipse.net4j.util.ui" label="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"/>
@@ -34,5 +36,5 @@
<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>
+ </article:Plugin>
</xmi:XMI>

Back to the top