You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/11/29 15:28:41 UTC

svn commit: r480580 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java

Author: jvanzyl
Date: Wed Nov 29 06:28:40 2006
New Revision: 480580

URL: http://svn.apache.org/viewvc?view=rev&rev=480580
Log:
o pick up a standard directory of shared archive resources

Modified:
    maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java?view=diff&rev=480580&r1=480579&r2=480580
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java Wed Nov 29 06:28:40 2006
@@ -20,12 +20,15 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProjectHelper;
 import org.apache.maven.reporting.MavenReportException;
+import org.apache.maven.model.Resource;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Locale;
+import java.util.List;
+import java.util.Iterator;
 
 /**
  * Bundles the javadoc documentation in a jar so it can be deployed to the repo.
@@ -154,7 +157,19 @@
 
         JarArchiver archiver = new JarArchiver();
 
-        archiver.setDotFileDirectory( new File( project.getBuild().getDirectory() ) );
+        List resources = project.getBuild().getResources();
+
+        for ( Iterator i = resources.iterator(); i.hasNext(); )
+        {
+            Resource r = (Resource) i.next();
+
+            if ( r.getDirectory().endsWith( "maven-shared-archive-resources" ) )
+            {
+                archiver.addDirectory( new File( r.getDirectory() ) );
+            }
+        }
+
+        //archiver.setDotFileDirectory( new File( project.getBuild().getDirectory() ) );
 
         archiver.addDirectory( javadocFiles );