summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/pom.xml2
-rw-r--r--src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/pom.xml72
-rw-r--r--src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/main/c/HelloWorldSharedLibJNI.c17
-rw-r--r--src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/main/java/com/mycompany/mypackage/HelloWorldSharedLibJNI.java15
-rw-r--r--src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/test/java/HelloWorldSharedLibJNITest.java25
-rw-r--r--src/it/it0012-jni-dep-lib-static/lib-static/pom.xml74
-rw-r--r--src/it/it0012-jni-dep-lib-static/lib-static/src/main/c/HelloWorldLib.c7
-rw-r--r--src/it/it0012-jni-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h6
-rw-r--r--src/it/it0012-jni-dep-lib-static/lib-static/src/test/c/HelloWorldTest.c9
-rw-r--r--src/it/it0012-jni-dep-lib-static/pom.xml49
-rw-r--r--src/site/apt/HelloWorld.apt6
11 files changed, 279 insertions, 3 deletions
diff --git a/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/pom.xml b/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/pom.xml
index 85e7d82..6c78c71 100644
--- a/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/pom.xml
+++ b/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/pom.xml
@@ -30,6 +30,7 @@ under the License.
<artifactId>it0011-executable-dep-lib-static</artifactId>
<packaging>nar</packaging>
+
<name>Maven NAR Executable</name>
<version>1.0-SNAPSHOT</version>
<description>
@@ -59,6 +60,7 @@ under the License.
</plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.its.nar</groupId>
diff --git a/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/pom.xml b/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/pom.xml
new file mode 100644
index 0000000..b06ee18
--- /dev/null
+++ b/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/pom.xml
@@ -0,0 +1,72 @@
+<?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>it0012-pom</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>it0012-jni-dep-lib-static</artifactId>
+ <packaging>nar</packaging>
+
+ <name>Maven NAR JNI</name>
+ <version>1.0-SNAPSHOT</version>
+ <description>
+ JNI
+ </description>
+
+ <build>
+ <defaultGoal>integration-test</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-nar-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <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>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.nar</groupId>
+ <artifactId>it0012-lib-static</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/main/c/HelloWorldSharedLibJNI.c b/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/main/c/HelloWorldSharedLibJNI.c
new file mode 100644
index 0000000..e5b8e4b
--- /dev/null
+++ b/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/main/c/HelloWorldSharedLibJNI.c
@@ -0,0 +1,17 @@
+#include <stdio.h>
+#include "HelloWorldLib.h"
+
+#include "com_mycompany_mypackage_HelloWorldSharedLibJNI.h"
+
+JNIEXPORT jstring JNICALL Java_com_mycompany_mypackage_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/it0012-jni-dep-lib-static/jni-dep-lib-static/src/main/java/com/mycompany/mypackage/HelloWorldSharedLibJNI.java b/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/main/java/com/mycompany/mypackage/HelloWorldSharedLibJNI.java
new file mode 100644
index 0000000..a0ef934
--- /dev/null
+++ b/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/main/java/com/mycompany/mypackage/HelloWorldSharedLibJNI.java
@@ -0,0 +1,15 @@
+package com.mycompany.mypackage;
+
+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/it0012-jni-dep-lib-static/jni-dep-lib-static/src/test/java/HelloWorldSharedLibJNITest.java b/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/test/java/HelloWorldSharedLibJNITest.java
new file mode 100644
index 0000000..f263997
--- /dev/null
+++ b/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/test/java/HelloWorldSharedLibJNITest.java
@@ -0,0 +1,25 @@
+import junit.framework.*;
+
+import com.mycompany.mypackage.HelloWorldSharedLibJNI;
+
+public class HelloWorldSharedLibJNITest extends TestCase {
+
+ public HelloWorldSharedLibJNITest(String name) {
+ super(name);
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testNativeHelloWorldSharedLibJNI() throws Exception {
+ HelloWorldSharedLibJNI app = new HelloWorldSharedLibJNI();
+
+ this.assertEquals( "Hello NAR LIB World!", app.sayHello() );
+ }
+}
+
diff --git a/src/it/it0012-jni-dep-lib-static/lib-static/pom.xml b/src/it/it0012-jni-dep-lib-static/lib-static/pom.xml
new file mode 100644
index 0000000..034b27f
--- /dev/null
+++ b/src/it/it0012-jni-dep-lib-static/lib-static/pom.xml
@@ -0,0 +1,74 @@
+<?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>it0012-pom</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>it0012-lib-static</artifactId>
+ <packaging>nar</packaging>
+
+ <name>Maven NAR Static Library</name>
+ <version>1.0-SNAPSHOT</version>
+ <description>
+ Simple static library and test file
+ </description>
+ <url>http://maven.apache.org/</url>
+<!--
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+-->
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-nar-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <libraries>
+ <library>
+ <type>static</type>
+ </library>
+ </libraries>
+ <tests>
+ <test>
+ <name>HelloWorldTest</name>
+ <link>static</link>
+ </test>
+ </tests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/it0012-jni-dep-lib-static/lib-static/src/main/c/HelloWorldLib.c b/src/it/it0012-jni-dep-lib-static/lib-static/src/main/c/HelloWorldLib.c
new file mode 100644
index 0000000..9f65143
--- /dev/null
+++ b/src/it/it0012-jni-dep-lib-static/lib-static/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/it0012-jni-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h b/src/it/it0012-jni-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h
new file mode 100644
index 0000000..8c50dfb
--- /dev/null
+++ b/src/it/it0012-jni-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h
@@ -0,0 +1,6 @@
+#ifndef HelloWorldLib_H
+#define HelloWorldLib_H
+
+extern char* HelloWorldLib_sayHello();
+
+#endif
diff --git a/src/it/it0012-jni-dep-lib-static/lib-static/src/test/c/HelloWorldTest.c b/src/it/it0012-jni-dep-lib-static/lib-static/src/test/c/HelloWorldTest.c
new file mode 100644
index 0000000..4aa35d8
--- /dev/null
+++ b/src/it/it0012-jni-dep-lib-static/lib-static/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/it0012-jni-dep-lib-static/pom.xml b/src/it/it0012-jni-dep-lib-static/pom.xml
new file mode 100644
index 0000000..20434be
--- /dev/null
+++ b/src/it/it0012-jni-dep-lib-static/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>it0012-pom</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Maven NAR JNI and Static Library</name>
+ <version>1.0-SNAPSHOT</version>
+ <description>
+ JNI depending on a static library.
+ </description>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ </build>
+
+ <modules>
+ <module>jni-dep-lib-static</module>
+ <module>lib-static</module>
+ </modules>
+</project>
diff --git a/src/site/apt/HelloWorld.apt b/src/site/apt/HelloWorld.apt
index 6ca268d..f03bd70 100644
--- a/src/site/apt/HelloWorld.apt
+++ b/src/site/apt/HelloWorld.apt
@@ -8,7 +8,7 @@ Mark Donszelmann
HelloWorld Examples
These example contain a simple C method "sayHello". This method can be called from a C program, a Java program, put into
-a static library, put into a shared library, use a third party library, ...
+a static library, put into a shared library, use as a third party library, ...
There are also some unit test which are run and call the same method.
The following examples are available:
@@ -53,8 +53,8 @@ There are also some unit test which are run and call the same method.
[it0011-executable-dep-lib-static] A C executable which depends on "lib-static" and links statically
with it. The executabe is created and run.
- [helloworldstaticlibjni] A C routine called from Java, which depends on
- "lib-static" and links statically with it. A Java unit test is provided.
+ [it0012-jni-dep-lib-static] A C routine called from Java, which depends on
+ "lib-static" and links statically with it.
[]