Author: veithen
Date: Sat May 4 19:42:16 2013
New Revision: 1479160
URL: http://svn.apache.org/r1479160
Log:
Use a more standard approach to generate the site:
* Generate the site from the root POM, not from a submodule.
* Avoid using antrun plugin to generate Javadocs.
Added:
axis/axis2/java/rampart/trunk/apidocs/ (with props)
axis/axis2/java/rampart/trunk/apidocs/pom.xml (with props)
Removed:
axis/axis2/java/rampart/trunk/modules/documentation/pom.xml
Modified:
axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-samples/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/trunk/pom.xml
Propchange: axis/axis2/java/rampart/trunk/apidocs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat May 4 19:42:16 2013
@@ -0,0 +1 @@
+target
Added: axis/axis2/java/rampart/trunk/apidocs/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/apidocs/pom.xml?rev=1479160&view=auto
==============================================================================
--- axis/axis2/java/rampart/trunk/apidocs/pom.xml (added)
+++ axis/axis2/java/rampart/trunk/apidocs/pom.xml Sat May 4 19:42:16 2013
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-project</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>apidocs</artifactId>
+ <name>Javadoc</name>
+ <packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rampart-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rampart-policy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rampart-trust</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <executions>
+ <execution>
+ <id>site-javadoc</id>
+ <phase>site</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+
<reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
+ <destDir>.</destDir>
+ <includeDependencySources>true</includeDependencySources>
+ <dependencySourceIncludes>
+
<dependencySourceInclude>${project.groupId}:*</dependencySourceInclude>
+ </dependencySourceIncludes>
+ <!-- There are no other modules that generate Javadoc we
can link to -->
+ <detectOfflineLinks>false</detectOfflineLinks>
+ <breakiterator>true</breakiterator>
+ <!-- The notimestamp, windowtitle and bottom parameters
are chosen to minimize the number
+ of changes between releases (to avoid mass changes
when committing the site for a new release) -->
+ <notimestamp>true</notimestamp>
+ <windowtitle>Apache Rampart</windowtitle>
+ <bottom>Copyright © {organizationName}. All Rights
Reserved.</bottom>
+ <!-- doctitle only appears in the summary and we should
include the version there -->
+ <doctitle>Apache Rampart ${project.version}</doctitle>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dist-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Propchange: axis/axis2/java/rampart/trunk/apidocs/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/bin.xml?rev=1479160&r1=1479159&r2=1479160&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/bin.xml Sat May 4
19:42:16 2013
@@ -40,11 +40,11 @@
</dependencySets>
<fileSets>
<fileSet>
- <directory>target/apidocs</directory>
+ <directory>../../apidocs/target/site</directory>
<outputDirectory>${dist.dir}/docs/apidocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../documentation/target/site</directory>
+ <directory>../../target/site</directory>
<outputDirectory>${dist.dir}/docs</outputDirectory>
</fileSet>
<fileSet>
Modified: axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/pom.xml?rev=1479160&r1=1479159&r2=1479160&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/pom.xml Sat May 4
19:42:16 2013
@@ -36,38 +36,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>build-javadoc</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <javadoc
packagenames="org.apache.rampart.*,org.apache.rahas.*" destdir="target/apidocs"
author="true" breakiterator="true" version="true" use="true"
windowtitle="Apache Rampart API">
-
- <sourcepath>
- <dirset dir="../..">
- <include
name="**/rampart-core/src/main/java" />
- <include
name="**/rampart-policy/src/main/java" />
- <include
name="**/rampart-trust/src/main/java" />
- </dirset>
- </sourcepath>
-
- <classpath
refid="maven.dependency.classpath" />
- <classpath refid="maven.compile.classpath"
/>
- <classpath refid="maven.runtime.classpath"
/>
-
- </javadoc>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<executions>
@@ -106,6 +74,12 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml?rev=1479160&r1=1479159&r2=1479160&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml Sat May 4
19:42:16 2013
@@ -44,6 +44,12 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -99,18 +105,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1479160&r1=1479159&r2=1479160&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Sat May
4 19:42:16 2013
@@ -397,6 +397,12 @@
<argLine>${jacoco.surefireArgLine}
-Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar</argLine>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -472,19 +478,4 @@
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
</project>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml?rev=1479160&r1=1479159&r2=1479160&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml Sat May 4
19:42:16 2013
@@ -82,6 +82,12 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml?rev=1479160&r1=1479159&r2=1479160&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml Sat May 4
19:42:16 2013
@@ -44,6 +44,12 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -57,19 +63,4 @@
<artifactId>axiom-api</artifactId>
</dependency>
</dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
</project>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/pom.xml?rev=1479160&r1=1479159&r2=1479160&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/pom.xml Sat May 4
19:42:16 2013
@@ -80,6 +80,12 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml?rev=1479160&r1=1479159&r2=1479160&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml Sat May 4
19:42:16 2013
@@ -55,6 +55,12 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -88,19 +94,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
</project>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml?rev=1479160&r1=1479159&r2=1479160&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml Sat May 4
19:42:16 2013
@@ -61,6 +61,12 @@
<moduleXmlFile>module.xml</moduleXmlFile>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml?rev=1479160&r1=1479159&r2=1479160&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml Sat May 4
19:42:16 2013
@@ -52,6 +52,12 @@
</includes>
</configuration-->
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -99,19 +105,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
</project>
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1479160&r1=1479159&r2=1479160&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Sat May 4 19:42:16 2013
@@ -286,12 +286,33 @@
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
+ <version>3.2</version>
<inherited>false</inherited>
+ <configuration>
+
<siteDirectory>modules/documentation/src/site</siteDirectory>
+ </configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.6</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>project-team</report>
+ <report>dependencies</report>
+ <report>mailing-list</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
<dependencyManagement>
<dependencies>
<!-- Axis2 dependencies -->
@@ -421,12 +442,25 @@
</property>
</activation>
<modules>
- <module>modules/documentation</module>
<module>modules/distribution</module>
</modules>
<build>
<plugins>
<plugin>
+ <!-- Generate the site for inclusion in the binary
distribution -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dist-site</id>
+ <phase>package</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -453,13 +487,14 @@
for anything else than doing a release. -->
<id>everything</id>
<modules>
- <module>modules/documentation</module>
<module>modules/distribution</module>
+ <module>code-coverage</module>
</modules>
</profile>
</profiles>
<modules>
+ <module>apidocs</module>
<module>modules/rampart-policy</module>
<module>modules/rampart-trust</module>
<module>modules/rampart-core</module>
@@ -469,7 +504,6 @@
<module>modules/rampart-integration</module>
<!-- Compile sample codes -->
<module>modules/rampart-samples</module>
- <module>code-coverage</module>
</modules>
<properties>
