From 21960f6d5b58acca1fea123e594c472a2986fbdb Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 19 May 2004 23:20:34 +0000
Subject: [PATCH] MPJAVADOC-24 fix with tests

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115389 13f79535-47bb-0310-9956-ffa450edef68
---
 javadoc/plugin.jelly                             | 16 +++++++++++++---
 javadoc/src/plugin-test/project.xml              |  8 ++++++++
 .../src/main/org/apache/maven/Dummy2.java        |  6 ++++++
 .../src/main/org/apache/maven/package.html       |  2 +-
 .../src/main/org/apache/maven2/Dummy3.java       |  6 ++++++
 .../src/main/org/apache/maven2/Dummy4.java       |  6 ++++++
 .../main/org/apache/maven2/doc-files/example.txt |  1 +
 .../src/main/org/apache/maven2/package.html      |  4 ++++
 8 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 javadoc/src/plugin-test/src/main/org/apache/maven/Dummy2.java
 create mode 100644 javadoc/src/plugin-test/src/main/org/apache/maven2/Dummy3.java
 create mode 100644 javadoc/src/plugin-test/src/main/org/apache/maven2/Dummy4.java
 create mode 100644 javadoc/src/plugin-test/src/main/org/apache/maven2/doc-files/example.txt
 create mode 100644 javadoc/src/plugin-test/src/main/org/apache/maven2/package.html

diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index 1a3678f6..c7aed8fd 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -159,7 +159,6 @@
       <ant:record name="${maven.build.dir}/javadoc/report.txt" action="start" />
 
       <ant:javadoc
-        packagenames="${pom.package}.*"
         destdir="${maven.javadoc.destdir}"
         author="${maven.javadoc.author}"
         public="${maven.javadoc.public}"
@@ -172,8 +171,7 @@
         bottom="${copyright}"
         stylesheetfile="${maven.javadoc.stylesheet}"
         additionalparam="${maven.javadoc.additionalparam}"
-        useexternalfile="${maven.javadoc.useexternalfile}"
-        sourcepath="${pom.build.sourceDirectory}">
+        useexternalfile="${maven.javadoc.useexternalfile}">
     
         <!-- sourceSet is set by the javadoc:check-needed function -->
         <ant:fileset refid="sourceSet" />
@@ -299,6 +297,18 @@
         section="Javadoc Report"
         inputText="${inputText}"
         output="${genDocs}/javadoc.xml"/>
+        
+      <!-- 
+      Because we use in the javadoc task a fileset and not a packageset
+      (to allow sourceModifications) the javadoc doesn't copy 
+      automatically doc-files directories.
+      We must do it manually.
+      -->
+      <ant:copy todir="${maven.javadoc.destdir}">
+        <ant:fileset dir="${pom.build.sourceDirectory}">
+          <ant:include name="**/doc-files/**/*"/>
+        </ant:fileset>       
+      </ant:copy>
     </j:if>
 
   </goal>
diff --git a/javadoc/src/plugin-test/project.xml b/javadoc/src/plugin-test/project.xml
index 0ff6aed4..38724fcc 100644
--- a/javadoc/src/plugin-test/project.xml
+++ b/javadoc/src/plugin-test/project.xml
@@ -54,5 +54,13 @@
 
   <build>
     <sourceDirectory>src/main</sourceDirectory>
+    <sourceModifications>
+      <sourceModification>
+        <className>org.apache.maven.Dummy</className>
+        <excludes>
+          <exclude>**/Dummy4.*</exclude>
+        </excludes>
+      </sourceModification>
+    </sourceModifications>
   </build>
 </project>
diff --git a/javadoc/src/plugin-test/src/main/org/apache/maven/Dummy2.java b/javadoc/src/plugin-test/src/main/org/apache/maven/Dummy2.java
new file mode 100644
index 00000000..a16ccaea
--- /dev/null
+++ b/javadoc/src/plugin-test/src/main/org/apache/maven/Dummy2.java
@@ -0,0 +1,6 @@
+package org.apache.maven;
+
+public class Dummy2
+{
+    public String badChecky = "error";
+} 
\ No newline at end of file
diff --git a/javadoc/src/plugin-test/src/main/org/apache/maven/package.html b/javadoc/src/plugin-test/src/main/org/apache/maven/package.html
index 9004261e..6f228652 100644
--- a/javadoc/src/plugin-test/src/main/org/apache/maven/package.html
+++ b/javadoc/src/plugin-test/src/main/org/apache/maven/package.html
@@ -1,4 +1,4 @@
 <html>
 <head></head>
-<body>Package documentation.<br/> <a href="doc-files/example.txt">Example</a></body>
+<body>Package documentation.<br/> <a href="doc-files/example.txt">example.txt in doc-files directory.</a></body>
 </html>
\ No newline at end of file
diff --git a/javadoc/src/plugin-test/src/main/org/apache/maven2/Dummy3.java b/javadoc/src/plugin-test/src/main/org/apache/maven2/Dummy3.java
new file mode 100644
index 00000000..ea5289cb
--- /dev/null
+++ b/javadoc/src/plugin-test/src/main/org/apache/maven2/Dummy3.java
@@ -0,0 +1,6 @@
+package org.apache.maven2;
+
+public class Dummy3
+{
+    public String badChecky = "error";
+} 
\ No newline at end of file
diff --git a/javadoc/src/plugin-test/src/main/org/apache/maven2/Dummy4.java b/javadoc/src/plugin-test/src/main/org/apache/maven2/Dummy4.java
new file mode 100644
index 00000000..fb3cae97
--- /dev/null
+++ b/javadoc/src/plugin-test/src/main/org/apache/maven2/Dummy4.java
@@ -0,0 +1,6 @@
+package org.apache.maven2;
+
+public class Dummy4
+{
+    public String badChecky = "error";
+} 
\ No newline at end of file
diff --git a/javadoc/src/plugin-test/src/main/org/apache/maven2/doc-files/example.txt b/javadoc/src/plugin-test/src/main/org/apache/maven2/doc-files/example.txt
new file mode 100644
index 00000000..78264689
--- /dev/null
+++ b/javadoc/src/plugin-test/src/main/org/apache/maven2/doc-files/example.txt
@@ -0,0 +1 @@
+This an example
\ No newline at end of file
diff --git a/javadoc/src/plugin-test/src/main/org/apache/maven2/package.html b/javadoc/src/plugin-test/src/main/org/apache/maven2/package.html
new file mode 100644
index 00000000..6f228652
--- /dev/null
+++ b/javadoc/src/plugin-test/src/main/org/apache/maven2/package.html
@@ -0,0 +1,4 @@
+<html>
+<head></head>
+<body>Package documentation.<br/> <a href="doc-files/example.txt">example.txt in doc-files directory.</a></body>
+</html>
\ No newline at end of file