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/07/25 16:14:24 UTC
svn commit: r1365654 - in
/incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter:
./ generate/ model/
Author: lcorneliussen
Date: Wed Jul 25 16:14:24 2012
New Revision: 1365654
URL: http://svn.apache.org/viewvc?rev=1365654&view=rev
Log:
[NPANDAY-556] Importer for Nuget Packages
o better error messages, again
o lower-case package resolve (as nuget does)
o support packages with zero libs
Modified:
incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/LibImporterPathUtils.java
incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/generate/GeneratePackageArtifactsMojo.java
incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/model/NugetPackage.java
incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/model/NugetPackageLibrary.java
Modified: incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/LibImporterPathUtils.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/LibImporterPathUtils.java?rev=1365654&r1=1365653&r2=1365654&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/LibImporterPathUtils.java (original)
+++ incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/LibImporterPathUtils.java Wed Jul 25 16:14:24 2012
@@ -23,6 +23,7 @@ import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import org.apache.maven.plugin.MojoExecutionException;
import javax.annotation.Nullable;
import java.io.File;
@@ -39,6 +40,11 @@ public class LibImporterPathUtils
{
File libDir = new File( packageDir, "lib" );
Map<String, File> libDirs = Maps.newHashMap();
+ if ( !libDir.exists() )
+ {
+ return libDirs;
+ }
+
if ( getLibraries( libDir ).size() > 0 )
{
libDirs.put("lib", libDir );
Modified: incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/generate/GeneratePackageArtifactsMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/generate/GeneratePackageArtifactsMojo.java?rev=1365654&r1=1365653&r2=1365654&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/generate/GeneratePackageArtifactsMojo.java (original)
+++ incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/generate/GeneratePackageArtifactsMojo.java Wed Jul 25 16:14:24 2012
@@ -69,7 +69,16 @@ public class GeneratePackageArtifactsMoj
for ( NugetPackage nuget : nugetImports )
{
- nuget.resolveDependencies( nugetImports );
+ try
+ {
+ nuget.resolveDependencies( nugetImports );
+ }
+ catch (MojoExecutionException e)
+ {
+ throw new MojoExecutionException(
+ "NPANDAY-141-004: Could not satisfy dependency for " + nuget + ".", e
+ );
+ }
}
for ( NugetPackage nuget : nugetImports )
Modified: incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/model/NugetPackage.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/model/NugetPackage.java?rev=1365654&r1=1365653&r2=1365654&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/model/NugetPackage.java (original)
+++ incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/model/NugetPackage.java Wed Jul 25 16:14:24 2012
@@ -168,12 +168,6 @@ public class NugetPackage
else
{
libDirectories = LibImporterPathUtils.getLibDirectories( packageDir );
- if ( libDirectories.size() == 0 )
- {
- throw new MojoExecutionException(
- "NPANDAY-142-002: " + getName() + " doesn't seem to contain any libraries"
- );
- }
if ( libDirectories.size() > 1 )
{
throw new MojoExecutionException(
@@ -245,7 +239,7 @@ public class NugetPackage
NugetPackage highest = null;
for ( NugetPackage pkg : getKnownPackages() )
{
- if ( !pkg.getName().equals( depId ) )
+ if ( !pkg.getName().equalsIgnoreCase( depId ) )
{
continue;
}
Modified: incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/model/NugetPackageLibrary.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/model/NugetPackageLibrary.java?rev=1365654&r1=1365653&r2=1365654&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/model/NugetPackageLibrary.java (original)
+++ incubator/npanday/trunk/plugins/library-importer-maven-plugin/src/main/java/npanday/plugin/libraryimporter/model/NugetPackageLibrary.java Wed Jul 25 16:14:24 2012
@@ -198,8 +198,9 @@ public class NugetPackageLibrary
}
throw new MojoExecutionException(
- "NPANDAY-145-002: Could not find exact match for reference from " + nuget.getName() + "/" + name
- + " to " + exactPackageScope + "[" + ref.getStrongName() + "]" + help
+ "NPANDAY-145-002: Could not find exact match for reference from " + nuget + "/" + name
+ + " to " + exactPackageScope + "[" + ref.getStrongName() + "]; "
+ + "package-dependencies are: " + nuget.getDependencies() + help
);
}