Author: lcorneliussen
Date: Tue Jun 11 16:24:34 2013
New Revision: 1491864
URL: http://svn.apache.org/r1491864
Log:
[NPANDAY-402]: Add support to automatically attach PDB-symbols and
Code-Documentation (comment.xml)
o some more logging
o copy the scope from the leading artifact
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactTypeHelper.java
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/resolvers/PdbAssemblyResolver.java
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactTypeHelper.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactTypeHelper.java?rev=1491864&r1=1491863&r2=1491864&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactTypeHelper.java
(original)
+++
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactTypeHelper.java
Tue Jun 11 16:24:34 2013
@@ -139,4 +139,12 @@ public class ArtifactTypeHelper
return artifactType.equals( ArtifactType.COM_REFERENCE );
}
+ public static boolean isDotnetLibraryOrExecutable(ArtifactType
artifactType) {
+ return isDotnetLibrary(artifactType) ||
isDotnetExecutable(artifactType);
+ }
+
+ public static boolean isDotnetLibraryOrExecutable(String packaging)
+ {
+ return isDotnetLibraryOrExecutable(
ArtifactType.getArtifactTypeForPackagingName( packaging ) );
+ }
}
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=1491864&r1=1491863&r2=1491864&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 Jun 11 16:24:34 2013
@@ -170,7 +170,7 @@ public class DefaultNPandayArtifactResol
"NPANDAY-147-001: " + contributor.getClass().getName() + "
resolved " + artifact.getId() + " to "
+ artifact.getFile()
);
-
+
if ( additionalDependenciesCollector.size() > 0 )
{
addContributeArtifactsToDependenciesCache(additionalDependenciesCollector);
@@ -178,7 +178,6 @@ public class DefaultNPandayArtifactResol
return;
}
}
-
}
protected void runCustomDependencyContributors(Artifact artifact,
ArtifactRepository localRepository, List remoteRepositories) throws
ArtifactNotFoundException
@@ -187,10 +186,14 @@ public class DefaultNPandayArtifactResol
{
throw new IllegalArgumentException(
String.format("NPANDAY-147-008: Artifact[groupId:'%s',
artifactId:'%s', type:'%s', version:'%s']" +
- " could not be unresoved",
+ " could not be unresolved",
artifact.getGroupId(), artifact.getArtifactId(),
artifact.getType(), artifact.getVersion()));
}
+ getLogger().debug(
+ "NPANDAY-147-009: trying to find complementary artifacts for "
+ artifact.getId() + " using resolving contributors"
+ );
+
for ( ArtifactResolvingContributor contributor : contributors )
{
Set<Artifact> additionalDependenciesCollector = Sets.newHashSet();
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/resolvers/PdbAssemblyResolver.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/resolvers/PdbAssemblyResolver.java?rev=1491864&r1=1491863&r2=1491864&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/resolvers/PdbAssemblyResolver.java
(original)
+++
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/resolvers/PdbAssemblyResolver.java
Tue Jun 11 16:24:34 2013
@@ -45,8 +45,7 @@ public class PdbAssemblyResolver extends
final ArtifactType artifactType =
ArtifactType.getArtifactTypeForPackagingName(artifact.getType());
if ( !ArtifactTypeHelper.isDotnetAnyGac(artifactType) &&
!ArtifactTypeHelper.isComReference(artifactType) &&
- artifactType != ArtifactType.NULL &&
- artifactType != ArtifactType.DOTNET_SYMBOLS)
+ ArtifactTypeHelper.isDotnetLibraryOrExecutable(artifactType))
{
tryResolveArtifactPdbAssembly(artifact, localRepository,
remoteRepositories,
additionalDependenciesCollector);
@@ -67,21 +66,18 @@ public class PdbAssemblyResolver extends
{
Artifact pdbArtifact =
artifactFactory.createArtifactWithClassifier(artifact.getGroupId(),
artifact.getArtifactId(),
artifact.getVersion(),
ArtifactType.DOTNET_SYMBOLS.getPackagingType(), artifact.getClassifier());
- boolean pdbArtifactFound = true;
try {
mavenResolver.resolve(pdbArtifact, remoteRepositories,
localRepository);
+
+ // the complimentary artifact should have the same scope as the
leading one
+ pdbArtifact.setScope(artifact.getScope());
+
+ getLogger().debug("NPANDAY-157-001: found a pdb for " +
artifact.getId());
+ additionalDependenciesCollector.add(pdbArtifact);
} catch (ArtifactNotFoundException e) {
- // Ignore PDF assembly not found exception
- pdbArtifactFound = false;
+ getLogger().debug("NPANDAY-157-002: no pdb found for " +
artifact.getId());
} catch (ArtifactResolutionException e) {
throw new ArtifactNotFoundException(e.getMessage(), artifact);
}
-
- if (pdbArtifactFound)
- {
- additionalDependenciesCollector.add(pdbArtifact);
- }
-
}
-
}
