svn commit: r1495019 - in /incubator/npanday/trunk/plugins: maven-compile-plugin/src/main/java/npanday/plugin/compile/ maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ maven-test-plugin/src/main/java/npanday/plugin/test/

Thu, 20 Jun 2013 07:31:48 -0700 

Author: lcorneliussen
Date: Thu Jun 20 14:30:48 2013
New Revision: 1495019

URL: http://svn.apache.org/r1495019
Log:
[NPANDAY-402]: Add support to automatically attach PDB-symbols and 
Code-Documentation (comment.xml)

o disable PDB instead of only enabling dotnet assemblies

Modified:
    
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
    
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
    
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ResolveMojo.java
    
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java

Modified: 
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java?rev=1495019&r1=1495018&r2=1495019&view=diff
==============================================================================
--- 
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
 (original)
+++ 
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
 Thu Jun 20 14:30:48 2013
@@ -36,11 +36,13 @@ import npanday.executable.compiler.Compi
 import npanday.registry.RepositoryRegistry;
 import npanday.resolver.NPandayDependencyResolution;
 import npanday.resolver.filter.DotnetAssemblyArtifactFilter;
+import npanday.resolver.filter.DotnetSymbolsArtifactFilter;
 import npanday.resolver.filter.OrArtifactFilter;
 import npanday.vendor.SettingsUtil;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.InversionArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -1156,7 +1158,7 @@ public abstract class AbstractCompilerMo
         {
             AndArtifactFilter filter = new AndArtifactFilter();
             filter.add(new ScopeArtifactFilter(scope));
-            filter.add(new DotnetAssemblyArtifactFilter());
+            filter.add(new InversionArtifactFilter(new 
DotnetSymbolsArtifactFilter()));
 
             dependencyResolution.require( project, LocalRepositoryUtil.create( 
localRepository ), filter );
         }

Modified: 
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java?rev=1495019&r1=1495018&r2=1495019&view=diff
==============================================================================
--- 
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
 (original)
+++ 
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
 Thu Jun 20 14:30:48 2013
@@ -24,9 +24,11 @@ import npanday.LocalRepositoryUtil;
 import npanday.assembler.AssemblerContext;
 import npanday.resolver.NPandayDependencyResolution;
 import npanday.resolver.filter.DotnetAssemblyArtifactFilter;
+import npanday.resolver.filter.DotnetSymbolsArtifactFilter;
 import npanday.resolver.filter.OrArtifactFilter;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.InversionArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -81,7 +83,8 @@ public class ComponentInitializerMojo
         {
             AndArtifactFilter filter = new AndArtifactFilter();
             filter.add(new ScopeArtifactFilter("test"));
-            filter.add(new DotnetAssemblyArtifactFilter());
+            filter.add(new InversionArtifactFilter(new 
DotnetSymbolsArtifactFilter()));
+
 
             dependencyResolution.require( project, LocalRepositoryUtil.create( 
localRepository ), filter );
         }

Modified: 
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ResolveMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ResolveMojo.java?rev=1495019&r1=1495018&r2=1495019&view=diff
==============================================================================
--- 
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ResolveMojo.java
 (original)
+++ 
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ResolveMojo.java
 Thu Jun 20 14:30:48 2013
@@ -34,6 +34,7 @@ import org.apache.maven.artifact.resolve
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.InversionArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
 import 
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
 import org.apache.maven.artifact.versioning.VersionRange;
@@ -120,18 +121,15 @@ public class ResolveMojo
                 + "if native maven plugins require special dependencies to be 
resolved!"
         );
 
+        AndArtifactFilter filter = new AndArtifactFilter();
         try
         {
-            AndArtifactFilter filter = new AndArtifactFilter();
             filter.add(new ScopeArtifactFilter(requiredScope));
-
-            OrArtifactFilter types = new OrArtifactFilter();
-            types.add(new DotnetAssemblyArtifactFilter());
-            if (resolvePdbs){
-                types.add(new DotnetSymbolsArtifactFilter());
+            if (!resolvePdbs){
+                filter.add(new InversionArtifactFilter(new 
DotnetSymbolsArtifactFilter()));
             }
 
-            dependencyResolution.require( project, LocalRepositoryUtil.create( 
localRepository ), requiredScope );
+            dependencyResolution.require( project, LocalRepositoryUtil.create( 
localRepository ), filter );
         }
         catch ( ArtifactResolutionException e )
         {

Modified: 
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java?rev=1495019&r1=1495018&r2=1495019&view=diff
==============================================================================
--- 
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
 (original)
+++ 
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
 Thu Jun 20 14:30:48 2013
@@ -239,7 +239,6 @@ public class TesterMojo
         {
             AndArtifactFilter filter = new AndArtifactFilter();
             filter.add(new ScopeArtifactFilter("test"));
-            filter.add(new DotnetAssemblyArtifactFilter());
 
             if (!resolvePdbs){
               filter.add(new InversionArtifactFilter(new 
DotnetSymbolsArtifactFilter()));

Reply via email to