Author: veithen
Date: Wed Mar 6 20:05:29 2013
New Revision: 1453522
URL: http://svn.apache.org/r1453522
Log:
Improved Javadoc generation.
Added:
axis/axis1/java/trunk/apidocs/ (with props)
axis/axis1/java/trunk/apidocs/pom.xml (with props)
Modified:
axis/axis1/java/trunk/pom.xml
Propchange: axis/axis1/java/trunk/apidocs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 6 20:05:29 2013
@@ -0,0 +1 @@
+target
Added: axis/axis1/java/trunk/apidocs/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/apidocs/pom.xml?rev=1453522&view=auto
==============================================================================
--- axis/axis1/java/trunk/apidocs/pom.xml (added)
+++ axis/axis1/java/trunk/apidocs/pom.xml Wed Mar 6 20:05:29 2013
@@ -0,0 +1,188 @@
+<?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.axis</groupId>
+ <artifactId>axis-project</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>apidocs</artifactId>
+ <name>Javadoc</name>
+ <url>${baseUrl}/apiDocs</url>
+ <distributionManagement>
+ <site>
+ <id>axis</id>
+ <url>${baseSiteUrl}/apiDocs</url>
+ </site>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-ant</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-codegen</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-compat</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-databinding-castor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-databinding-xmlbeans</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-jws</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-management</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-provider-bsf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-soapmonitor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-transport-http-hc3</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-transport-http-javanet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-transport-jms</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-transport-mail</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-saaj</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-standalone-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-tools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>soapmonitor-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tcpmon</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <executions>
+ <execution>
+ <id>site-javadoc</id>
+ <phase>site</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+
<reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
+ <destDir>.</destDir>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <includeDependencySources>true</includeDependencySources>
+ <dependencySourceIncludes>
+
<dependencySourceInclude>${project.groupId}:*</dependencySourceInclude>
+ </dependencySourceIncludes>
+ <!-- Exclude sources generated by
axis-rt-databinding-xmlbeans -->
+
<excludePackageNames>org.xmlsoap.schemas.*</excludePackageNames>
+ <!-- There are no other modules that generate Javadoc we
can link to -->
+ <detectOfflineLinks>false</detectOfflineLinks>
+ <links>
+ <link>http://download.oracle.com/javaee/1.4/api/</link>
+ </links>
+ <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 Axis</windowtitle>
+ <bottom>Copyright © {organizationName}. All Rights
Reserved.</bottom>
+ <!-- doctitle only appears in the summary and we should
include the version there -->
+ <doctitle>Apache Axis ${project.version}</doctitle>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: axis/axis1/java/trunk/apidocs/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis1/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1453522&r1=1453521&r2=1453522&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Wed Mar 6 20:05:29 2013
@@ -57,6 +57,7 @@
</mailingLists>
<inceptionYear>2000</inceptionYear>
<modules>
+ <module>apidocs</module>
<module>axis</module>
<module>axis-ant</module>
<module>axis-codegen</module>
@@ -326,6 +327,26 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <!-- This serves two purposes:
+ (1) we want to generate source JARs for all builds, not
just release builds;
+ (2) we need (some of) the source JARs to generate the
Javadoc in the apidocs module. -->
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- Use the same ID as in org.apache:apache;
otherwise, the goal
+ will be executed twice when the apache-release
profile is
+ activated -->
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <attach>true</attach>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
@@ -378,25 +399,6 @@
</reportSet>
</reportSets>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8.1</version>
- <inherited>false</inherited>
- <reportSets>
- <reportSet>
- <id>aggregate</id>
- <reports>
- <report>aggregate</report>
- </reports>
- <configuration>
- <source>1.4</source>
-
<excludePackageNames>test.*:samples.*</excludePackageNames>
- <destDir>apiDocs</destDir>
- </configuration>
- </reportSet>
- </reportSets>
- </plugin>
</plugins>
</reporting>
<properties>