Author: lcorneliussen Date: Mon May 7 16:52:57 2012 New Revision: 1335121 URL: http://svn.apache.org/viewvc?rev=1335121&view=rev Log: [NPANDAY-231] Remove RDF repository and model
o respect filter in listener and copy-dependencies Modified: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/NPandayResolutionListener.java incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java Modified: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java?rev=1335121&r1=1335120&r2=1335121&view=diff ============================================================================== --- incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java (original) +++ incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java Mon May 7 16:52:57 2012 @@ -66,8 +66,6 @@ public class DefaultNPandayArtifactResol private PlexusContainer container; - NPandayResolutionListener listener; - private Set<Artifact> customResolveCache = Sets.newHashSet(); public void resolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository ) throws @@ -98,8 +96,7 @@ public class DefaultNPandayArtifactResol ArtifactResolutionException, ArtifactNotFoundException { - listeners = intercept( listeners ); - + listeners = intercept( listeners, filter ); return original.resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, remoteRepositories, source, filter, @@ -109,11 +106,14 @@ public class DefaultNPandayArtifactResol - private List intercept( List listeners ) + private List intercept( List listeners, ArtifactFilter filter ) { if (listeners == null) listeners = Lists.newArrayList(); + NPandayResolutionListener listener = new NPandayResolutionListener(this, filter); + listener.enableLogging( getLogger() ); + listeners.add( listener ); return listeners; @@ -160,9 +160,6 @@ public class DefaultNPandayArtifactResol public void initialize() throws InitializationException { - listener = new NPandayResolutionListener(this); - listener.enableLogging( getLogger() ); - try { List list = container.lookupList( Modified: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/NPandayResolutionListener.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/NPandayResolutionListener.java?rev=1335121&r1=1335120&r2=1335121&view=diff ============================================================================== --- incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/NPandayResolutionListener.java (original) +++ incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/NPandayResolutionListener.java Mon May 7 16:52:57 2012 @@ -22,6 +22,7 @@ package npanday.resolver; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ResolutionListener; +import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.artifact.versioning.VersionRange; import org.codehaus.plexus.logging.AbstractLogEnabled; @@ -34,13 +35,21 @@ public class NPandayResolutionListener { private DefaultNPandayArtifactResolver resolver; - public NPandayResolutionListener( DefaultNPandayArtifactResolver resolver ) + private ArtifactFilter filter; + + public NPandayResolutionListener( DefaultNPandayArtifactResolver resolver, ArtifactFilter filter ) { this.resolver = resolver; + this.filter = filter; } public void testArtifact( Artifact node ) { + if ( filter != null && !filter.include( node ) ) + { + return; + } + try { resolver.runCustomResolvers( node ); Modified: incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java?rev=1335121&r1=1335120&r2=1335121&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java (original) +++ incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java Mon May 7 16:52:57 2012 @@ -20,6 +20,7 @@ package npanday.plugin.resolver; import com.google.common.base.Strings; +import npanday.ArtifactType; import npanday.LocalRepositoryUtil; import npanday.PathUtil; import npanday.registry.RepositoryRegistry; @@ -31,10 +32,8 @@ 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.ArtifactFilter; import org.apache.maven.artifact.resolver.filter.InversionArtifactFilter; import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter; -import org.apache.maven.artifact.resolver.filter.TypeArtifactFilter; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -95,7 +94,7 @@ public class CopyDependenciesMojo private NPandayDependencyResolution dependencyResolution; /** - * @parameter default-value="${project.build.directory}\.dependencies" + * @parameter default-value="${project.build.directory}\.references" */ private File outputDirectory; @@ -106,9 +105,25 @@ public class CopyDependenciesMojo public void execute() throws MojoExecutionException, MojoFailureException { + String skipReason = ""; + + if ( !skip ) + { + ArtifactType knownType = ArtifactType.getArtifactTypeForPackagingName( + project.getPackaging() + ); + + if ( knownType == null ) + { + skip = true; + skipReason = + ", because the current project (type:" + project.getPackaging() + ") is not build with NPanday"; + } + } + if ( skip ) { - getLog().info( "NPANDAY-158-001: Mojo for resolving dependencies was intentionally skipped" ); + getLog().info( "NPANDAY-158-001: Mojo for copying dependencies was intentionally skipped" + skipReason ); return; } @@ -121,16 +136,11 @@ public class CopyDependenciesMojo typeIncludes.add( new DotnetLibraryArtifactFilter() ); includeFilter.add( typeIncludes ); - if ( !Strings.isNullOrEmpty(includeScope)) + if ( !Strings.isNullOrEmpty( includeScope ) ) { includeFilter.add( new ScopeArtifactFilter( includeScope ) ); } - if ( !Strings.isNullOrEmpty(excludeScope)) - { - includeFilter.add( new InversionArtifactFilter( new ScopeArtifactFilter( excludeScope ) ) ); - } - Set<Artifact> artifacts; try { @@ -140,24 +150,40 @@ public class CopyDependenciesMojo } catch ( ArtifactResolutionException e ) { - throw new MojoExecutionException( "NPANDAY-158-003: dependency resolution for scope " + includeScope + " failed!", e ); + throw new MojoExecutionException( + "NPANDAY-158-003: dependency resolution for scope " + includeScope + " failed!", e + ); + } + + /** + * Should be resolved, but then not copied + */ + if ( !Strings.isNullOrEmpty( excludeScope ) ) + { + includeFilter.add( new InversionArtifactFilter( new ScopeArtifactFilter( excludeScope ) ) ); } + for ( Artifact dependency : artifacts ) + { + if ( !includeFilter.include( dependency ) ) + { + getLog().debug( "NPANDAY-158-006: dependency " + dependency + " was excluded" ); - for (Artifact dependency : artifacts) { - if (!includeFilter.include( dependency )){ continue; } - try { - File targetFile = new File(outputDirectory, PathUtil.getPlainArtifactFileName( dependency )); - if (!targetFile.exists()) { - getLog().debug("NPANDAY-158-004: copy dependency " + dependency + " to " + targetFile); + try + { + File targetFile = new File( outputDirectory, PathUtil.getPlainArtifactFileName( dependency ) ); + if ( !targetFile.exists() ) + { + getLog().debug( "NPANDAY-158-004: copy dependency " + dependency + " to " + targetFile ); FileUtils.copyFile( dependency.getFile(), targetFile ); } } - catch (IOException ioe) { - throw new MojoExecutionException("NPANDAY-158-005: Error copying dependency " + dependency, ioe); + catch ( IOException ioe ) + { + throw new MojoExecutionException( "NPANDAY-158-005: Error copying dependency " + dependency, ioe ); } } }