From 11d70333d325cd542f4c44f2b62a1e1e242b058d Mon Sep 17 00:00:00 2001 From: Volker Schumacher Date: Fri, 18 Dec 2009 14:38:15 +0800 Subject: NarAssemblyMojo: when classifiers not specified, assume all available classifiers. --- .../org/apache/maven/plugin/nar/NarManager.java | 30 +++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'src/main/java/org/apache/maven/plugin/nar/NarManager.java') diff --git a/src/main/java/org/apache/maven/plugin/nar/NarManager.java b/src/main/java/org/apache/maven/plugin/nar/NarManager.java index 19cbeff..476eee8 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarManager.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarManager.java @@ -120,7 +120,7 @@ public class NarManager public final List/* */getAttachedNarDependencies( List/* */narArtifacts ) throws MojoExecutionException, MojoFailureException { - return getAttachedNarDependencies( narArtifacts, null ); + return getAttachedNarDependencies( narArtifacts, ( String )null ); } public final List/* */getAttachedNarDependencies( List/* */narArtifacts, @@ -146,6 +146,34 @@ public class NarManager return getAttachedNarDependencies( narArtifacts, aol, type ); } + public final List/* */getAttachedNarDependencies( + List/* */narArtifacts, List classifiers) + throws MojoExecutionException, MojoFailureException + { + String[] types; + + List artifactList = new ArrayList(); + + if( classifiers != null && !classifiers.isEmpty() ) + { + types = (String[]) classifiers.toArray(); + + for ( int j = 0; j < types.length; j++ ) + { + if ( artifactList != null ) + { + artifactList.addAll( getAttachedNarDependencies( narArtifacts, types[j] )); + } + } +} + else + { + artifactList.addAll( getAttachedNarDependencies( narArtifacts, ( String )null )); + } + + return artifactList; + } + /** * Returns a list of all attached nar dependencies for a specific binding and "noarch", but not where "local" is * specified -- cgit v1.2.3