You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2010/06/12 23:03:39 UTC
svn commit: r954139 - in /webservices/commons/trunk/modules/axiom: pom.xml
src/main/assembly/bin.xml
Author: veithen
Date: Sat Jun 12 21:03:38 2010
New Revision: 954139
URL: http://svn.apache.org/viewvc?rev=954139&view=rev
Log:
Configured the project such that the Javadoc is included both in the site and the binary distribution.
Modified:
webservices/commons/trunk/modules/axiom/pom.xml
webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=954139&r1=954138&r2=954139&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Sat Jun 12 21:03:38 2010
@@ -398,6 +398,39 @@
</pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <executions>
+ <execution>
+ <id>distribution-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ <configuration>
+ <reportOutputDirectory>${project.build.directory}/apidocs</reportOutputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>site-javadoc</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
+ <link>http://java.sun.com/webservices/docs/1.5/api/</link>
+ <link>http://jaxen.codehaus.org/apidocs/</link>
+ </links>
+ <excludePackageNames>org.apache.axiom.test:org.apache.axiom.testutils:org.jaxen.test</excludePackageNames>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
<version>2.0.8</version>
@@ -711,27 +744,6 @@
<version>2.0-beta-1</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
- <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
- <link>http://java.sun.com/webservices/docs/1.5/api/</link>
- <link>http://jaxen.codehaus.org/apidocs/</link>
- </links>
- <excludePackageNames>org.apache.axiom.test:org.apache.axiom.testutils:org.jaxen.test</excludePackageNames>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
<artifactId>maven-site-plugin</artifactId>
<version>2.0.1</version>
<inherited>false</inherited>
Modified: webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml?rev=954139&r1=954138&r2=954139&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml (original)
+++ webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml Sat Jun 12 21:03:38 2010
@@ -42,6 +42,10 @@
</includes>
</fileSet>
<fileSet>
+ <directory>${project.build.directory}/apidocs</directory>
+ <outputDirectory>apidocs</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>legal</directory>
<outputDirectory>lib</outputDirectory>
<includes>