Author: jdcasey
Date: Thu Apr 8 20:26:01 2010
New Revision: 932090
URL: http://svn.apache.org/viewvc?rev=932090&view=rev
Log:
[MJAVAOC-280] Adding tests and fixing a couple minor issues with test-javadoc
generation and multiple javadoc executions in succession.
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-distro/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-distro/pom.xml
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/pom.xml
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/pom.xml
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/pom.xml
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/verify.bsh
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/pom.xml
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/pom.xml
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/pom.xml
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/pom.xml
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/verify.bsh
(with props)
Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=932090&r1=932089&r2=932090&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Thu Apr 8 20:26:01 2010
@@ -425,6 +425,7 @@ under the License.
<pomInclude>**/MJAVADOC-257/pom.xml</pomInclude>
<pomInclude>**/MJAVADOC-259/pom.xml</pomInclude>
<pomInclude>**/MJAVADOC-262/pom.xml</pomInclude>
+ <pomInclude>MJAVADOC-280-*/pom.xml</pomInclude>
</pomIncludes>
<postBuildHookScript>verify</postBuildHookScript>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-distro/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-distro/pom.xml?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-distro/pom.xml
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-distro/pom.xml
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>MJAVADOC-280-1</artifactId>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>MJAVADOC-280-1-distro</artifactId>
+ <name>MJAVADOC-280-1-distro</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.parent.artifactId}-modA</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.parent.artifactId}-modB</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@pom.version@</version>
+ <executions>
+ <execution>
+ <id>javadoc-jars</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <includeDependencySources>true</includeDependencySources>
+ <dependencySourceIncludes>
+
<dependencySourceInclude>${project.groupId}:*</dependencySourceInclude>
+ </dependencySourceIncludes>
+ <detectOfflineLinks>false</detectOfflineLinks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-distro/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/pom.xml?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/pom.xml
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/pom.xml
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>MJAVADOC-280-1</artifactId>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>MJAVADOC-280-1-modA</artifactId>
+ <name>MJAVADOC-280-1-modA</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,13 @@
+package org.apache.maven.plugins.mjavadoc.it.moda;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( final String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,38 @@
+package org.apache.maven.plugins.mjavadoc.it.moda;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( final String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/pom.xml?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/pom.xml
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/pom.xml
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>MJAVADOC-280-1</artifactId>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>MJAVADOC-280-1-modB</artifactId>
+ <name>MJAVADOC-280-1-modB</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,13 @@
+package org.apache.maven.plugins.mjavadoc.it.modb;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( final String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,38 @@
+package org.apache.maven.plugins.mjavadoc.it.modb;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( final String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/MJAVADOC-280-1-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/pom.xml?rev=932090&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/pom.xml
(added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/pom.xml Thu
Apr 8 20:26:01 2010
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>MJAVADOC-280-1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>MJAVADOC-280-1-modA</module>
+ <module>MJAVADOC-280-1-modB</module>
+ <module>MJAVADOC-280-1-distro</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/verify.bsh?rev=932090&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/verify.bsh
(added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/verify.bsh
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,32 @@
+import java.io.File;
+
+File distroTarget = new File( basedir, "MJAVADOC-280-1-distro/target" );
+File apidocs = new File( distroTarget, "apidocs" );
+File testApidocs = new File( distroTarget, "testapidocs" );
+
+File f;
+if ( !( f = new File( apidocs,
"org/apache/maven/plugins/mjavadoc/it/moda/App.html" ) ).exists() )
+{
+ System.out.println( f + " does not exist!" );
+ return false;
+}
+
+if ( !( f = new File( apidocs,
"org/apache/maven/plugins/mjavadoc/it/modb/App.html" ) ).exists() )
+{
+ System.out.println( f + " does not exist!" );
+ return false;
+}
+
+if ( !( f = new File( testApidocs,
"org/apache/maven/plugins/mjavadoc/it/moda/AppTest.html" ) ).exists() )
+{
+ System.out.println( f + " does not exist!" );
+ return false;
+}
+
+if ( !( f = new File( testApidocs,
"org/apache/maven/plugins/mjavadoc/it/modb/AppTest.html" ) ).exists() )
+{
+ System.out.println( f + " does not exist!" );
+ return false;
+}
+
+return true;
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-1/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>MJAVADOC-280-2</artifactId>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>MJAVADOC-280-2-distro</artifactId>
+ <name>MJAVADOC-280-2-distro</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.parent.artifactId}-modA</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.parent.artifactId}-modB</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Only needed for javadoc generation. -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <!-- <version>2.6.2-SNAPSHOT</version> -->
+ <version>@pom.version@</version>
+ <executions>
+ <execution>
+ <id>javadoc-jars</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <includeDependencySources>true</includeDependencySources>
+ <dependencySourceIncludes>
+
<dependencySourceInclude>${project.groupId}:*</dependencySourceInclude>
+ </dependencySourceIncludes>
+ <detectOfflineLinks>false</detectOfflineLinks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/pom.xml?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/pom.xml
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/pom.xml
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>MJAVADOC-280-2-projects</artifactId>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>MJAVADOC-280-2-modA</artifactId>
+ <name>MJAVADOC-280-2-modA</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,13 @@
+package org.apache.maven.plugins.mjavadoc.it.moda;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( final String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,38 @@
+package org.apache.maven.plugins.mjavadoc.it.moda;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( final String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/pom.xml?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/pom.xml
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/pom.xml
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>MJAVADOC-280-2-projects</artifactId>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>MJAVADOC-280-2-modB</artifactId>
+ <name>MJAVADOC-280-2-modB</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,13 @@
+package org.apache.maven.plugins.mjavadoc.it.modb;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( final String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,38 @@
+package org.apache.maven.plugins.mjavadoc.it.modb;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( final String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/MJAVADOC-280-2-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/pom.xml?rev=932090&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/pom.xml
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/pom.xml
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>MJAVADOC-280-2-projects</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>MJAVADOC-280-2-modA</module>
+ <module>MJAVADOC-280-2-modB</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-projects/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/pom.xml?rev=932090&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/pom.xml
(added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/pom.xml Thu
Apr 8 20:26:01 2010
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>MJAVADOC-280-2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>build-projects</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <pom>MJAVADOC-280-2-projects/pom.xml</pom>
+ <goals>
+ <goal>clean</goal>
+ <goal>install</goal>
+ </goals>
+ <streamLogs>true</streamLogs>
+ <suppressSummaries>true</suppressSummaries>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-distro</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <pom>MJAVADOC-280-2-distro/pom.xml</pom>
+ <goals>
+ <goal>clean</goal>
+ <goal>package</goal>
+ </goals>
+ <streamLogs>true</streamLogs>
+ <suppressSummaries>true</suppressSummaries>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/verify.bsh?rev=932090&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/verify.bsh
(added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/verify.bsh
Thu Apr 8 20:26:01 2010
@@ -0,0 +1,32 @@
+import java.io.File;
+
+File distroTarget = new File( basedir, "MJAVADOC-280-2-distro/target" );
+File apidocs = new File( distroTarget, "apidocs" );
+File testApidocs = new File( distroTarget, "testapidocs" );
+
+File f;
+if ( !( f = new File( apidocs,
"org/apache/maven/plugins/mjavadoc/it/moda/App.html" ) ).exists() )
+{
+ System.out.println( f + " does not exist!" );
+ return false;
+}
+
+if ( !( f = new File( apidocs,
"org/apache/maven/plugins/mjavadoc/it/modb/App.html" ) ).exists() )
+{
+ System.out.println( f + " does not exist!" );
+ return false;
+}
+
+if ( !( f = new File( testApidocs,
"org/apache/maven/plugins/mjavadoc/it/moda/AppTest.html" ) ).exists() )
+{
+ System.out.println( f + " does not exist!" );
+ return false;
+}
+
+if ( !( f = new File( testApidocs,
"org/apache/maven/plugins/mjavadoc/it/modb/AppTest.html" ) ).exists() )
+{
+ System.out.println( f + " does not exist!" );
+ return false;
+}
+
+return true;
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=932090&r1=932089&r2=932090&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Thu Apr 8 20:26:01 2010
@@ -2062,6 +2062,19 @@ public abstract class AbstractJavadocMoj
protected final List<String> getDependencySourcePaths()
throws MavenReportException
{
+ try
+ {
+ if ( sourceDependencyCacheDir.exists() )
+ {
+ FileUtils.forceDelete( sourceDependencyCacheDir );
+ sourceDependencyCacheDir.mkdirs();
+ }
+ }
+ catch ( IOException e )
+ {
+ throw new MavenReportException( "Failed to delete cache directory:
" + sourceDependencyCacheDir + "\nReason: " + e.getMessage(), e );
+ }
+
final SourceResolverConfig config =
new SourceResolverConfig( project, localRepository,
sourceDependencyCacheDir, resolver, factory,
artifactMetadataSource, archiverManager
).withReactorProjects( reactorProjects );
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java?rev=932090&r1=932089&r2=932090&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java
Thu Apr 8 20:26:01 2010
@@ -211,7 +211,7 @@ public final class ResourceResolver
final File basedir = reactorProject.getBasedir();
for ( final String root : srcRoots )
{
- dirs.add( new File( basedir, root ).getAbsolutePath() );
+ dirs.add( root );
}
}
