Fixed NAR-5 and NAR-98

13 files changed, 353 insertions, 16 deletions

diff --git a/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml b/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml
new file mode 100644
index 0000000..997ec91
--- /dev/null
+++ b/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.its.nar</groupId>
+    <artifactId>it0014-pom</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>it0014-jni-dep-lib-shared</artifactId>
+  <packaging>nar</packaging>
+  
+  <name>Maven NAR JNI and Shared Library</name>
+  <version>1.0-SNAPSHOT</version>
+  <description>
+    JNI depending on a shared library.
+  </description>
+
+  <properties>
+    <skipTests>true</skipTests>
+  </properties>
+
+  <build>
+    <defaultGoal>integration-test</defaultGoal>
+    <plugins>
+      <plugin>
+        <artifactId>maven-nar-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <libraries>
+            <library>
+              <type>jni</type>
+              <narSystemPackage>it0014</narSystemPackage>
+              <linkCPP>false</linkCPP>
+            </library>
+          </libraries>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.nar</groupId>
+      <artifactId>it0014-lib-shared</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c b/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c
new file mode 100644
index 0000000..852f84e
--- /dev/null
+++ b/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+#include <stdio.h>
+#include "HelloWorldLib.h"
+
+#include "it0014_HelloWorldSharedLibJNI.h"
+
+JNIEXPORT jstring JNICALL Java_it0014_HelloWorldSharedLibJNI_sayHello( JNIEnv *env, jobject obj ) {
+	jstring value;           /* the return value */
+
+	char buf[80];            /* working buffer (really only need 20 ) */
+
+	sprintf ( buf, "%s", HelloWorldLib_sayHello());
+
+	value = (*env)->NewStringUTF( env, buf );
+
+	return value;
+}
+
diff --git a/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/main/java/it0014/HelloWorldSharedLibJNI.java b/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/main/java/it0014/HelloWorldSharedLibJNI.java
new file mode 100644
index 0000000..a6959ae
--- /dev/null
+++ b/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/main/java/it0014/HelloWorldSharedLibJNI.java
@@ -0,0 +1,36 @@
+package it0014;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+public class HelloWorldSharedLibJNI
+{
+    static
+    {
+        NarSystem.loadLibrary();
+    }
+
+    public native String sayHello();
+
+    public static void main( String[] args )
+    {
+        HelloWorldSharedLibJNI app = new HelloWorldSharedLibJNI();
+        System.out.println( app.sayHello() );
+    }
+}
diff --git a/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/test/java/it0014/test/HelloWorldSharedLibJNITest.java b/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/test/java/it0014/test/HelloWorldSharedLibJNITest.java
new file mode 100644
index 0000000..4d55410
--- /dev/null
+++ b/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/test/java/it0014/test/HelloWorldSharedLibJNITest.java
@@ -0,0 +1,36 @@
+package it0014.test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 it0014.HelloWorldSharedLibJNI;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class HelloWorldSharedLibJNITest
+{
+    @Test
+    public void testNativeHelloWorldSharedLibJNI()
+        throws Exception
+    {
+        HelloWorldSharedLibJNI app = new HelloWorldSharedLibJNI();
+
+        Assert.assertEquals( "Hello NAR LIB World!", app.sayHello() );
+    }
+}
diff --git a/src/it/it0014-multi-module/it0014-lib-shared/pom.xml b/src/it/it0014-multi-module/it0014-lib-shared/pom.xml
new file mode 100644
index 0000000..d18fb04
--- /dev/null
+++ b/src/it/it0014-multi-module/it0014-lib-shared/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.its.nar</groupId>
+    <artifactId>it0014-pom</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>it0014-lib-shared</artifactId>
+  <packaging>nar</packaging>
+  
+  <name>Maven NAR Shared Library</name>
+  <version>1.0-SNAPSHOT</version>  
+  <description>
+    Simple shared library and test file
+  </description>
+  <url>http://maven.apache.org/</url>
+
+  <properties>
+    <skipTests>true</skipTests>
+  </properties>
+  
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <plugins>
+      <plugin>
+        <artifactId>maven-nar-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <libraries>
+            <library>
+              <type>shared</type>
+            </library>
+          </libraries>
+          <tests>
+            <test>
+              <name>HelloWorldTest</name>
+              <link>shared</link>
+            </test>
+          </tests>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/it/it0014-multi-module/it0014-lib-shared/src/main/c/HelloWorldLib.c b/src/it/it0014-multi-module/it0014-lib-shared/src/main/c/HelloWorldLib.c
new file mode 100644
index 0000000..9f65143
--- /dev/null
+++ b/src/it/it0014-multi-module/it0014-lib-shared/src/main/c/HelloWorldLib.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+#include "HelloWorldLib.h"
+
+char* HelloWorldLib_sayHello() {
+	return "Hello NAR LIB World!";
+}
+
diff --git a/src/it/it0014-multi-module/it0014-lib-shared/src/main/include/HelloWorldLib.h b/src/it/it0014-multi-module/it0014-lib-shared/src/main/include/HelloWorldLib.h
new file mode 100644
index 0000000..e801bec
--- /dev/null
+++ b/src/it/it0014-multi-module/it0014-lib-shared/src/main/include/HelloWorldLib.h
@@ -0,0 +1,9 @@
+#ifndef HelloWorldLib_H
+#define HelloWorldLib_H
+
+#ifdef WIN32
+__declspec(dllexport) 
+#endif
+extern char* HelloWorldLib_sayHello();
+
+#endif
diff --git a/src/it/it0014-multi-module/it0014-lib-shared/src/test/c/HelloWorldTest.c b/src/it/it0014-multi-module/it0014-lib-shared/src/test/c/HelloWorldTest.c
new file mode 100644
index 0000000..4aa35d8
--- /dev/null
+++ b/src/it/it0014-multi-module/it0014-lib-shared/src/test/c/HelloWorldTest.c
@@ -0,0 +1,9 @@
+#include <stdio.h>
+#include "HelloWorldLib.h"
+
+int main(int argc, char *argv[]) {
+	printf("%s\n", HelloWorldLib_sayHello());
+	return 0;
+}
+
+
diff --git a/src/it/it0014-multi-module/pom.xml b/src/it/it0014-multi-module/pom.xml
new file mode 100644
index 0000000..a87aad6
--- /dev/null
+++ b/src/it/it0014-multi-module/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.its.nar</groupId>
+    <artifactId>it-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <relativePath>../it-parent/pom.xml</relativePath>
+  </parent>
+
+  <artifactId>it0014-pom</artifactId>
+  <packaging>pom</packaging>
+  
+  <name>Maven NAR Multi Module</name>
+  <version>1.0-SNAPSHOT</version>  
+  <description>
+    Simple Multi Module project
+  </description>
+  <url>http://maven.apache.org/</url>
+
+  <build>
+    <defaultGoal>install</defaultGoal>
+  </build>
+
+  <modules>
+    <module>it0014-jni-dep-lib-shared</module>
+    <module>it0014-lib-shared</module>
+  </modules>
+</project>
diff --git a/src/main/java/org/apache/maven/plugin/nar/Library.java b/src/main/java/org/apache/maven/plugin/nar/Library.java
index 5785ac6..5b8959b 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Library.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Library.java
@@ -87,7 +87,7 @@ public class Library
      * @parameter expression="${project.build.dir}/nar/nar-generated"
      * @required
      */
-    protected File narSystemDirectory = new File( "target/nar/nar-generated" );
+    protected String narSystemDirectory = "target/nar/nar-generated";
 
     /**
      * When true and if type is "executable" run this executable. Defaults to false;
@@ -139,7 +139,7 @@ public class Library
         return narSystemName;
     }
 
-    public File getNarSystemDirectory()
+    public String getNarSystemDirectory()
     {
         return narSystemDirectory;
     }
diff --git a/src/main/java/org/apache/maven/plugin/nar/Linker.java b/src/main/java/org/apache/maven/plugin/nar/Linker.java
index 5d9069f..2bfc6aa 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Linker.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Linker.java
@@ -179,28 +179,38 @@ public class Linker
             throw new MojoFailureException( "Cannot deduce linker version if name is null" );
 
         String version = null;
-        
+
         TextStream out = new StringTextStream();
         TextStream err = new StringTextStream();
         TextStream dbg = new StringTextStream();
 
         if ( name.equals( "g++" ) || name.equals( "gcc" ) )
         {
-            NarUtil.runCommand( "gcc", new String[] { "--version" }, null, null, out, err, dbg );
+            int r = NarUtil.runCommand( "gcc", new String[] { "--version" }, null, null, out, err, dbg );
             Pattern p = Pattern.compile( "\\d+\\.\\d+\\.\\d+" );
             Matcher m = p.matcher( out.toString() );
-            if (m.find()) {
+            if ( m.find() )
+            {
                 version = m.group( 0 );
             }
+            else
+            {
+                throw new MojoFailureException( "Cannot deduce version number from: " + out );
+            }
         }
         else if ( name.equals( "msvc" ) )
         {
-            NarUtil.runCommand( "link", new String[] { "/version" }, null, null, out, err, dbg );
+            int r = NarUtil.runCommand( "link", new String[] { "/version" }, null, null, out, err, dbg );
             Pattern p = Pattern.compile( "\\d+\\.\\d+\\.\\d+" );
             Matcher m = p.matcher( out.toString() );
-            if (m.find()) {
+            if ( m.find() )
+            {
                 version = m.group( 0 );
             }
+            else
+            {
+                throw new MojoFailureException( "Cannot deduce version number from: " + out );
+            }
         }
         else
         {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarSystemGenerate.java b/src/main/java/org/apache/maven/plugin/nar/NarSystemGenerate.java
index 84db06e..988300d 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarSystemGenerate.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarSystemGenerate.java
@@ -49,8 +49,9 @@ public class NarSystemGenerate
         // get packageName if specified for JNI.
         String packageName = null;
         String narSystemName = null;
-        File narSystemDirectory = null;
-        for ( Iterator i = getLibraries().iterator(); i.hasNext() && ( packageName == null ); )
+        String narSystemDirectory = null;
+        boolean jniFound = false;
+        for ( Iterator i = getLibraries().iterator(); !jniFound && i.hasNext(); )
         {
             Library library = (Library) i.next();
             if ( library.getType().equals( Library.JNI ) )
@@ -58,18 +59,21 @@ public class NarSystemGenerate
                 packageName = library.getNarSystemPackage();
                 narSystemName = library.getNarSystemName();
                 narSystemDirectory = library.getNarSystemDirectory();
+                jniFound = true;
             }
         }
-
-        if ( packageName == null )
+        
+        if ( !jniFound )
             return;
 
+        File narSystemTarget = new File(getMavenProject().getBasedir(), narSystemDirectory);
+
         // make sure destination is there
-        narSystemDirectory.mkdirs();
+        narSystemTarget.mkdirs();
 
-        getMavenProject().addCompileSourceRoot( narSystemDirectory.getPath() );
+        getMavenProject().addCompileSourceRoot( narSystemTarget.getPath() );
 
-        File fullDir = new File( narSystemDirectory, packageName.replace( '.', '/' ) );
+        File fullDir = new File( narSystemTarget, packageName.replace( '.', '/' ) );
         fullDir.mkdirs();
 
         File narSystem = new File( fullDir, narSystemName + ".java" );
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarTestMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarTestMojo.java
index 46b7dae..3dd89ff 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarTestMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarTestMojo.java
@@ -80,10 +80,13 @@ public class NarTestMojo
         {
             String name = "target/test-nar/bin/" + getAOL() + "/" + test.getName();
             getLog().info( "Running test " + name );
+
+            File workingDir = getMavenProject().getBasedir();
+            getLog().info( "  in " + workingDir );
             List args = test.getArgs();
             int result =
                 NarUtil.runCommand( getMavenProject().getBasedir() + "/" + name,
-                                    (String[]) args.toArray( new String[args.size()] ), null, 
+                                    (String[]) args.toArray( new String[args.size()] ), workingDir,
                                     generateEnvironment( test, getLog() ), getLog() );
             if ( result != 0 )
                 throw new MojoFailureException( "Test " + name + " failed with exit code: " + result + " 0x"
@@ -102,7 +105,7 @@ public class NarTestMojo
             List args = library.getArgs();
             int result =
                 NarUtil.runCommand( project.getBasedir() + "/" + name,
-                                    (String[]) args.toArray( new String[args.size()] ), null, 
+                                    (String[]) args.toArray( new String[args.size()] ), null,
                                     generateEnvironment( library, getLog() ), getLog() );
             if ( result != 0 )
                 throw new MojoFailureException( "Test " + name + " failed with exit code: " + result + " 0x"