Documentation update for Maven integration and new MBean output mode.
diff --git a/org.jacoco.doc/docroot/doc/agent.html b/org.jacoco.doc/docroot/doc/agent.html
index fad164b..7890fb5 100644
--- a/org.jacoco.doc/docroot/doc/agent.html
+++ b/org.jacoco.doc/docroot/doc/agent.html
@@ -139,6 +139,8 @@
<li><code>tcpclient</code>: At startup the agent connects to the TCP
port specified by the <code>address</code> and <code>port</code>
attribute. Execution data is written to this TCP connection.</li>
+ <li><code>mbean</code>: The agent registers an JMX MBean under the
+ name <code>org.jacoco:type=Runtime</code>.</li>
</ul>
Please see the security considerations below.
</td>
diff --git a/org.jacoco.doc/docroot/doc/ant.html b/org.jacoco.doc/docroot/doc/ant.html
index 068477f..ce40488 100644
--- a/org.jacoco.doc/docroot/doc/ant.html
+++ b/org.jacoco.doc/docroot/doc/ant.html
@@ -222,6 +222,8 @@
<li><code>tcpclient</code>: At startup the agent connects to the TCP
port specified by the <code>address</code> and <code>port</code>
attribute. Execution data is written to this TCP connection.</li>
+ <li><code>mbean</code>: The agent registers an JMX MBean under the
+ name <code>org.jacoco:type=Runtime</code>.</li>
</ul>
</td>
<td><code>file</code></td>
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index 7c54e7c..de498d6 100644
--- a/org.jacoco.doc/docroot/doc/changes.html
+++ b/org.jacoco.doc/docroot/doc/changes.html
@@ -22,6 +22,8 @@
<h3>Fixed Bugs</h3>
<ul>
+ <li>New Maven plug-in for JaCoCo agent setup and basic reporting (Trac #25).</li>
+ <li>Additional output mode implementation for JaCoCo agent based on JMX.</li>
<li>Fixed problem with reporting of nested group structures (Trac #157).</li>
</ul>
diff --git a/org.jacoco.doc/docroot/doc/maven.html b/org.jacoco.doc/docroot/doc/maven.html
index d5eff26..d5d1658 100644
--- a/org.jacoco.doc/docroot/doc/maven.html
+++ b/org.jacoco.doc/docroot/doc/maven.html
@@ -63,12 +63,12 @@
This goal prepares a property pointing to the
<a href="agent.html">JaCoCo runtime agent</a> that can be passed as a VM
argument to the application under test. Depending on the project packaging
- type a property with the following name is set:
+ type by default a property with the following name is set:
</p>
<ul>
- <li><code>tycho.testArgLine</code> for the <code>maven-osgi-test-plugin</code></li>
- <li><code>argLine</code> for the <code>maven-surefire-plugin</code></li>
+ <li><code>tycho.testArgLine</code> for packaging type <code>maven-osgi-test-plugin</code> and</li>
+ <li><code>argLine</code> otherwise.</li>
</ul>
<p>
@@ -77,7 +77,7 @@
</p>
<p>
- The goal has the following parameters that will be passed to the agent:
+ The goal has the following parameters which control the agent setup:
</p>
<table class="coverage">
@@ -90,6 +90,12 @@
</thead>
<tbody>
<tr>
+ <td><code>propertyName</code></td>
+ <td>Name of the project property to set.</td>
+ <td><code>tycho.testArgLine</code> for packaging type
+ <code>maven-osgi-test-plugin</code>, <code>argLine</code> otherwise</td>
+ </tr>
+ <tr>
<td><code>destfile</code></td>
<td>Path to the output file for execution data.</td>
<td><code>${project.build.directory}/jacoco.exec</code></td>
@@ -161,6 +167,8 @@
<li><code>tcpclient</code>: At startup the agent connects to the TCP
port specified by the <code>address</code> and <code>port</code>
attribute. Execution data is written to this TCP connection.</li>
+ <li><code>mbean</code>: The agent registers an JMX MBean under the
+ name <code>org.jacoco:type=Runtime</code>.</li>
</ul>
</td>
<td><code>file</code></td>
@@ -213,7 +221,7 @@
<tr>
<td><code>outputEncoding</code></td>
<td>Encoding of the generated reports..</td>
- <td><code>${project.reporting.outputEncoding}, otherwise UTF-8</td>
+ <td><code>${project.reporting.outputEncoding}</code>, otherwise UTF-8</td>
</tr>
<tr>
<td><code>sourceEncoding</code></td>
diff --git a/org.jacoco.doc/docroot/doc/repo.html b/org.jacoco.doc/docroot/doc/repo.html
index 6e4ce8f..81fc8db 100644
--- a/org.jacoco.doc/docroot/doc/repo.html
+++ b/org.jacoco.doc/docroot/doc/repo.html
@@ -36,11 +36,11 @@
<tbody>
<tr>
<td>Releases</td>
- <td><i>TODO</i></td>
+ <td><code>http://repo1.maven.org/maven2/</code> (Central Repository)</td>
</tr>
<tr>
<td>Snapshots</td>
- <td><i>TODO</i></td>
+ <td><code>https://oss.sonatype.org/content/repositories/snapshots</code></td>
</tr>
</tbody>
</table>
@@ -70,6 +70,11 @@
</tr>
<tr>
<td><code>org.jacoco</code></td>
+ <td><code>org.jacoco.ant</code></td>
+ <td>Ant Tasks</td>
+ </tr>
+ <tr>
+ <td><code>org.jacoco</code></td>
<td><code>org.jacoco.core</code></td>
<td>Core APIs and implementations</td>
</tr>
@@ -78,11 +83,6 @@
<td><code>org.jacoco.report</code></td>
<td>Reporting implementation</td>
</tr>
- <tr>
- <td><code>org.jacoco</code></td>
- <td><code>org.jacoco.ant</code></td>
- <td>Ant Tasks</td>
- </tr>
</tbody>
</table>