#10 create combined JavaDoc.
diff --git a/org.jacoco.build/buildbundle.xml b/org.jacoco.build/buildbundle.xml
index d2c96af..b32eafa 100644
--- a/org.jacoco.build/buildbundle.xml
+++ b/org.jacoco.build/buildbundle.xml
@@ -93,21 +93,15 @@
DOC
=================================================================== -->
- <target name="runcustomdoc" if="do.customdoc" depends="manifest">
+ <target name="doc" if="do.customdoc" depends="manifest">
<antcall target="customdoc" inheritall="true" inheritrefs="true"/>
- </target>
-
- <target name="doc" if="do.doc" depends="compile,runcustomdoc,manifest">
- <mkdir dir="${result.dist.doc.bundle.dir}"/>
- <javadoc destdir="${result.dist.doc.bundle.dir}"
- overview="${source.bundle.java.dir}/overview.html"
- windowtitle="${manifest.Bundle-SymbolicName} ${qualified.bundle.version}">
- <sourcepath location="${source.bundle.java.dir}"/>
- <classpath refid="dependencies"/>
- </javadoc>
- </target>
-
+ </target>
+
+ <!-- ===================================================================
+ ALL
+ =================================================================== -->
+
<target name="all" depends="compile,package,verify,doc"/>
</project>
\ No newline at end of file
diff --git a/org.jacoco.core/buildhook.xml b/org.jacoco.core/buildhook.xml
index 0cbbe07..71999fc 100644
--- a/org.jacoco.core/buildhook.xml
+++ b/org.jacoco.core/buildhook.xml
@@ -8,6 +8,5 @@
<property name="do.compile" value="true"/>
<property name="do.package" value="true"/>
- <property name="do.doc" value="true"/>
</project>
\ No newline at end of file
diff --git a/org.jacoco.core/src/overview.html b/org.jacoco.core/src/overview.html
deleted file mode 100644
index 939bdf2..0000000
--- a/org.jacoco.core/src/overview.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-<body>
-
-<p>
- The JaCoCo core bundle implements the code coverage technology itself. It
- provides APIs and implementation for
-</p>
-
-<ul>
- <li>class file analysis and instrumentation</li>
- <li>collecting execution data at runtime and</li>
- <li>calculating and storing coverage data.</li>
-</ul>
-
-<pre>
-
- | Class files | Runtime | Output | Coverage Report
-
-
- Analysis ----------------------------- IStructureVisitor \
- +--- Coverage Data
- Instrumentation --- ExecutionData ---- IExecutionVisitor /
-
-
-</pre>
-
-
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.jacoco.doc/buildhook.xml b/org.jacoco.doc/buildhook.xml
index a654ec3..681704b 100644
--- a/org.jacoco.doc/buildhook.xml
+++ b/org.jacoco.doc/buildhook.xml
@@ -16,12 +16,30 @@
</target>
<target name="customdoc">
+
+ <javadoc destdir="${result.dist.dir}/doc/api"
+ windowtitle="JaCoCo ${qualified.bundle.version}"
+ overview="${source.bundle.dir}/javadoc/overview.html">
+ <sourcefiles>
+ <fileset dir="${source.bundle.dir}/../org.jacoco.core/src" includes="**/*.java"/>
+ <fileset dir="${source.bundle.dir}/../org.jacoco.report/src" includes="**/*.java"/>
+ </sourcefiles>
+ <classpath>
+ <path refid="bundle-org.objectweb.asm"/>
+ </classpath>
+ <group title="Bundle org.jacoco.core" packages="org.jacoco.core*"/>
+ <group title="Bundle org.jacoco.report" packages="org.jacoco.report*"/>
+ <link href="http://java.sun.com/j2se/1.5.0/docs/api" offline="true" packagelistloc="${source.bundle.dir}/javadoc/java"/>
+ <link href="http://asm.ow2.org/asm31/javadoc/user" offline="true" packagelistloc="${source.bundle.dir}/javadoc/asm"/>
+ </javadoc>
+
<copy todir="${result.dist.dir}">
<fileset dir="${source.bundle.dir}/docroot" includes="**/*"/>
<filterset>
<filter token="VERSION" value="${qualified.bundle.version}"/>
</filterset>
</copy>
+
</target>
</project>
\ No newline at end of file
diff --git a/org.jacoco.doc/docroot/doc/index.html b/org.jacoco.doc/docroot/doc/index.html
index bcb01c0..f663ec0 100644
--- a/org.jacoco.doc/docroot/doc/index.html
+++ b/org.jacoco.doc/docroot/doc/index.html
@@ -14,12 +14,7 @@
<ul>
<li><a href="implementation.html">Implementation Design</a></li>
- <li>API Documentation
- <ul>
- <li><a href="org.jacoco.core/index.html"><code>org.jacoco.core</code></a></li>
- <li><a href="org.jacoco.report/index.html"><code>org.jacoco.report</code></a></li>
- </ul>
- </li>
+ <li><a href="api/index.html">API Documentation (JavaDoc)</a></li>
<li><a href="license.html">License</a></li>
</ul>
diff --git a/org.jacoco.doc/javadoc/asm/package-list b/org.jacoco.doc/javadoc/asm/package-list
new file mode 100644
index 0000000..af48707
--- /dev/null
+++ b/org.jacoco.doc/javadoc/asm/package-list
@@ -0,0 +1,7 @@
+org.objectweb.asm
+org.objectweb.asm.commons
+org.objectweb.asm.signature
+org.objectweb.asm.tree
+org.objectweb.asm.tree.analysis
+org.objectweb.asm.util
+org.objectweb.asm.xml
diff --git a/org.jacoco.doc/javadoc/java/package-list b/org.jacoco.doc/javadoc/java/package-list
new file mode 100644
index 0000000..4878336
--- /dev/null
+++ b/org.jacoco.doc/javadoc/java/package-list
@@ -0,0 +1,166 @@
+java.applet
+java.awt
+java.awt.color
+java.awt.datatransfer
+java.awt.dnd
+java.awt.event
+java.awt.font
+java.awt.geom
+java.awt.im
+java.awt.im.spi
+java.awt.image
+java.awt.image.renderable
+java.awt.print
+java.beans
+java.beans.beancontext
+java.io
+java.lang
+java.lang.annotation
+java.lang.instrument
+java.lang.management
+java.lang.ref
+java.lang.reflect
+java.math
+java.net
+java.nio
+java.nio.channels
+java.nio.channels.spi
+java.nio.charset
+java.nio.charset.spi
+java.rmi
+java.rmi.activation
+java.rmi.dgc
+java.rmi.registry
+java.rmi.server
+java.security
+java.security.acl
+java.security.cert
+java.security.interfaces
+java.security.spec
+java.sql
+java.text
+java.util
+java.util.concurrent
+java.util.concurrent.atomic
+java.util.concurrent.locks
+java.util.jar
+java.util.logging
+java.util.prefs
+java.util.regex
+java.util.zip
+javax.accessibility
+javax.activity
+javax.crypto
+javax.crypto.interfaces
+javax.crypto.spec
+javax.imageio
+javax.imageio.event
+javax.imageio.metadata
+javax.imageio.plugins.bmp
+javax.imageio.plugins.jpeg
+javax.imageio.spi
+javax.imageio.stream
+javax.management
+javax.management.loading
+javax.management.modelmbean
+javax.management.monitor
+javax.management.openmbean
+javax.management.relation
+javax.management.remote
+javax.management.remote.rmi
+javax.management.timer
+javax.naming
+javax.naming.directory
+javax.naming.event
+javax.naming.ldap
+javax.naming.spi
+javax.net
+javax.net.ssl
+javax.print
+javax.print.attribute
+javax.print.attribute.standard
+javax.print.event
+javax.rmi
+javax.rmi.CORBA
+javax.rmi.ssl
+javax.security.auth
+javax.security.auth.callback
+javax.security.auth.kerberos
+javax.security.auth.login
+javax.security.auth.spi
+javax.security.auth.x500
+javax.security.cert
+javax.security.sasl
+javax.sound.midi
+javax.sound.midi.spi
+javax.sound.sampled
+javax.sound.sampled.spi
+javax.sql
+javax.sql.rowset
+javax.sql.rowset.serial
+javax.sql.rowset.spi
+javax.swing
+javax.swing.border
+javax.swing.colorchooser
+javax.swing.event
+javax.swing.filechooser
+javax.swing.plaf
+javax.swing.plaf.basic
+javax.swing.plaf.metal
+javax.swing.plaf.multi
+javax.swing.plaf.synth
+javax.swing.table
+javax.swing.text
+javax.swing.text.html
+javax.swing.text.html.parser
+javax.swing.text.rtf
+javax.swing.tree
+javax.swing.undo
+javax.transaction
+javax.transaction.xa
+javax.xml
+javax.xml.datatype
+javax.xml.namespace
+javax.xml.parsers
+javax.xml.transform
+javax.xml.transform.dom
+javax.xml.transform.sax
+javax.xml.transform.stream
+javax.xml.validation
+javax.xml.xpath
+org.ietf.jgss
+org.omg.CORBA
+org.omg.CORBA.DynAnyPackage
+org.omg.CORBA.ORBPackage
+org.omg.CORBA.TypeCodePackage
+org.omg.CORBA.portable
+org.omg.CORBA_2_3
+org.omg.CORBA_2_3.portable
+org.omg.CosNaming
+org.omg.CosNaming.NamingContextExtPackage
+org.omg.CosNaming.NamingContextPackage
+org.omg.Dynamic
+org.omg.DynamicAny
+org.omg.DynamicAny.DynAnyFactoryPackage
+org.omg.DynamicAny.DynAnyPackage
+org.omg.IOP
+org.omg.IOP.CodecFactoryPackage
+org.omg.IOP.CodecPackage
+org.omg.Messaging
+org.omg.PortableInterceptor
+org.omg.PortableInterceptor.ORBInitInfoPackage
+org.omg.PortableServer
+org.omg.PortableServer.CurrentPackage
+org.omg.PortableServer.POAManagerPackage
+org.omg.PortableServer.POAPackage
+org.omg.PortableServer.ServantLocatorPackage
+org.omg.PortableServer.portable
+org.omg.SendingContext
+org.omg.stub.java.rmi
+org.w3c.dom
+org.w3c.dom.bootstrap
+org.w3c.dom.events
+org.w3c.dom.ls
+org.xml.sax
+org.xml.sax.ext
+org.xml.sax.helpers
diff --git a/org.jacoco.doc/javadoc/overview.html b/org.jacoco.doc/javadoc/overview.html
new file mode 100644
index 0000000..190cd9a
--- /dev/null
+++ b/org.jacoco.doc/javadoc/overview.html
@@ -0,0 +1,41 @@
+<html>
+<body>
+
+<p>
+ This is the public JaCoCo API that can be used for tool integration. JaCoCo is
+ packed as several bundles. While the bundles formally fulfill the OSGi
+ specification, there is no dependency on OSGi. They can also be used as
+ regular JARs in your classpath.
+</p>
+
+<h2>org.jacoco.core</h2>
+
+</p>
+ The core bundle implements the code coverage technology itself. It
+ provides APIs and implementation for
+</p>
+
+<ul>
+ <li>class file analysis and instrumentation</li>
+ <li>collecting execution data at runtime and</li>
+ <li>calculating and storing coverage data.</li>
+</ul>
+
+<pre>
+ | Class files | Runtime | Output | Coverage Report
+
+
+ Analysis ----------------------------- IStructureVisitor \
+ +--- Coverage Data
+ Instrumentation --- ExecutionData ---- IExecutionVisitor /
+</pre>
+
+<h2>org.jacoco.report</h2>
+
+<p>
+ APIs and implementation to create coverage reports in several formats.
+</p>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/org.jacoco.report/buildhook.xml b/org.jacoco.report/buildhook.xml
index f3173b9..deef6ee 100644
--- a/org.jacoco.report/buildhook.xml
+++ b/org.jacoco.report/buildhook.xml
@@ -13,6 +13,5 @@
<property name="do.compile" value="true"/>
<property name="do.package" value="true"/>
- <property name="do.doc" value="true"/>
</project>
diff --git a/org.jacoco.report/src/overview.html b/org.jacoco.report/src/overview.html
deleted file mode 100644
index ce433df..0000000
--- a/org.jacoco.report/src/overview.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-
-<p>
- TODO
-</p>
-
-</body>
-</html>
\ No newline at end of file