You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/05/04 12:03:05 UTC
svn commit: r1333846 - in
/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations:
./ scanner/
Author: olamy
Date: Fri May 4 10:03:05 2012
New Revision: 1333846
URL: http://svn.apache.org/viewvc?rev=1333846&view=rev
Log:
add TODO for scanning dependencies and sources too for javadoc @since, @deprecated and comments
Modified:
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/MojoAnnotationsScannerRequest.java
Modified: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java?rev=1333846&r1=1333845&r2=1333846&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java Fri May 4 10:03:05 2012
@@ -40,6 +40,7 @@ import org.codehaus.plexus.logging.Abstr
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -69,8 +70,11 @@ public class JavaAnnotationsMojoDescript
try
{
MojoAnnotationsScannerRequest mojoAnnotationsScannerRequest = new MojoAnnotationsScannerRequest();
- List<File> classesDirectories = toFiles( request.getProject().getCompileClasspathElements() );
- mojoAnnotationsScannerRequest.setClassesDirectories( classesDirectories );
+
+ mojoAnnotationsScannerRequest.setClassesDirectories(
+ Arrays.asList( new File( request.getProject().getBuild().getOutputDirectory() ) ) );
+
+ mojoAnnotationsScannerRequest.setDependencies( request.getProject().getCompileClasspathElements() );
List<MojoAnnotatedClass> mojoAnnotatedClasses =
mojoAnnotationsScanner.scan( mojoAnnotationsScannerRequest );
Modified: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java?rev=1333846&r1=1333845&r2=1333846&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java Fri May 4 10:03:05 2012
@@ -63,8 +63,16 @@ public class DefaultMojoAnnotationsScann
{
for ( File classDirectory : request.getClassesDirectories() )
{
- mojoAnnotatedClasses.addAll( scanDirectory( classDirectory, request.getIncludePatterns() ) );
+ if ( classDirectory.exists() && classDirectory.isDirectory() )
+ {
+ mojoAnnotatedClasses.addAll( scanDirectory( classDirectory, request.getIncludePatterns() ) );
+ // TODO scan sources to get @since and @deprecated and description of classes and fields.
+ }
}
+
+
+ //TODO scan dependencies to get super class annotations if exist request.getDependencies()
+
return mojoAnnotatedClasses;
}
catch ( IOException e )
Modified: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/MojoAnnotationsScannerRequest.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/MojoAnnotationsScannerRequest.java?rev=1333846&r1=1333845&r2=1333846&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/MojoAnnotationsScannerRequest.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/MojoAnnotationsScannerRequest.java Fri May 4 10:03:05 2012
@@ -35,6 +35,8 @@ public class MojoAnnotationsScannerReque
private List<String> includePatterns = Arrays.asList( "**/*.class" );
+ private List<File> sourceDirectories = new ArrayList<File>();
+
public MojoAnnotationsScannerRequest()
{
// no o
@@ -69,4 +71,14 @@ public class MojoAnnotationsScannerReque
{
this.includePatterns = includePatterns;
}
+
+ public List<File> getSourceDirectories()
+ {
+ return sourceDirectories;
+ }
+
+ public void setSourceDirectories( List<File> sourceDirectories )
+ {
+ this.sourceDirectories = sourceDirectories;
+ }
}