Author: bimargulies
Date: Sat Sep 15 00:14:08 2012
New Revision: 1384979
URL: http://svn.apache.org/viewvc?rev=1384979&view=rev
Log:
MJAVADOC-278: Plugin does not include javadocDirectory correctly
o add a test that proves that there's no problem here.
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/goals.txt
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/pom.xml
- copied, changed from r1384607,
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/src/
- copied from r1384607,
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/src/main/javadoc2/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/src/main/javadoc2/resources/
- copied from r1384607,
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/src/main/javadoc/resources/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/verify.bsh
Removed:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/src/main/javadoc/resources/
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/goals.txt?rev=1384979&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/goals.txt
(added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/goals.txt Sat
Sep 15 00:14:08 2012
@@ -0,0 +1 @@
+clean compile javadoc:javadoc
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/goals.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/pom.xml
(from r1384607,
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/pom.xml)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/pom.xml?p2=maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/pom.xml&p1=maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/pom.xml&r1=1384607&r2=1384979&rev=1384979&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/pom.xml
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/pom.xml Sat
Sep 15 00:14:08 2012
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
- <artifactId>myapp</artifactId>
+ <artifactId>mjavadoc-278</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -50,6 +50,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>@pom.version@</version>
+ <configuration>
+ <javadocDirectory>${basedir}/src/main/javadoc2</javadocDirectory>
+
<stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile>
+ <docfilessubdirs>true</docfilessubdirs>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -68,9 +73,9 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>@pom.version@</version>
<configuration>
+ <javadocDirectory>${basedir}/src/main/javadoc2</javadocDirectory>
<stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile>
<docfilessubdirs>true</docfilessubdirs>
- <noqualifier>all</noqualifier>
</configuration>
</plugin>
</plugins>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/verify.bsh?rev=1384979&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/verify.bsh
(added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/verify.bsh Sat
Sep 15 00:14:08 2012
@@ -0,0 +1,32 @@
+
+/*
+ * 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.
+ */
+
+import java.io.*;
+import org.codehaus.plexus.util.*;
+
+File exampleResourceFile = new File( basedir,
"target/site/apidocs/resources/bg.psd" );
+
+if ( !exampleResourceFile.exists() )
+{
+ System.err.println( exampleResourceFile.getAbsolutePath() + " is missing."
);
+ return false;
+}
+
+return true;
\ No newline at end of file
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=1384979&r1=1384978&r2=1384979&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
Sat Sep 15 00:14:08 2012
@@ -3946,7 +3946,7 @@ public abstract class AbstractJavadocMoj
/**
* Method that copy all <code>doc-files</code> directories from
<code>javadocDirectory</code> of
- * the current projet or of the projects in the reactor to the
<code>outputDirectory</code>.
+ * the current project or of the projects in the reactor to the
<code>outputDirectory</code>.
*
* @param anOutputDirectory the output directory
* @throws java.io.IOException if any
