diff options
| -rw-r--r-- | ReleaseNotes.txt | 12 | ||||
| -rw-r--r-- | pom.xml | 9 | ||||
| -rw-r--r-- | src/it/executable/pom.xml | 8 | ||||
| -rw-r--r-- | src/it/jni/pom.xml | 81 | ||||
| -rw-r--r-- | src/it/jni/src/main/c/HelloWorldJNI.c | 16 | ||||
| -rw-r--r-- | src/it/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java | 15 | ||||
| -rw-r--r-- | src/it/jni/src/test/java/HelloWorldJNITest.java | 25 | ||||
| -rw-r--r-- | src/site/apt/HelloWorld.apt | 6 |
8 files changed, 168 insertions, 4 deletions
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index e2cc31a..83838d3 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -13,6 +13,18 @@ and cpptasks-parallel. Bugs +- Excecutable needs a test to run and verify the output of Executable. + +- When it test fails it seems not reported in main pom, refer to executable + +- nar-integration (our plugin copy) tests are not run when maven.tests.skip=true is set... +while they are run when in the configuration (plugin has different name) skip is set. + +- When run from run-its, executable fails to create. The build file shows: + +Error looking up lifecycle mapping to retrieve optional mojos. Lifecycle ID: default. Error: Component descriptor cannot be found in the component repository: org.apache.maven.lifecycle.mapping.LifecycleMappingnar. +org.codehaus.plexus.component.repository.exception.ComponentLookupException: Component descriptor cannot be found in the component repository: org.apache.maven.lifecycle.mapping.LifecycleMappingnar. + - When the calculated AOL is not found in aol.properties the error message is misleading: [INFO] [nar:nar-download {execution: default-nar-download}] @@ -131,11 +131,18 @@ <artifactId>maven-invoker-plugin</artifactId> <version>1.4</version> <configuration> - <debug>true</debug> + <debug>false</debug> + <!-- FAILS to run, see ReleaseNotes + <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> + --> <pomExcludes> <pomExclude>it-parent/**</pomExclude> </pomExcludes> <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath> + <goals> + <goal>clean</goal> + <goal>integration-test</goal> + </goals> </configuration> <executions> <execution> diff --git a/src/it/executable/pom.xml b/src/it/executable/pom.xml index 00bf1c8..98b664e 100644 --- a/src/it/executable/pom.xml +++ b/src/it/executable/pom.xml @@ -39,9 +39,11 @@ under the License. </description> <url>http://maven.apache.org/</url> +<!-- <properties> <maven.test.skip>true</maven.test.skip> </properties> +--> <build> <defaultGoal>integration-test</defaultGoal> @@ -58,6 +60,12 @@ under the License. </libraries> </configuration> </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> </project> diff --git a/src/it/jni/pom.xml b/src/it/jni/pom.xml new file mode 100644 index 0000000..486ac48 --- /dev/null +++ b/src/it/jni/pom.xml @@ -0,0 +1,81 @@ +<?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>jni</artifactId> + <packaging>nar</packaging> + + <name>Maven NAR JNI Test</name> + <version>1.0-SNAPSHOT</version> + <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> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> diff --git a/src/it/jni/src/main/c/HelloWorldJNI.c b/src/it/jni/src/main/c/HelloWorldJNI.c new file mode 100644 index 0000000..716722e --- /dev/null +++ b/src/it/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/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java b/src/it/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java new file mode 100644 index 0000000..2af3f3c --- /dev/null +++ b/src/it/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/jni/src/test/java/HelloWorldJNITest.java b/src/it/jni/src/test/java/HelloWorldJNITest.java new file mode 100644 index 0000000..683c321 --- /dev/null +++ b/src/it/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/site/apt/HelloWorld.apt b/src/site/apt/HelloWorld.apt index 7d1f2aa..3a11ce5 100644 --- a/src/site/apt/HelloWorld.apt +++ b/src/site/apt/HelloWorld.apt @@ -19,14 +19,14 @@ There are also some unit test which are run and call the same method. [] - [helloworldjni] A C routine called from Java and a Java unit test. + [jni] A C routine called from Java and a Java unit test. - [helloworldjnilibjava] A java project which depends on helloworldjni. + [helloworldjnilibjava] 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. [hellothirdpartyjni] A third party JNI library called from Java. - The third party library is "helloworldjni" and is added as resource to the project in the + 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. [] |