You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by lc...@apache.org on 2012/05/15 07:01:09 UTC
svn commit: r1338563 - in /incubator/npanday/trunk:
components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java
plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java
Author: lcorneliussen
Date: Tue May 15 07:01:08 2012
New Revision: 1338563
URL: http://svn.apache.org/viewvc?rev=1338563&view=rev
Log:
[NPANDAY-566] Custom copy dependencies plugin
o some more logging
o skip copy-dependencies on non-npanday projects
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.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=1338563&r1=1338562&r2=1338563&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 Tue May 15 07:01:08 2012
@@ -126,36 +126,40 @@ public class DefaultNPandayArtifactResol
protected void runCustomResolvers( Artifact artifact ) throws ArtifactNotFoundException
{
- if ( contributors == null || contributors.length == 0 )
+ if ( artifact.isResolved() )
{
- contributors = new ArtifactResolvingContributor[]{ new GacResolver() };
+ return;
}
+ getLogger().debug(
+ "NPANDAY-147-007: trying to resolve " + artifact.getId() + " using resolving contributors"
+ );
+
for ( ArtifactResolvingContributor contributor : contributors )
{
- if ( !artifact.isResolved() )
+
+ Set<Artifact> additionalDependenciesCollector = Sets.newHashSet();
+ contributor.contribute( artifact, additionalDependenciesCollector );
+
+ if ( additionalDependenciesCollector.size() > 0 )
{
- Set<Artifact> additionalDependenciesCollector = Sets.newHashSet();
- contributor.contribute( artifact, additionalDependenciesCollector);
+ getLogger().error(
+ "NPANDAY-147-006: " + artifact.getId()
+ + " required additional dependencies to be added, but we do not support that yet."
+ );
+ }
- if (additionalDependenciesCollector.size() > 0){
- getLogger().error(
- "NPANDAY-147-006: " + artifact.getId()
- + " required additional dependencies to be added, but we do not support that yet."
- );
- }
-
- if ( artifact.isResolved() )
- {
- customResolveCache.add( artifact );
-
- getLogger().info(
- "NPANDAY-147-001: " + contributor.getClass().getName() + " resolved " + artifact.getId()
- + " to " + artifact.getFile()
- );
- }
+ if ( artifact.isResolved() )
+ {
+ customResolveCache.add( artifact );
+
+ getLogger().info(
+ "NPANDAY-147-001: " + contributor.getClass().getName() + " resolved " + artifact.getId() + " to "
+ + artifact.getFile()
+ );
}
}
+
}
public void initialize() throws InitializationException
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=1338563&r1=1338562&r2=1338563&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 Tue May 15 07:01:08 2012
@@ -113,7 +113,7 @@ public class CopyDependenciesMojo
project.getPackaging()
);
- if ( knownType == null )
+ if ( knownType.equals( ArtifactType.NULL ))
{
skip = true;
skipReason =