summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/it/it0001-executable/src/main/c/Executable.c19
-rw-r--r--src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java3
-rwxr-xr-xsrc/it/it0006-jni-3rdparty/src/nar/resources/aol/x86_64-MacOSX-g++/lib/libit0003-jni-1.0-SNAPSHOT.jnilibbin8648 -> 8616 bytes
-rw-r--r--src/it/it0006-jni-3rdparty/src/nar/resources/aol/x86_64-MacOSX-g++/share/it0003-jni-1.0-SNAPSHOT.jarbin4450 -> 4118 bytes
-rw-r--r--src/it/it0006-jni-3rdparty/src/test/java/it0006/test/HelloThirdPartyJNITest.java (renamed from src/it/it0006-jni-3rdparty/src/test/java/HelloThirdPartyJNITest.java)4
-rw-r--r--src/it/it0008-executable-dep-lib-shared/executable-dep-lib-shared/pom.xml70
-rw-r--r--src/it/it0008-executable-dep-lib-shared/lib-shared/pom.xml74
-rw-r--r--src/it/it0008-executable-dep-lib-shared/lib-shared/src/main/c/HelloWorldLib.c7
-rw-r--r--src/it/it0008-executable-dep-lib-shared/lib-shared/src/main/include/HelloWorldLib.h9
-rw-r--r--src/it/it0008-executable-dep-lib-shared/lib-shared/src/test/c/HelloWorldTest.c9
-rw-r--r--src/it/it0008-executable-dep-lib-shared/pom.xml42
-rw-r--r--src/it/it0008-executable-dep-lib-shared/src/main/c/HelloWorldExe.c (renamed from src/it/it0008-executable-dep-lib-shared/executable-dep-lib-shared/src/main/c/HelloWorldExe.c)0
-rw-r--r--src/it/it0009-jni-dep-lib-shared/jni-dep-lib-shared/pom.xml72
-rw-r--r--src/it/it0009-jni-dep-lib-shared/jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c17
-rw-r--r--src/it/it0009-jni-dep-lib-shared/lib-shared/pom.xml74
-rw-r--r--src/it/it0009-jni-dep-lib-shared/lib-shared/src/main/c/HelloWorldLib.c7
-rw-r--r--src/it/it0009-jni-dep-lib-shared/lib-shared/src/main/include/HelloWorldLib.h9
-rw-r--r--src/it/it0009-jni-dep-lib-shared/lib-shared/src/test/c/HelloWorldTest.c9
-rw-r--r--src/it/it0009-jni-dep-lib-shared/pom.xml44
-rw-r--r--src/it/it0009-jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c36
-rw-r--r--src/it/it0009-jni-dep-lib-shared/src/main/java/it0009/HelloWorldSharedLibJNI.java (renamed from src/it/it0009-jni-dep-lib-shared/jni-dep-lib-shared/src/main/java/com/mycompany/mypackage/HelloWorldSharedLibJNI.java)2
-rw-r--r--src/it/it0009-jni-dep-lib-shared/src/test/java/it0009/test/HelloWorldSharedLibJNITest.java (renamed from src/it/it0009-jni-dep-lib-shared/jni-dep-lib-shared/src/test/java/HelloWorldSharedLibJNITest.java)9
22 files changed, 133 insertions, 383 deletions
diff --git a/src/it/it0001-executable/src/main/c/Executable.c b/src/it/it0001-executable/src/main/c/Executable.c
index d640602..19afb26 100644
--- a/src/it/it0001-executable/src/main/c/Executable.c
+++ b/src/it/it0001-executable/src/main/c/Executable.c
@@ -1,3 +1,22 @@
+/*
+ * 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>
int main(int argc, char *argv[]) {
diff --git a/src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java b/src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java
index 0326d9a..45cb048 100644
--- a/src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java
+++ b/src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java
@@ -20,6 +20,7 @@ package it0005.test;
*/
import it0005.HelloWorldStaticJNI;
+import junit.framework.Assert;
import junit.framework.TestCase;
public class HelloWorldStaticJNITest
@@ -48,6 +49,6 @@ public class HelloWorldStaticJNITest
{
HelloWorldStaticJNI app = new HelloWorldStaticJNI();
- this.assertEquals( "Hello Static NAR World!", app.sayHello() );
+ Assert.assertEquals( "Hello Static NAR World!", app.sayHello() );
}
}
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
index b7e52a4..5087599 100755
--- 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
Binary files 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
index f2e29f5..c811a6a 100644
--- 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
Binary files differ
diff --git a/src/it/it0006-jni-3rdparty/src/test/java/HelloThirdPartyJNITest.java b/src/it/it0006-jni-3rdparty/src/test/java/it0006/test/HelloThirdPartyJNITest.java
index 837d670..426f604 100644
--- a/src/it/it0006-jni-3rdparty/src/test/java/HelloThirdPartyJNITest.java
+++ b/src/it/it0006-jni-3rdparty/src/test/java/it0006/test/HelloThirdPartyJNITest.java
@@ -1,3 +1,5 @@
+package it0006.test;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,7 +21,7 @@
import junit.framework.*;
-import com.mycompany.mypackage.HelloWorldJNI;
+import it0003.HelloWorldJNI;
public class HelloThirdPartyJNITest
extends TestCase
diff --git a/src/it/it0008-executable-dep-lib-shared/executable-dep-lib-shared/pom.xml b/src/it/it0008-executable-dep-lib-shared/executable-dep-lib-shared/pom.xml
deleted file mode 100644
index aa3498b..0000000
--- a/src/it/it0008-executable-dep-lib-shared/executable-dep-lib-shared/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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>it0008-pom</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>it0008-executable-dep-lib-shared</artifactId>
- <packaging>nar</packaging>
-
- <name>Maven NAR Executable</name>
- <version>1.0-SNAPSHOT</version>
- <description>
- Executable
- </description>
-
- <build>
- <defaultGoal>integration-test</defaultGoal>
- <plugins>
- <plugin>
- <artifactId>maven-nar-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <libraries>
- <library>
- <type>executable</type>
- <run>true</run>
- </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>it0008-lib-shared</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/src/it/it0008-executable-dep-lib-shared/lib-shared/pom.xml b/src/it/it0008-executable-dep-lib-shared/lib-shared/pom.xml
deleted file mode 100644
index 4c46296..0000000
--- a/src/it/it0008-executable-dep-lib-shared/lib-shared/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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>it0008-pom</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>it0008-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>
- <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>shared</type>
- </library>
- </libraries>
- <tests>
- <test>
- <name>HelloWorldTest</name>
- <link>shared</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/it0008-executable-dep-lib-shared/lib-shared/src/main/c/HelloWorldLib.c b/src/it/it0008-executable-dep-lib-shared/lib-shared/src/main/c/HelloWorldLib.c
deleted file mode 100644
index 9f65143..0000000
--- a/src/it/it0008-executable-dep-lib-shared/lib-shared/src/main/c/HelloWorldLib.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-#include "HelloWorldLib.h"
-
-char* HelloWorldLib_sayHello() {
- return "Hello NAR LIB World!";
-}
-
diff --git a/src/it/it0008-executable-dep-lib-shared/lib-shared/src/main/include/HelloWorldLib.h b/src/it/it0008-executable-dep-lib-shared/lib-shared/src/main/include/HelloWorldLib.h
deleted file mode 100644
index e801bec..0000000
--- a/src/it/it0008-executable-dep-lib-shared/lib-shared/src/main/include/HelloWorldLib.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef HelloWorldLib_H
-#define HelloWorldLib_H
-
-#ifdef WIN32
-__declspec(dllexport)
-#endif
-extern char* HelloWorldLib_sayHello();
-
-#endif
diff --git a/src/it/it0008-executable-dep-lib-shared/lib-shared/src/test/c/HelloWorldTest.c b/src/it/it0008-executable-dep-lib-shared/lib-shared/src/test/c/HelloWorldTest.c
deleted file mode 100644
index 4aa35d8..0000000
--- a/src/it/it0008-executable-dep-lib-shared/lib-shared/src/test/c/HelloWorldTest.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdio.h>
-#include "HelloWorldLib.h"
-
-int main(int argc, char *argv[]) {
- printf("%s\n", HelloWorldLib_sayHello());
- return 0;
-}
-
-
diff --git a/src/it/it0008-executable-dep-lib-shared/pom.xml b/src/it/it0008-executable-dep-lib-shared/pom.xml
index ad81553..7ce981b 100644
--- a/src/it/it0008-executable-dep-lib-shared/pom.xml
+++ b/src/it/it0008-executable-dep-lib-shared/pom.xml
@@ -29,21 +29,43 @@ under the License.
<relativePath>../it-parent/pom.xml</relativePath>
</parent>
- <artifactId>it0008-pom</artifactId>
- <packaging>pom</packaging>
+ <artifactId>it0008-executable-dep-lib-shared</artifactId>
+ <packaging>nar</packaging>
<name>Maven NAR Executable and Shared Library</name>
<version>1.0-SNAPSHOT</version>
<description>
Executable depending on a shared library.
</description>
-
+
<build>
- <defaultGoal>install</defaultGoal>
- </build>
-
- <modules>
- <module>executable-dep-lib-shared</module>
- <module>lib-shared</module>
- </modules>
+ <defaultGoal>integration-test</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-nar-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <libraries>
+ <library>
+ <type>executable</type>
+ <run>true</run>
+ </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>it0007-lib-shared</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/src/it/it0008-executable-dep-lib-shared/executable-dep-lib-shared/src/main/c/HelloWorldExe.c b/src/it/it0008-executable-dep-lib-shared/src/main/c/HelloWorldExe.c
index 4aa35d8..4aa35d8 100644
--- a/src/it/it0008-executable-dep-lib-shared/executable-dep-lib-shared/src/main/c/HelloWorldExe.c
+++ b/src/it/it0008-executable-dep-lib-shared/src/main/c/HelloWorldExe.c
diff --git a/src/it/it0009-jni-dep-lib-shared/jni-dep-lib-shared/pom.xml b/src/it/it0009-jni-dep-lib-shared/jni-dep-lib-shared/pom.xml
deleted file mode 100644
index 45d3487..0000000
--- a/src/it/it0009-jni-dep-lib-shared/jni-dep-lib-shared/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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>it0009-pom</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>it0009-jni-dep-lib-shared</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>it0009-lib-shared</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/src/it/it0009-jni-dep-lib-shared/jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c b/src/it/it0009-jni-dep-lib-shared/jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c
deleted file mode 100644
index e5b8e4b..0000000
--- a/src/it/it0009-jni-dep-lib-shared/jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#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/it0009-jni-dep-lib-shared/lib-shared/pom.xml b/src/it/it0009-jni-dep-lib-shared/lib-shared/pom.xml
deleted file mode 100644
index b29f03a..0000000
--- a/src/it/it0009-jni-dep-lib-shared/lib-shared/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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>it0009-pom</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>it0009-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>
- <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>shared</type>
- </library>
- </libraries>
- <tests>
- <test>
- <name>HelloWorldTest</name>
- <link>shared</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/it0009-jni-dep-lib-shared/lib-shared/src/main/c/HelloWorldLib.c b/src/it/it0009-jni-dep-lib-shared/lib-shared/src/main/c/HelloWorldLib.c
deleted file mode 100644
index 9f65143..0000000
--- a/src/it/it0009-jni-dep-lib-shared/lib-shared/src/main/c/HelloWorldLib.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-#include "HelloWorldLib.h"
-
-char* HelloWorldLib_sayHello() {
- return "Hello NAR LIB World!";
-}
-
diff --git a/src/it/it0009-jni-dep-lib-shared/lib-shared/src/main/include/HelloWorldLib.h b/src/it/it0009-jni-dep-lib-shared/lib-shared/src/main/include/HelloWorldLib.h
deleted file mode 100644
index e801bec..0000000
--- a/src/it/it0009-jni-dep-lib-shared/lib-shared/src/main/include/HelloWorldLib.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef HelloWorldLib_H
-#define HelloWorldLib_H
-
-#ifdef WIN32
-__declspec(dllexport)
-#endif
-extern char* HelloWorldLib_sayHello();
-
-#endif
diff --git a/src/it/it0009-jni-dep-lib-shared/lib-shared/src/test/c/HelloWorldTest.c b/src/it/it0009-jni-dep-lib-shared/lib-shared/src/test/c/HelloWorldTest.c
deleted file mode 100644
index 4aa35d8..0000000
--- a/src/it/it0009-jni-dep-lib-shared/lib-shared/src/test/c/HelloWorldTest.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdio.h>
-#include "HelloWorldLib.h"
-
-int main(int argc, char *argv[]) {
- printf("%s\n", HelloWorldLib_sayHello());
- return 0;
-}
-
-
diff --git a/src/it/it0009-jni-dep-lib-shared/pom.xml b/src/it/it0009-jni-dep-lib-shared/pom.xml
index f6719de..e211c83 100644
--- a/src/it/it0009-jni-dep-lib-shared/pom.xml
+++ b/src/it/it0009-jni-dep-lib-shared/pom.xml
@@ -29,21 +29,45 @@ under the License.
<relativePath>../it-parent/pom.xml</relativePath>
</parent>
- <artifactId>it0009-pom</artifactId>
- <packaging>pom</packaging>
+ <artifactId>it0009-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>
-
- <build>
- <defaultGoal>install</defaultGoal>
- </build>
- <modules>
- <module>jni-dep-lib-shared</module>
- <module>lib-shared</module>
- </modules>
+ <build>
+ <defaultGoal>integration-test</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-nar-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <libraries>
+ <library>
+ <type>jni</type>
+ <narSystemPackage>it0009</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>it0007-lib-shared</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/src/it/it0009-jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c b/src/it/it0009-jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c
new file mode 100644
index 0000000..fd23d83
--- /dev/null
+++ b/src/it/it0009-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 "it0009_HelloWorldSharedLibJNI.h"
+
+JNIEXPORT jstring JNICALL Java_it0009_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/it0009-jni-dep-lib-shared/jni-dep-lib-shared/src/main/java/com/mycompany/mypackage/HelloWorldSharedLibJNI.java b/src/it/it0009-jni-dep-lib-shared/src/main/java/it0009/HelloWorldSharedLibJNI.java
index 0c64a53..001ec98 100644
--- a/src/it/it0009-jni-dep-lib-shared/jni-dep-lib-shared/src/main/java/com/mycompany/mypackage/HelloWorldSharedLibJNI.java
+++ b/src/it/it0009-jni-dep-lib-shared/src/main/java/it0009/HelloWorldSharedLibJNI.java
@@ -1,4 +1,4 @@
-package com.mycompany.mypackage;
+package it0009;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/it/it0009-jni-dep-lib-shared/jni-dep-lib-shared/src/test/java/HelloWorldSharedLibJNITest.java b/src/it/it0009-jni-dep-lib-shared/src/test/java/it0009/test/HelloWorldSharedLibJNITest.java
index 393212d..5b9adc9 100644
--- a/src/it/it0009-jni-dep-lib-shared/jni-dep-lib-shared/src/test/java/HelloWorldSharedLibJNITest.java
+++ b/src/it/it0009-jni-dep-lib-shared/src/test/java/it0009/test/HelloWorldSharedLibJNITest.java
@@ -1,3 +1,5 @@
+package it0009.test;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,9 +19,10 @@
* under the License.
*/
-import junit.framework.*;
+import it0009.HelloWorldSharedLibJNI;
+import junit.framework.Assert;
+import junit.framework.TestCase;
-import com.mycompany.mypackage.HelloWorldSharedLibJNI;
public class HelloWorldSharedLibJNITest
extends TestCase
@@ -47,6 +50,6 @@ public class HelloWorldSharedLibJNITest
{
HelloWorldSharedLibJNI app = new HelloWorldSharedLibJNI();
- this.assertEquals( "Hello NAR LIB World!", app.sayHello() );
+ Assert.assertEquals( "Hello NAR LIB World!", app.sayHello() );
}
}