summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-10-03 16:24:14 +0200
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-10-03 16:24:14 +0200
commita5f5d1479039db6bd093ffa828d975cd00e45ea6 (patch)
tree814fb2838b5cca0491ea559e5c8cbf619fad1040
parent1b3f5eb617863b4d4c2e1c29b48a1efba2bdf5ff (diff)
downloadmaven-nar-plugin-a5f5d1479039db6bd093ffa828d975cd00e45ea6.tar.gz
maven-nar-plugin-a5f5d1479039db6bd093ffa828d975cd00e45ea6.tar.bz2
maven-nar-plugin-a5f5d1479039db6bd093ffa828d975cd00e45ea6.tar.xz
maven-nar-plugin-a5f5d1479039db6bd093ffa828d975cd00e45ea6.zip
Added test 4
-rw-r--r--ReleaseNotes.txt2
-rw-r--r--pom.xml2
-rw-r--r--src/it/it0004-java-dep-jni/java-dep-jni/pom.xml62
-rw-r--r--src/it/it0004-java-dep-jni/java-dep-jni/src/test/java/HelloWorldJavaDepJNITest.java25
-rw-r--r--src/it/it0004-java-dep-jni/jni/pom.xml71
-rw-r--r--src/it/it0004-java-dep-jni/jni/src/main/c/HelloWorldJNI.c16
-rw-r--r--src/it/it0004-java-dep-jni/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java15
-rw-r--r--src/it/it0004-java-dep-jni/jni/src/test/java/HelloWorldJNITest.java25
-rw-r--r--src/it/it0004-java-dep-jni/pom.xml49
9 files changed, 266 insertions, 1 deletions
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 369f297..1c96a0a 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -13,6 +13,8 @@ and cpptasks-parallel.
Bugs
+- Goal for Tests should be Install.
+
- Excecutable needs a test to run and verify the output of Executable.
- Resource directory seems in GIT while it should not, it should be generated in target
diff --git a/pom.xml b/pom.xml
index ee721d6..39282f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
<goals>
<goal>clean</goal>
- <goal>integration-test</goal>
+ <goal>install</goal>
</goals>
</configuration>
<executions>
diff --git a/src/it/it0004-java-dep-jni/java-dep-jni/pom.xml b/src/it/it0004-java-dep-jni/java-dep-jni/pom.xml
new file mode 100644
index 0000000..60c325e
--- /dev/null
+++ b/src/it/it0004-java-dep-jni/java-dep-jni/pom.xml
@@ -0,0 +1,62 @@
+<?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>it0004-pom</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>it0004-java-dep-jni</artifactId>
+ <packaging>nar</packaging>
+
+ <name>Maven NAR Java Class</name>
+ <description>
+ Java class
+ </description>
+
+ <build>
+ <defaultGoal>integration-test</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-nar-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.nar</groupId>
+ <artifactId>it0004-jni</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/it/it0004-java-dep-jni/java-dep-jni/src/test/java/HelloWorldJavaDepJNITest.java b/src/it/it0004-java-dep-jni/java-dep-jni/src/test/java/HelloWorldJavaDepJNITest.java
new file mode 100644
index 0000000..50961c9
--- /dev/null
+++ b/src/it/it0004-java-dep-jni/java-dep-jni/src/test/java/HelloWorldJavaDepJNITest.java
@@ -0,0 +1,25 @@
+import junit.framework.*;
+
+import com.mycompany.mypackage.HelloWorldJNI;
+
+public class HelloWorldJavaDepJNITest extends TestCase {
+
+ public HelloWorldJavaDepJNITest(String name) {
+ super(name);
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testNativeHelloWorldJavaDepJNI() throws Exception {
+ HelloWorldJNI app = new HelloWorldJNI();
+
+ this.assertEquals( "Hello NAR World!", app.sayHello() );
+ }
+}
+
diff --git a/src/it/it0004-java-dep-jni/jni/pom.xml b/src/it/it0004-java-dep-jni/jni/pom.xml
new file mode 100644
index 0000000..6f9e652
--- /dev/null
+++ b/src/it/it0004-java-dep-jni/jni/pom.xml
@@ -0,0 +1,71 @@
+<?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>it0004-pom</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>it0004-jni</artifactId>
+ <packaging>nar</packaging>
+
+ <name>Maven NAR JNI Test</name>
+ <description>
+ Simple JNI 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>
+ <cpp>
+ <debug>true</debug>
+ </cpp>
+ <libraries>
+ <library>
+ <type>jni</type>
+ <narSystemPackage>com.mycompany.mypackage</narSystemPackage>
+ <linkCPP>false</linkCPP>
+ </library>
+ </libraries>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/it0004-java-dep-jni/jni/src/main/c/HelloWorldJNI.c b/src/it/it0004-java-dep-jni/jni/src/main/c/HelloWorldJNI.c
new file mode 100644
index 0000000..716722e
--- /dev/null
+++ b/src/it/it0004-java-dep-jni/jni/src/main/c/HelloWorldJNI.c
@@ -0,0 +1,16 @@
+#include <stdio.h>
+#include "com_mycompany_mypackage_HelloWorldJNI.h"
+
+JNIEXPORT jstring JNICALL Java_com_mycompany_mypackage_HelloWorldJNI_sayHello( JNIEnv *env, jobject obj ) {
+ jstring value; /* the return value */
+
+ char buf[40]; /* working buffer (really only need 20 ) */
+
+
+ sprintf ( buf, "%s", "Hello NAR World!" );
+
+ value = (*env)->NewStringUTF( env, buf );
+
+ return value;
+}
+
diff --git a/src/it/it0004-java-dep-jni/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java b/src/it/it0004-java-dep-jni/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java
new file mode 100644
index 0000000..2af3f3c
--- /dev/null
+++ b/src/it/it0004-java-dep-jni/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java
@@ -0,0 +1,15 @@
+package com.mycompany.mypackage;
+
+public class HelloWorldJNI {
+ static {
+ NarSystem.loadLibrary();
+ }
+
+ public native String sayHello();
+
+ public static void main( String[] args ) {
+ HelloWorldJNI app = new HelloWorldJNI();
+ System.out.println( app.sayHello() );
+ }
+}
+
diff --git a/src/it/it0004-java-dep-jni/jni/src/test/java/HelloWorldJNITest.java b/src/it/it0004-java-dep-jni/jni/src/test/java/HelloWorldJNITest.java
new file mode 100644
index 0000000..683c321
--- /dev/null
+++ b/src/it/it0004-java-dep-jni/jni/src/test/java/HelloWorldJNITest.java
@@ -0,0 +1,25 @@
+import junit.framework.*;
+
+import com.mycompany.mypackage.HelloWorldJNI;
+
+public class HelloWorldJNITest extends TestCase {
+
+ public HelloWorldJNITest(String name) {
+ super(name);
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testNativeHelloWorldJNI() throws Exception {
+ HelloWorldJNI app = new HelloWorldJNI();
+
+ this.assertEquals( "Hello NAR World!", app.sayHello() );
+ }
+}
+
diff --git a/src/it/it0004-java-dep-jni/pom.xml b/src/it/it0004-java-dep-jni/pom.xml
new file mode 100644
index 0000000..c527a37
--- /dev/null
+++ b/src/it/it0004-java-dep-jni/pom.xml
@@ -0,0 +1,49 @@
+<?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>it0004-pom</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Maven NAR Java Class using JNI library</name>
+ <version>1.0-SNAPSHOT</version>
+ <description>
+ Java class which depends on JNI implemented library.
+ </description>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ </build>
+
+ <modules>
+ <module>java-dep-jni</module>
+ <module>jni</module>
+ </modules>
+</project>