Index: src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
===================================================================
--- src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (revision 649152)
+++ src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (working copy)
@@ -1138,6 +1138,7 @@
protected void executeReport( Locale locale )
throws MavenReportException
{
+ System.out.println("executing report \n");
if ( aggregate && !project.isExecutionRoot() )
{
return;
@@ -1147,6 +1148,7 @@
List sourcePaths = getSourcePaths();
+ System.out.println("getting files \n");
List files = getFiles( sourcePaths );
List packageNames = getPackageNames( sourcePaths, files );
@@ -1657,8 +1659,11 @@
}
}
+ System.out.println("aggregate: " + aggregate + " execution root: " + project.isExecutionRoot());
+ System.out.println("\n\n");
if ( aggregate && project.isExecutionRoot() )
{
+ System.out.println("here \n\n");
for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
{
MavenProject subProject = (MavenProject) i.next();
Index: src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
===================================================================
--- src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java (revision 649152)
+++ src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java (working copy)
@@ -217,6 +217,7 @@
public void execute()
throws MojoExecutionException, MojoFailureException
{
+ System.out.println("JavaDocReport:execute()");
try
{
SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" );
Index: src/it/MJAVADOC-119/verify.bsh
===================================================================
--- src/it/MJAVADOC-119/verify.bsh (revision 0)
+++ src/it/MJAVADOC-119/verify.bsh (revision 0)
@@ -0,0 +1,41 @@
+
+/*
+ * 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.*;
+
+boolean result = true;
+
+try
+{
+ File target = new File( basedir, "target/site/apidocs" );
+ if ( !target.isDirectory() )
+ {
+ System.err.println( "apidocs directory is missing or is not a directory." );
+ return false;
+ }
+
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Property changes on: src/it/MJAVADOC-119/verify.bsh
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Index: src/it/MJAVADOC-119/goals.txt
===================================================================
--- src/it/MJAVADOC-119/goals.txt (revision 0)
+++ src/it/MJAVADOC-119/goals.txt (revision 0)
@@ -0,0 +1 @@
+clean site
\ No newline at end of file
Property changes on: src/it/MJAVADOC-119/goals.txt
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Index: src/it/MJAVADOC-119/module1/src/main/java/module1/Test.java
===================================================================
--- src/it/MJAVADOC-119/module1/src/main/java/module1/Test.java (revision 0)
+++ src/it/MJAVADOC-119/module1/src/main/java/module1/Test.java (revision 0)
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package module1;
+
+/**
+ * Sample class inside the package to be included in the javadoc
+ *
+ * @author Vincent Siveton
+ */
+public class Test
+{
+ /**
+ * The main method
+ *
+ * @param args an array of strings that contains the arguments
+ */
+ public static void main( String[] args )
+ {
+ System.out.println( "Sample Application." );
+ }
+
+ /**
+ * Sample method that prints out the parameter string.
+ *
+ * @param str The string value to be printed.
+ */
+ protected void sampleMethod( String str )
+ {
+ System.out.println( str );
+ }
+}
Property changes on: src/it/MJAVADOC-119/module1/src/main/java/module1/Test.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Index: src/it/MJAVADOC-119/module1/pom.xml
===================================================================
--- src/it/MJAVADOC-119/module1/pom.xml (revision 0)
+++ src/it/MJAVADOC-119/module1/pom.xml (revision 0)
@@ -0,0 +1,41 @@
+
+
+
+ 4.0.0
+ test
+ maven-javadoc-test-module1
+ jar
+ 1.0-SNAPSHOT
+ Maven Javadoc Test Module 1
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 2.3
+
+ false
+
+
+
+
+
+
\ No newline at end of file
Property changes on: src/it/MJAVADOC-119/module1/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Index: src/it/MJAVADOC-119/module2/src/main/java/module2/Test2.java
===================================================================
--- src/it/MJAVADOC-119/module2/src/main/java/module2/Test2.java (revision 0)
+++ src/it/MJAVADOC-119/module2/src/main/java/module2/Test2.java (revision 0)
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package module2;
+
+/**
+ * Sample class inside the package to be included in the javadoc
+ *
+ * @author Vincent Siveton
+ */
+public class Test2
+{
+ /**
+ * The main method
+ *
+ * @param args an array of strings that contains the arguments
+ */
+ public static void main( String[] args )
+ {
+ System.out.println( "Sample Application." );
+ }
+
+ /**
+ * Sample method that prints out the parameter string.
+ *
+ * @param str The string value to be printed.
+ */
+ protected void sampleMethod( String str )
+ {
+ System.out.println( str );
+ }
+}
Property changes on: src/it/MJAVADOC-119/module2/src/main/java/module2/Test2.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Index: src/it/MJAVADOC-119/module2/pom.xml
===================================================================
--- src/it/MJAVADOC-119/module2/pom.xml (revision 0)
+++ src/it/MJAVADOC-119/module2/pom.xml (revision 0)
@@ -0,0 +1,35 @@
+
+
+
+ 4.0.0
+ test
+ maven-javadoc-test-module2
+ jar
+ 1.0-SNAPSHOT
+ Maven Javadoc Test Module 2
+
+
+
+ test
+ maven-javadoc-test-module1
+ 1.0-SNAPSHOT
+
+
+
\ No newline at end of file
Property changes on: src/it/MJAVADOC-119/module2/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Index: src/it/MJAVADOC-119/pom.xml
===================================================================
--- src/it/MJAVADOC-119/pom.xml (revision 0)
+++ src/it/MJAVADOC-119/pom.xml (revision 0)
@@ -0,0 +1,54 @@
+
+
+
+ 4.0.0
+ test
+ maven-javadoc-test
+ pom
+ 1.0-SNAPSHOT
+ Maven Javadoc Test Aggregate
+
+ module1
+ module2
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ @{pom.version}
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+ true
+
+
+
+
+
+
\ No newline at end of file
Property changes on: src/it/MJAVADOC-119/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Index: pom.xml
===================================================================
--- pom.xml (revision 649152)
+++ pom.xml (working copy)
@@ -242,6 +242,7 @@
**/MJAVADOC-110/pom.xml
**/MJAVADOC-137/pom.xml
**/MJAVADOC-172/pom.xml
+ **/MJAVADOC-119/pom.xml
verify.bsh
${basedir}/target/local-repo