From 3b4145fc7829fe7d6023d9da5e7497f26c7df863 Mon Sep 17 00:00:00 2001
From: Mark Donszelmann <Mark.Donszelmann@gmail.com>
Date: Mon, 5 Oct 2009 11:36:11 +0200
Subject: Added test it0006-jni-3rdparty

---
 pom.xml                                            |   2 +-
 src/it/it0006-jni-3rdparty/pom.xml                 |  69 +++++++++++++++++++++
 .../lib/libit0003-jni-1.0-SNAPSHOT.jnilib          | Bin 0 -> 8648 bytes
 .../share/it0003-jni-1.0-SNAPSHOT.jar              | Bin 0 -> 4450 bytes
 .../src/test/java/HelloThirdPartyJNITest.java      |  25 ++++++++
 src/site/apt/HelloWorld.apt                        |  15 +++--
 6 files changed, 105 insertions(+), 6 deletions(-)
 create mode 100644 src/it/it0006-jni-3rdparty/pom.xml
 create mode 100755 src/it/it0006-jni-3rdparty/src/nar/resources/aol/x86_64-MacOSX-g++/lib/libit0003-jni-1.0-SNAPSHOT.jnilib
 create mode 100644 src/it/it0006-jni-3rdparty/src/nar/resources/aol/x86_64-MacOSX-g++/share/it0003-jni-1.0-SNAPSHOT.jar
 create mode 100644 src/it/it0006-jni-3rdparty/src/test/java/HelloThirdPartyJNITest.java

diff --git a/pom.xml b/pom.xml
index 39282f7..3c81a99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>net.sf.antcontrib</groupId>
       <artifactId>cpptasks-parallel</artifactId>
-      <version>1.0-beta-4-parallel-3-SNAPSHOT</version>
+      <version>1.0-beta-4-parallel-4</version>
     </dependency>
     <dependency>
       <groupId>bcel</groupId>
diff --git a/src/it/it0006-jni-3rdparty/pom.xml b/src/it/it0006-jni-3rdparty/pom.xml
new file mode 100644
index 0000000..65602e6
--- /dev/null
+++ b/src/it/it0006-jni-3rdparty/pom.xml
@@ -0,0 +1,69 @@
+<?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>it0006-jni-3rdparty</artifactId>
+  <packaging>nar</packaging>
+  
+  <name>Maven NAR Third Party JNI</name>
+  <version>1.0-SNAPSHOT</version>
+  <description>
+    Java class that uses a 3rd party JNI and its library
+  </description>  
+  <url>http://maven.apache.org/</url>
+<!--
+  <properties>
+    <maven.test.skip>true</maven.test.skip>
+  </properties>
+-->  
+
+  <build>
+    <defaultGoal>integration-test</defaultGoal>
+    <plugins>
+      <plugin>
+        <artifactId>maven-nar-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <libraries>
+            <library>
+              <type>jni</type>
+            </library>
+          </libraries>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/it/it0006-jni-3rdparty/src/nar/resources/aol/x86_64-MacOSX-g++/lib/libit0003-jni-1.0-SNAPSHOT.jnilib b/src/it/it0006-jni-3rdparty/src/nar/resources/aol/x86_64-MacOSX-g++/lib/libit0003-jni-1.0-SNAPSHOT.jnilib
new file mode 100755
index 0000000..b7e52a4
Binary files /dev/null and b/src/it/it0006-jni-3rdparty/src/nar/resources/aol/x86_64-MacOSX-g++/lib/libit0003-jni-1.0-SNAPSHOT.jnilib differ
diff --git a/src/it/it0006-jni-3rdparty/src/nar/resources/aol/x86_64-MacOSX-g++/share/it0003-jni-1.0-SNAPSHOT.jar b/src/it/it0006-jni-3rdparty/src/nar/resources/aol/x86_64-MacOSX-g++/share/it0003-jni-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000..f2e29f5
Binary files /dev/null and b/src/it/it0006-jni-3rdparty/src/nar/resources/aol/x86_64-MacOSX-g++/share/it0003-jni-1.0-SNAPSHOT.jar differ
diff --git a/src/it/it0006-jni-3rdparty/src/test/java/HelloThirdPartyJNITest.java b/src/it/it0006-jni-3rdparty/src/test/java/HelloThirdPartyJNITest.java
new file mode 100644
index 0000000..3ef06f3
--- /dev/null
+++ b/src/it/it0006-jni-3rdparty/src/test/java/HelloThirdPartyJNITest.java
@@ -0,0 +1,25 @@
+import junit.framework.*;
+
+import com.mycompany.mypackage.HelloWorldJNI;
+
+public class HelloThirdPartyJNITest extends TestCase {
+
+    public HelloThirdPartyJNITest(String name) {
+      super(name);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void testNativeHelloThirdPartyJNI() throws Exception {
+        HelloWorldJNI app = new HelloWorldJNI();
+        
+        this.assertEquals( "Hello NAR World!", app.sayHello() );
+    }
+}
+
diff --git a/src/site/apt/HelloWorld.apt b/src/site/apt/HelloWorld.apt
index 08138d3..2320979 100644
--- a/src/site/apt/HelloWorld.apt
+++ b/src/site/apt/HelloWorld.apt
@@ -19,15 +19,20 @@ There are also some unit test which are run and call the same method.
 
 	[]
 
-	[jni] A C routine called from Java and a Java unit test.
+	[jni] A C routine called from Java.
 	
 	[java-dep-jni] A java project which depends on "jni". 
 
-	[helloworldstaticjni] A C routine called from Java statically linked with the C-runtime library and a Java unit test.
+	[jni-static] A C routine called from Java statically linked with the C-runtime library.
 	
-	[hellothirdpartyjni] A third party JNI library called from Java.
-	The third party library is "jni" and is added as resource to the project in the 
-	form of a JNI library and a corresponding jar file. A Java unit test is provided.
+	[jni-3rdparty] A third party JNI library called from Java.
+	The third party library is the "jni" from the example above and is added as resource to the project in the 
+	form of a JNI library and a corresponding jar file. The "jni" lib is currently provided for the following
+	platforms:
+	
+	* x86_64-MacOSX-g++
+	
+	[]
 	
 	[]
 
-- 
cgit v1.2.3