Author: veithen
Date: Wed Jul 28 21:45:31 2010
New Revision: 980242
URL: http://svn.apache.org/viewvc?rev=980242&view=rev
Log:
1. Moved the site from the documentation module to the root project. This has
different advantages:
* It conforms to the standard Maven project layout.
* Generating the Javadocs becomes straightforward. No need for fancy ant
scripts.
* We will be able to use other aggregator-style reporting plugins if we want to.
* We will be able to include sites for selected submodules. This is interesting
for the AAR/MAR Maven plugins, because maven-plugin-plugin can be used to
generate documentation based on the annotations on the Mojos. This would avoid
the problem of out of date documentation for these plugins.
2. Moved the docs assembly from the distribution module to the root project and
modified the POM and assembly descriptor to include a copy of the site instead
of the Xdocs (see discussion on the mailing list). This is now triggered in the
apache-release profile.
3. Disabled some reporting plugins (changes, surefire-report, etc.) activated
in various submodules. They were not executed in the old build process (because
the site was built in the documentation submodule), but cause troubles now that
the site is in the root project. This will require some more cleanup.
Note that this is kind of a revert of the changes made for AXIS2-2966. However,
there is no regression because we simply build the docs distribution in a
different way.
Added:
axis/axis2/java/core/trunk/src/main/assembly/doc.xml
- copied, changed from r979883,
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/doc-assembly.xml
axis/axis2/java/core/trunk/src/site/
- copied from r979883,
axis/axis2/java/core/trunk/modules/documentation/src/site/
Removed:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/doc-assembly.xml
axis/axis2/java/core/trunk/modules/documentation/src/site/
Modified:
axis/axis2/java/core/trunk/modules/integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws/pom.xml
axis/axis2/java/core/trunk/modules/parent/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=980242&r1=980241&r2=980242&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Wed Jul 28 21:45:31
2010
@@ -394,12 +394,12 @@
</plugin>
</plugins>
</build>
- <reporting>
+ <!--reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
</plugins>
- </reporting>
+ </reporting-->
</project>
Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=980242&r1=980241&r2=980242&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Wed Jul 28
21:45:31 2010
@@ -1457,12 +1457,12 @@
</plugin>
</plugins>
</build>
- <reporting>
+ <!--reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
</plugins>
- </reporting>
+ </reporting-->
</project>
Modified: axis/axis2/java/core/trunk/modules/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/pom.xml?rev=980242&r1=980241&r2=980242&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/pom.xml Wed Jul 28 21:45:31 2010
@@ -381,12 +381,12 @@
</plugin>
</plugins>
</build>
- <reporting>
+ <!--reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
</plugins>
- </reporting>
+ </reporting-->
</project>
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=980242&r1=980241&r2=980242&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Wed Jul 28 21:45:31 2010
@@ -1278,4 +1278,19 @@
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.1</version>
+ <!-- We don't need to generate the site in sub-modules;
+ use an empty reportSet -->
+ <reportSets>
+ <reportSet>
+ <reports />
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml?rev=980242&r1=980241&r2=980242&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml
(original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml Wed
Jul 28 21:45:31 2010
@@ -97,7 +97,7 @@
<email>john.pfei...@hnpsolutions.com</email>
</contributor>
</contributors>
- <reporting>
+ <!--reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -115,5 +115,5 @@
</reportSets>
</plugin>
</plugins>
- </reporting>
+ </reporting-->
</project>
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?rev=980242&r1=980241&r2=980242&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
Wed Jul 28 21:45:31 2010
@@ -79,7 +79,7 @@
<artifactId>maven-plugin-testing-harness</artifactId>
</dependency>
</dependencies>
- <reporting>
+ <!--reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -97,5 +97,5 @@
</reportSets>
</plugin>
</plugins>
- </reporting>
+ </reporting-->
</project>
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml?rev=980242&r1=980241&r2=980242&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml
(original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml Wed
Jul 28 21:45:31 2010
@@ -98,7 +98,7 @@
<email>john.pfei...@hnpsolutions.com</email>
</contributor>
</contributors>
- <reporting>
+ <!--reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -116,5 +116,5 @@
</reportSets>
</plugin>
</plugins>
- </reporting>
+ </reporting-->
</project>
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=980242&r1=980241&r2=980242&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
Wed Jul 28 21:45:31 2010
@@ -103,7 +103,7 @@
</plugin>
</plugins>
</build>
- <reporting>
+ <!--reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -121,5 +121,5 @@
</reportSets>
</plugin>
</plugins>
- </reporting>
+ </reporting-->
</project>
Modified: axis/axis2/java/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=980242&r1=980241&r2=980242&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Wed Jul 28 21:45:31 2010
@@ -90,6 +90,76 @@
<module>modules/distribution</module>
</modules>
</profile>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <!-- We need Maven 2.1 because the
prepare-package phase
+ doesn't exist in Maven 2.0 -->
+ <requireMavenVersion>
+ <version>2.1.0</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <!-- Configure an additional execution. The
configuration
+ is the same as the one specified together with
the execution
+ in the pre-site phase. -->
+ <executions>
+ <execution>
+ <id>distribution-javadoc</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package-other-distributions</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/doc.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<ciManagement>
<system>continuum</system>
@@ -127,6 +197,8 @@
</snapshotRepository>
</distributionManagement>
<build>
+ <!-- Note: the pluginManagement in axis2-parent doesn't apply here; we
+ need to define our own! -->
<pluginManagement>
<plugins>
<plugin>
@@ -135,6 +207,23 @@
<artifactId>maven-gpg-plugin</artifactId>
<version>1.1</version>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+
<reportOutputDirectory>${project.reporting.outputDirectory}/api</reportOutputDirectory>
+ <additionalJOption>-J-Xmx128m</additionalJOption>
+ <links>
+
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>http://java.sun.com/javaee/5/docs/api/</link>
+ <link>http://jaxen.codehaus.org/apidocs/</link>
+ </links>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -161,11 +250,9 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <!-- Note: the pluginManagement in axis2-parent doesn't apply
here; thus
- we need to specify the version if we want a predictable
build! -->
- <version>2.2-beta-5</version>
<executions>
<execution>
+ <id>package-jar</id>
<phase>package</phase>
<goals>
<goal>single</goal>
@@ -178,6 +265,31 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>site-javadoc</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ <!-- These features are disabled since they cause "mvn
site" to hang -->
+
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Copied: axis/axis2/java/core/trunk/src/main/assembly/doc.xml (from r979883,
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/doc-assembly.xml)
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/main/assembly/doc.xml?p2=axis/axis2/java/core/trunk/src/main/assembly/doc.xml&p1=axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/doc-assembly.xml&r1=979883&r2=980242&rev=980242&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/doc-assembly.xml
(original)
+++ axis/axis2/java/core/trunk/src/main/assembly/doc.xml Wed Jul 28 21:45:31
2010
@@ -28,22 +28,12 @@
<fileSets>
<fileSet>
- <directory>target/tmp-doc-distro/xdocs</directory>
- <outputDirectory>docs/xdocs</outputDirectory>
- <excludes>
- <exclude>.svn/**</exclude>
- </excludes>
+ <directory>${project.reporting.outputDirectory}</directory>
+ <outputDirectory>site</outputDirectory>
</fileSet>
<fileSet>
- <directory>../../modules/documentation/target/apidocs</directory>
- <outputDirectory>docs/javadocs</outputDirectory>
- <excludes>
- <exclude>.svn/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>target/tmp-doc-distro/docs</directory>
- <outputDirectory>docs</outputDirectory>
+ <directory>.</directory>
+ <outputDirectory>/</outputDirectory>
<includes>
<include>LICENSE.txt</include>
<include>README.txt</include>
@@ -51,7 +41,8 @@
</includes>
</fileSet>
<fileSet>
- <directory>target/tmp-doc-distro/docs</directory>
+ <!-- TODO: need to enable variable substitution for this file! -->
+ <directory>release-docs/readme-files</directory>
<outputDirectory></outputDirectory>
<includes>
<include>README-docs.txt</include>
