You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2009/07/15 00:35:33 UTC
svn commit: r794098 - in /maven/plugins/trunk/maven-javadoc-plugin/src:
main/java/org/apache/maven/plugin/javadoc/
test/java/org/apache/maven/plugin/javadoc/
Author: vsiveton
Date: Tue Jul 14 22:35:33 2009
New Revision: 794098
URL: http://svn.apache.org/viewvc?rev=794098&view=rev
Log:
MJAVADOC-231: tagletpath does not seem to work
o fixed pruneDirs()
o added test case
Modified:
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
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java
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=794098&r1=794097&r2=794098&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 Tue Jul 14 22:35:33 2009
@@ -2266,15 +2266,17 @@
&& ( StringUtils.isNotEmpty( current.getTagletArtifact().getVersion() ) ) )
{
tagletsPath.addAll( getArtifactsAbsolutePath( current.getTagletArtifact() ) );
+
+ tagletsPath = JavadocUtil.pruneFiles( tagletsPath );
}
else if ( StringUtils.isNotEmpty( current.getTagletpath() ) )
{
tagletsPath.add( current.getTagletpath() );
+
+ tagletsPath = JavadocUtil.pruneDirs( project, tagletsPath );
}
}
- tagletsPath = JavadocUtil.pruneFiles( tagletsPath );
-
path.append( StringUtils.join( tagletsPath.iterator(), File.pathSeparator ) );
}
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=794098&r1=794097&r2=794098&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 Tue Jul 14 22:35:33 2009
@@ -95,7 +95,7 @@
directory = new File( project.getBasedir(), directory.getPath() );
}
- if ( directory.isDirectory() && !pruned.contains( dir ) )
+ if ( directory.isDirectory() && !pruned.contains( directory.getAbsolutePath() ) )
{
pruned.add( directory.getAbsolutePath() );
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java?rev=794098&r1=794097&r2=794098&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java Tue Jul 14 22:35:33 2009
@@ -388,4 +388,23 @@
"test/doc-files" ),
null, null, false ) ) );
}
+
+ /**
+ * Method to test copyJavadocResources()
+ *
+ * @throws Exception if any
+ */
+ public void testPruneDirs()
+ throws Exception
+ {
+ List list = new ArrayList();
+ list.add( getBasedir() + "/target/classes" );
+ list.add( getBasedir() + "/target/classes" );
+ list.add( getBasedir() + "/target/classes" );
+
+ List expected = new ArrayList();
+ expected.add( getBasedir() + "/target/classes" );
+
+ assertTrue( EqualsBuilder.reflectionEquals( expected, JavadocUtil.pruneDirs( null, list ) ) );
+ }
}