Author: jdcasey
Date: Mon Apr 12 19:44:43 2010
New Revision: 933383
URL: http://svn.apache.org/viewvc?rev=933383&view=rev
Log:
[MJAVADOC-280] Fixing integration tests.
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/verify.bsh
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/verify.bsh
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh
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/JavadocUtil.java
Modified:
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=933383&r1=933382&r2=933383&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
Mon Apr 12 19:44:43 2010
@@ -34,7 +34,7 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<!-- <version>2.6.2-SNAPSHOT</version> -->
- <version>@pom.version@</version>
+ <version>@javadocPluginVersion@</version>
<executions>
<execution>
<id>javadoc-jars</id>
Modified: 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=933383&r1=933382&r2=933383&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/pom.xml
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/pom.xml Mon
Apr 12 19:44:43 2010
@@ -12,3 +12,82 @@
<module>MJAVADOC-280-2-distro</module>
</modules>
</project>
+
+ <properties>
+ <!-- <javadocPluginVersion>2.6.2-SNAPSHOT</javadocPluginVersion> -->
+ <javadocPluginVersion>@pom.version@</javadocPluginVersion>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.2</version>
+ <executions>
+ <execution>
+ <id>filter-projects</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.artifactId}-projects</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.artifactId}-projects</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.artifactId}-distro</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.artifactId}-distro</targetPath>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.4</version>
+ <configuration>
+
<localRepositoryPath>${project.basedir}/../../local-repo</localRepositoryPath>
+ <streamLogs>true</streamLogs>
+ <suppressSummaries>true</suppressSummaries>
+ <debug>true</debug>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build-projects</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+
<pom>${project.build.directory}/MJAVADOC-280-2-projects/pom.xml</pom>
+ <goals>
+ <goal>clean</goal>
+ <goal>install</goal>
+ </goals>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-distro</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+
<pom>${project.build.directory}/MJAVADOC-280-2-distro/pom.xml</pom>
+ <goals>
+ <goal>clean</goal>
+ <goal>package</goal>
+ </goals>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified:
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=933383&r1=933382&r2=933383&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/verify.bsh
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/verify.bsh
Mon Apr 12 19:44:43 2010
@@ -1,6 +1,6 @@
import java.io.File;
-File distroTarget = new File( basedir, "MJAVADOC-280-2-distro/target" );
+File distroTarget = new File( basedir, "target/MJAVADOC-280-2-distro/target" );
File apidocs = new File( distroTarget, "apidocs" );
File testApidocs = new File( distroTarget, "testapidocs" );
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/verify.bsh?rev=933383&r1=933382&r2=933383&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/verify.bsh
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/verify.bsh
Mon Apr 12 19:44:43 2010
@@ -1,6 +1,6 @@
import java.io.File;
-File distroTarget = new File( basedir, "MJAVADOC-280-1-distro/target" );
+File distroTarget = new File( basedir, "MJAVADOC-280-3-distro/target" );
File apidocs = new File( distroTarget, "apidocs" );
File testApidocs = new File( distroTarget, "testapidocs" );
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml?rev=933383&r1=933382&r2=933383&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml
Mon Apr 12 19:44:43 2010
@@ -34,8 +34,7 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <!-- <version>2.6.2-SNAPSHOT</version> -->
- <version>@pom.version@</version>
+ <version>@javadocPluginVersion@</version>
<executions>
<execution>
<id>javadoc-jars</id>
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml?rev=933383&r1=933382&r2=933383&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml
Mon Apr 12 19:44:43 2010
@@ -26,8 +26,7 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <!-- <version>2.6.2-SNAPSHOT</version> -->
- <version>@pom.version@</version>
+ <version>@javadocPluginVersion@</version>
<configuration>
<tags>
<tag><name>.foo</name><placement>optm</placement><head>Foo:</head></tag>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml?rev=933383&r1=933382&r2=933383&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml Mon
Apr 12 19:44:43 2010
@@ -6,11 +6,50 @@
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <properties>
+ <!-- <javadocPluginVersion>2.6.2-SNAPSHOT</javadocPluginVersion> -->
+ <javadocPluginVersion>@pom.version@</javadocPluginVersion>
+ </properties>
+
<build>
<plugins>
<plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.2</version>
+ <executions>
+ <execution>
+ <id>filter-projects</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.artifactId}-projects</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.artifactId}-projects</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.artifactId}-distro</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.artifactId}-distro</targetPath>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.4</version>
+ <configuration>
+
<localRepositoryPath>${project.basedir}/../../local-repo</localRepositoryPath>
+ <streamLogs>true</streamLogs>
+ <suppressSummaries>true</suppressSummaries>
+ <debug>true</debug>
+ </configuration>
<executions>
<execution>
<id>build-projects</id>
@@ -19,14 +58,11 @@
<goal>run</goal>
</goals>
<configuration>
- <pom>MJAVADOC-280-4-projects/pom.xml</pom>
+
<pom>${project.build.directory}/MJAVADOC-280-4-projects/pom.xml</pom>
<goals>
<goal>clean</goal>
<goal>install</goal>
</goals>
- <streamLogs>true</streamLogs>
- <suppressSummaries>true</suppressSummaries>
- <debug>true</debug>
</configuration>
</execution>
<execution>
@@ -36,13 +72,11 @@
<goal>run</goal>
</goals>
<configuration>
- <pom>MJAVADOC-280-4-distro/pom.xml</pom>
+
<pom>${project.build.directory}/MJAVADOC-280-4-distro/pom.xml</pom>
<goals>
<goal>clean</goal>
<goal>package</goal>
</goals>
- <streamLogs>true</streamLogs>
- <suppressSummaries>true</suppressSummaries>
</configuration>
</execution>
</executions>
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh?rev=933383&r1=933382&r2=933383&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh
Mon Apr 12 19:44:43 2010
@@ -1,6 +1,6 @@
import java.io.File;
-File distroTarget = new File( basedir, "MJAVADOC-280-2-distro/target" );
+File distroTarget = new File( basedir, "target/MJAVADOC-280-4-distro/target" );
File apidocs = new File( distroTarget, "apidocs" );
File testApidocs = new File( distroTarget, "testapidocs" );
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=933383&r1=933382&r2=933383&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
Mon Apr 12 19:44:43 2010
@@ -3178,7 +3178,7 @@ public abstract class AbstractJavadocMoj
}
}
- if ( taglet != null && taglets.length > 0 )
+ if ( taglets != null && taglets.length > 0 )
{
result.addAll( Arrays.asList( taglets ) );
}
@@ -5722,7 +5722,7 @@ public abstract class AbstractJavadocMoj
*/
protected final File getJavadocOptionsFile()
{
- if ( !javadocOptionsDir.exists() )
+ if ( javadocOptionsDir != null && !javadocOptionsDir.exists() )
{
javadocOptionsDir.mkdirs();
}
@@ -5755,7 +5755,10 @@ public abstract class AbstractJavadocMoj
options.setTaglets( toList( taglets ) );
options.setTags( toList( tags ) );
- options.setJavadocResourcesDirectory( toRelative(
project.getBasedir(), getJavadocDirectory().getAbsolutePath() ) );
+ if ( getProject() != null && getJavadocDirectory() != null )
+ {
+ options.setJavadocResourcesDirectory( toRelative(
getProject().getBasedir(), getJavadocDirectory().getAbsolutePath() ) );
+ }
File optionsFile = getJavadocOptionsFile();
FileWriter writer = null;
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java?rev=933383&r1=933382&r2=933383&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
Mon Apr 12 19:44:43 2010
@@ -19,9 +19,6 @@ package org.apache.maven.plugin.javadoc;
* under the License.
*/
-import static org.codehaus.plexus.util.StringUtils.isEmpty;
-import static org.codehaus.plexus.util.StringUtils.isNotEmpty;
-
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
