You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2009/08/05 13:58:53 UTC

svn commit: r801148 - in /maven/plugins/trunk/maven-javadoc-plugin/src/site/apt: ./ examples/

Author: vsiveton
Date: Wed Aug  5 11:58:52 2009
New Revision: 801148

URL: http://svn.apache.org/viewvc?rev=801148&view=rev
Log:
o filtering version in doc

Added:
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-javadoc-tool.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-javadoc-tool.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/help-configuration.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/help-configuration.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-resources.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-resources.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/links-configuration.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/links-configuration.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/output-configuration.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/output-configuration.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/selective-javadocs-report.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/selective-javadocs-report.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/taglet-configuration.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/taglet-configuration.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/test-javadocs.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/test-javadocs.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt.vm
      - copied, changed from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt
Removed:
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-javadoc-tool.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/help-configuration.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-resources.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/links-configuration.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/output-configuration.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/selective-javadocs-report.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/taglet-configuration.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/test-javadocs.apt
    maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt.vm Wed Aug  5 11:58:52 2009
@@ -4,7 +4,7 @@
  Maria Odea Ching
  Vincent Siveton
  ------
- 2009-02-28
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -65,7 +65,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <configuration>
           ...
           <aggregate>true</aggregate>
@@ -95,7 +95,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <reportSets>
           <reportSet>
             <id>non-aggregate</id>

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt.vm Wed Aug  5 11:58:52 2009
@@ -4,7 +4,7 @@
  Vincent Siveton
  Maria Odea Ching
  ------
- 2009-02-28
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -43,7 +43,7 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.5</version>
+            <version>${project.version}</version>
             <configuration>
               <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
 
@@ -100,7 +100,7 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.5</version>
+            <version>${project.version}</version>
             <reportSets>
               <reportSet>
                 <id>html</id>
@@ -120,7 +120,7 @@
                     <version>1.2b2</version>
                   </docletArtifact>
                   <additionalparam>
-                    -d ${project.build.directory}/site/doccheck
+                    -d \${project.build.directory}/site/doccheck
                   </additionalparam>
 
                   <!-- Other dir than apidocs -->

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-javadoc-tool.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-javadoc-tool.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-javadoc-tool.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-javadoc-tool.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-javadoc-tool.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-javadoc-tool.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-javadoc-tool.apt.vm Wed Aug  5 11:58:52 2009
@@ -3,7 +3,7 @@
  ------
  Vincent Siveton
  ------
- 2007-05-01
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -43,7 +43,7 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.5</version>
+            <version>${project.version}</version>
             <configuration>
               <javadocExecutable>C:\jdk1.6.0\bin\javadoc.exe</javadocExecutable>
               ...
@@ -71,7 +71,7 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.5</version>
+            <version>${project.version}</version>
             <configuration>
               <javadocVersion>1.5</javadocVersion>
               ...

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt.vm Wed Aug  5 11:58:52 2009
@@ -3,7 +3,7 @@
  ------
  Maria Odea Ching
  ------
- 2006-06-01
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -40,7 +40,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <configuration>
           ...
           <excludePackageNames>*.internal:org.acme.exclude1.*:org.acme.exclude2</excludePackageNames>

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt.vm Wed Aug  5 11:58:52 2009
@@ -3,7 +3,7 @@
  ------
  Vincent Siveton
  ------
- 2009-07-05
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -117,7 +117,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <configuration>
             ...
         </configuration>

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt.vm Wed Aug  5 11:58:52 2009
@@ -4,7 +4,7 @@
  Vincent Siveton
  Maria Odea Ching
  ------
- 2008-07-31
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -39,7 +39,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <configuration>
           ...
           <groups>

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/help-configuration.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/help-configuration.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/help-configuration.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/help-configuration.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/help-configuration.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/help-configuration.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/help-configuration.apt.vm Wed Aug  5 11:58:52 2009
@@ -3,7 +3,7 @@
  ------
  Vincent Siveton
  ------
- 2009-07-16
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -40,6 +40,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${project.version}</version>
         <configuration>
           <helpfile>${basedir}/path/to/your/helpfile</helpfile>
           ...
@@ -63,6 +64,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${project.version}</version>
         <configuration>
           <helpfile>path/to/your/resource/help-doc.html</helpfile>
           ...
@@ -78,6 +80,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${project.version}</version>
         <configuration>
           <helpfile>path/to/your/resource/help-doc.html</helpfile>
           ...
@@ -101,6 +104,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${project.version}</version>
         <configuration>
           <helpfile>path/to/your/resource/help-doc.html</helpfile>
         </configuration>

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-resources.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-resources.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-resources.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-resources.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-resources.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-resources.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-resources.apt.vm Wed Aug  5 11:58:52 2009
@@ -3,7 +3,7 @@
  ------
  Vincent Siveton
  ------
- 2008-08-11
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -87,7 +87,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <configuration>
           ...
           <overview>${basedir}/overview.html</overview>

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/links-configuration.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/links-configuration.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/links-configuration.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/links-configuration.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/links-configuration.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/links-configuration.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/links-configuration.apt.vm Wed Aug  5 11:58:52 2009
@@ -3,7 +3,7 @@
  ------
  Vincent Siveton
  ------
- 2009-07-21
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -38,6 +38,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${project.version}</version>
         <configuration>
           <links>
             <link>http://commons.apache.org/dbcp/apidocs/</link>
@@ -96,7 +97,8 @@
  </javaApiLinks>
 +-----+
 
-  Refer to {{{../javadoc-mojo.html#links}links}} parameter for more information.
+~~ Using anchor links produces a Velocity error.
+  Refer to {{{../javadoc-mojo.html}links}} parameter for more information.
 
 Configuring <<<offlineLinks>>> Parameter
 

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/output-configuration.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/output-configuration.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/output-configuration.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/output-configuration.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/output-configuration.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/output-configuration.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/output-configuration.apt.vm Wed Aug  5 11:58:52 2009
@@ -3,7 +3,7 @@
  ------
  Vincent Siveton
  ------
- 2008-07-29
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -38,9 +38,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <configuration>
-          <reportOutputDirectory>${project.reporting.outputDirectory}/myoutput</reportOutputDirectory>
+          <reportOutputDirectory>\${project.reporting.outputDirectory}/myoutput</reportOutputDirectory>
           <destDir>myapidocs</destDir>
           ...
         </configuration>

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/selective-javadocs-report.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/selective-javadocs-report.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/selective-javadocs-report.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/selective-javadocs-report.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/selective-javadocs-report.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/selective-javadocs-report.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/selective-javadocs-report.apt.vm Wed Aug  5 11:58:52 2009
@@ -3,7 +3,7 @@
  ------
  Vincent Siveton
  ------
- 2007-05-01
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -40,7 +40,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <configuration>
           ...
         </configuration>

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt.vm Wed Aug  5 11:58:52 2009
@@ -4,7 +4,7 @@
  Maria Odea Ching
  Vincent Siveton
  ------
- 2009-07-16
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -42,7 +42,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <configuration>
           <stylesheet>maven</stylesheet>
           ...
@@ -69,6 +69,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${project.version}</version>
         <configuration>
           <stylesheetfile>${basedir}/path/to/your/stylesheetfile.css</stylesheetfile>
           ...
@@ -92,6 +93,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${project.version}</version>
         <configuration>
           <stylesheetfile>path/to/your/stylesheet.css</stylesheetfile>
           ...
@@ -107,6 +109,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${project.version}</version>
         <configuration>
           <stylesheetfile>path/to/your/stylesheet.css</stylesheetfile>
           ...
@@ -130,6 +133,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${project.version}</version>
         <configuration>
           <stylesheetfile>path/to/your/stylesheet.css</stylesheetfile>
         </configuration>

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt.vm Wed Aug  5 11:58:52 2009
@@ -4,7 +4,7 @@
  Vincent Siveton
  Maria Odea Ching
  ------
- 2008-07-31
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -39,7 +39,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <configuration>
           ...
           <tags>

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/taglet-configuration.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/taglet-configuration.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/taglet-configuration.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/taglet-configuration.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/taglet-configuration.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/taglet-configuration.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/taglet-configuration.apt.vm Wed Aug  5 11:58:52 2009
@@ -3,7 +3,7 @@
  ------
  Vincent Siveton
  ------
- 2008-07-26
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -46,7 +46,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <configuration>
           ...
           <taglet>package.to.YourTagletClass</taglet>
@@ -78,7 +78,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <configuration>
           ...
           <taglets>
@@ -124,7 +124,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <configuration>
           ...
           <taglets>
@@ -164,7 +164,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <configuration>
           ...
           <tagletArtifacts>

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/test-javadocs.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/test-javadocs.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/test-javadocs.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/test-javadocs.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/test-javadocs.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/test-javadocs.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/test-javadocs.apt.vm Wed Aug  5 11:58:52 2009
@@ -3,7 +3,7 @@
  ------
  Vincent Siveton
  ------
- 2008-07-28
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -83,13 +83,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <configuration>
-          <doctitle>My API for ${project.name} ${project.version}</doctitle> <!-- Used by javadoc:javadoc goal -->
-          <windowtitle>My API for ${project.name} ${project.version}</windowtitle> <!-- Used by javadoc:javadoc goal -->
+          <doctitle>My API for \${project.name} \${project.version}</doctitle> <!-- Used by javadoc:javadoc goal -->
+          <windowtitle>My API for \${project.name} \${project.version}</windowtitle> <!-- Used by javadoc:javadoc goal -->
 
-          <testDoctitle>My Test API for ${project.name} ${project.version}</testDoctitle> <!-- Used by javadoc:test-javadoc goal -->
-          <testWindowtitle>My Test API for ${project.name} ${project.version}</testWindowtitle> <!-- Used by javadoc:test-javadoc goal -->
+          <testDoctitle>My Test API for \${project.name} \${project.version}</testDoctitle> <!-- Used by javadoc:test-javadoc goal -->
+          <testWindowtitle>My Test API for \${project.name} \${project.version}</testWindowtitle> <!-- Used by javadoc:test-javadoc goal -->
           ...
         </configuration>
       </plugin>
@@ -106,7 +106,7 @@
  configuration (i.e. \<doctitle/\> or \<windowtitle/\> parameters) that Javadoc report (backward compatible reasons).
 
  <<Note>>: To run the reports selectively, you need to include only the reports that you prefer.
-  Read the {{{selective-javadocs-report.html}Selective Javadocs Reports}} part for more information.
+  Read the {{{./selective-javadocs-report.html}Selective Javadocs Reports}} part for more information.
 
 * Using the \<reportSets/\> configuration parameter
 
@@ -123,13 +123,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
+        <version>${project.version}</version>
         <reportSets>
           <reportSet>
             <id>html</id>
             <configuration>
-              <doctitle>My API for ${project.name} ${project.version}</doctitle>
-              <windowtitle>My API for ${project.name} ${project.version}</windowtitle>
+              <doctitle>My API for \${project.name} \${project.version}</doctitle>
+              <windowtitle>My API for \${project.name} \${project.version}</windowtitle>
               ...
             </configuration>
             <reports>
@@ -139,8 +139,8 @@
           <reportSet>
             <id>test-html</id>
             <configuration>
-              <testDoctitle>My Test API for ${project.name} ${project.version}</testDoctitle>
-              <testWindowtitle>My Test API for ${project.name} ${project.version}</testWindowtitle>
+              <testDoctitle>My Test API for \${project.name} \${project.version}</testDoctitle>
+              <testWindowtitle>My Test API for \${project.name} \${project.version}</testWindowtitle>
               ...
             </configuration>
             <reports>

Copied: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt.vm (from r800711, maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt.vm?p2=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt.vm&p1=maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt&r1=800711&r2=801148&rev=801148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt.vm Wed Aug  5 11:58:52 2009
@@ -4,7 +4,7 @@
  Vincent Siveton
  Maria Odea Ching
  ------
- 2009-08-03
+ 2009-08-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -45,6 +45,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${project.version}</version>
       </plugin>
     </plugins>
     ...