Index: src/test/java/org/codehaus/mojo/webstart/generator/GeneratorTest.java =================================================================== --- src/test/java/org/codehaus/mojo/webstart/generator/GeneratorTest.java (revision 6924) +++ src/test/java/org/codehaus/mojo/webstart/generator/GeneratorTest.java (working copy) @@ -78,21 +78,22 @@ return artifact == artifact1; } }; + NativeLibResourcesGenerator nlrg = new NativeLibResourcesGenerator(mojo); - assertEquals("", Generator.getDependenciesText(mojo)); + assertEquals("", Generator.getDependenciesText(mojo, nlrg)); artifacts.add(artifact1); artifacts.add(artifact2); assertEquals("\n" + "\n\n", - Generator.getDependenciesText(mojo)); + Generator.getDependenciesText(mojo, nlrg)); mojo.setOutputJarVersions(true); assertEquals("\n" + "\n\n", - Generator.getDependenciesText(mojo)); + Generator.getDependenciesText(mojo, nlrg)); } @@ -121,21 +122,22 @@ return "lib"; } }; + NativeLibResourcesGenerator nlrg = new NativeLibResourcesGenerator(mojo); - assertEquals("", Generator.getDependenciesText(mojo)); + assertEquals("", Generator.getDependenciesText(mojo, nlrg)); artifacts.add(artifact1); artifacts.add(artifact2); assertEquals("\n" + "\n\n", - Generator.getDependenciesText(mojo)); + Generator.getDependenciesText(mojo, nlrg)); mojo.setOutputJarVersions(true); assertEquals("\n" + "\n\n", - Generator.getDependenciesText(mojo)); + Generator.getDependenciesText(mojo, nlrg)); } Index: src/main/java/org/codehaus/mojo/webstart/generator/NativeLibResourcesGenerator.java =================================================================== --- src/main/java/org/codehaus/mojo/webstart/generator/NativeLibResourcesGenerator.java (revision 0) +++ src/main/java/org/codehaus/mojo/webstart/generator/NativeLibResourcesGenerator.java (revision 0) @@ -0,0 +1,188 @@ +package org.codehaus.mojo.webstart.generator; + +/* + * Copyright 2005 Nick C + * + * Licensed under the Apache License, Version 2.0 (the "License" ); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.apache.maven.artifact.Artifact; +import org.codehaus.mojo.webstart.AbstractJnlpMojo; +import org.codehaus.mojo.webstart.NativeLib; +import org.codehaus.plexus.util.StringUtils; + +/** + * Generates the nativelib for JNLP deployment descriptor. + * + * @author David Bernard + * @author Trey Sleeper + */ +public class NativeLibResourcesGenerator { + + //private Collection nativeLibResources; + private AbstractJnlpMojo config; + private List nativeLibs; + + /** + * Creates a new {@code JarResources}. + * + * @param mavenProject + * The Maven project that this generator is being run within. + * @param resourceLoaderPath + * used to find the template in conjunction to + * inputFileTemplatePath + * @param outputFile + * @param templateFile + * relative to resourceLoaderPath + * @param jarResources + * The collection of JarResources that will be output in the JNLP + * file. + * @param mainClass + * The fully qualified name of the application's main class. + */ + public NativeLibResourcesGenerator(AbstractJnlpMojo config) { + this.config = config; + nativeLibs = config.getNativeLibs(); + config.verboseLog("initialize NativeLibResourcesGenerator"); + } + + public boolean isNativeJar(Artifact thisArtifact) { + NativeLib lib = getNativeLibSettings(thisArtifact); + boolean back = (lib != null); + config.verboseLog("is nativeLib '" + thisArtifact.toString() +"' : " + back ); + return back; + } + + private NativeLib getNativeLibSettings(Artifact thisArtifact) { + for (Iterator iter = nativeLibs.iterator(); iter.hasNext();) { + NativeLib nativeLib = (NativeLib) iter.next(); + if (thisArtifact.getGroupId().equalsIgnoreCase(nativeLib.groupId) && thisArtifact.getArtifactId().equalsIgnoreCase(nativeLib.artifactId)) { + if ((nativeLib.classifier == null) || nativeLib.classifier.equalsIgnoreCase(thisArtifact.getClassifier())) { + return nativeLib; + } + } + } + return null; + } + + public String getNativeDependenciesText() { + StringBuffer buffer = new StringBuffer(); + Map libsByOsArch = new HashMap(); + + List artifacts = config.getPackagedJnlpArtifacts(); + + String jarLibPath = getLibPath(); + + for (Iterator itr = artifacts.iterator(); itr.hasNext();) { + Artifact jarResource = (Artifact) itr.next(); + NativeLib nativeLibSettings = getNativeLibSettings(jarResource); + + // This is not a native artifact + if (nativeLibSettings == null) { + continue; + } + + OSArchKey key = new OSArchKey(nativeLibSettings.os, nativeLibSettings.arch, nativeLibSettings.locale); + List osArchJars = (List) libsByOsArch.get(key); + + if (osArchJars == null) { + osArchJars = new ArrayList(); + libsByOsArch.put(key, osArchJars); + } + osArchJars.add(jarResource); + } + + if (!libsByOsArch.isEmpty()) { + config.verboseLog("Start writing nativeLib"); + buffer.append("\n"); + + for (Iterator itr = libsByOsArch.keySet().iterator(); itr.hasNext();) { + OSArchKey key = (OSArchKey) itr.next(); + List jars = (List) libsByOsArch.get(key); + buffer.append("\n"); + + for (Iterator listItr = jars.iterator(); listItr.hasNext();) { + Artifact jarResource = (Artifact) listItr.next(); + buffer.append("\n"); + } + buffer.append("\n"); + } + } + + return buffer.toString(); + + } + + private String getLibPath() { + String jarLibPath = ""; + + if (config.getLibPath() != null) { + jarLibPath = config.getLibPath().trim(); + if (jarLibPath.length() > 0) + jarLibPath += "/"; + } + + return jarLibPath; + } + + static class OSArchKey { + public static final String[] osKnown = {"Windows", "Linux", "SunOs", "Mac OS X", "Mac OS", "Solaris"}; + + String os; + String arch; + String locale; + + public OSArchKey(String os, String arch, String locale) { + this.os = formatOs(os); + this.arch = arch; + this.locale = locale; + + } + + public String formatOs(String os) { + for(int i =0; i< osKnown.length; i++) { + if (osKnown[i].equalsIgnoreCase(os)) { + return osKnown[i]; + } + } + return os; + } + + } +} Index: src/main/java/org/codehaus/mojo/webstart/generator/Generator.java =================================================================== --- src/main/java/org/codehaus/mojo/webstart/generator/Generator.java (revision 6924) +++ src/main/java/org/codehaus/mojo/webstart/generator/Generator.java (working copy) @@ -17,7 +17,6 @@ */ import java.io.File; -import java.net.URL; import java.util.List; import org.apache.maven.artifact.Artifact; @@ -29,11 +28,13 @@ * * @author ngc * @author Jerome Lacoste + * @author David Bernard */ public class Generator extends AbstractGenerator { private AbstractJnlpMojo config; + private NativeLibResourcesGenerator nativeLibGen; /** * @param task @@ -54,7 +55,7 @@ super(mavenProject, resourceLoaderPath, defaultTemplateResourceName, outputFile, inputFileTemplatePath, mainClass, webstartJarURL ); this.config = task; - + nativeLibGen = new NativeLibResourcesGenerator(config); } /** @@ -62,10 +63,13 @@ */ protected String getDependenciesText() { - return getDependenciesText( config ); + return getDependenciesText(config, nativeLibGen); } - static String getDependenciesText( AbstractJnlpMojo config ) + /** + * {@inheritDoc} + */ + public static String getDependenciesText(AbstractJnlpMojo config, NativeLibResourcesGenerator nativeLibGen) { String dependenciesText = ""; List artifacts = config.getPackagedJnlpArtifacts(); @@ -82,6 +86,9 @@ for (int i = 0; i < artifacts.size(); i++) { Artifact artifact = (Artifact)artifacts.get(i); + if (nativeLibGen.isNativeJar(artifact)) { + continue; + } buffer.append("