From 6cf097f0c054dba7b3de4391c31427be1b82154f Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Tue, 6 Oct 2009 15:12:57 +0200 Subject: Modified it0004 --- src/it/it0003-jni/pom.xml | 2 +- src/it/it0004-java-dep-jni/java-dep-jni/pom.xml | 62 ------------------- .../src/test/java/HelloWorldJavaDepJNITest.java | 52 ---------------- src/it/it0004-java-dep-jni/jni/pom.xml | 71 ---------------------- .../jni/src/main/c/HelloWorldJNI.c | 16 ----- .../com/mycompany/mypackage/HelloWorldJNI.java | 36 ----------- .../jni/src/test/java/HelloWorldJNITest.java | 25 -------- src/it/it0004-java-dep-jni/pom.xml | 38 ++++++++---- .../java/it0004/test/HelloWorldJavaDepJNITest.java | 54 ++++++++++++++++ 9 files changed, 81 insertions(+), 275 deletions(-) delete mode 100644 src/it/it0004-java-dep-jni/java-dep-jni/pom.xml delete mode 100644 src/it/it0004-java-dep-jni/java-dep-jni/src/test/java/HelloWorldJavaDepJNITest.java delete mode 100644 src/it/it0004-java-dep-jni/jni/pom.xml delete mode 100644 src/it/it0004-java-dep-jni/jni/src/main/c/HelloWorldJNI.c delete mode 100644 src/it/it0004-java-dep-jni/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java delete mode 100644 src/it/it0004-java-dep-jni/jni/src/test/java/HelloWorldJNITest.java create mode 100644 src/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java (limited to 'src/it') diff --git a/src/it/it0003-jni/pom.xml b/src/it/it0003-jni/pom.xml index 9069e8f..18ad2d8 100644 --- a/src/it/it0003-jni/pom.xml +++ b/src/it/it0003-jni/pom.xml @@ -45,7 +45,7 @@ under the License. --> - integration-test + install maven-nar-plugin 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 deleted file mode 100644 index 60c325e..0000000 --- a/src/it/it0004-java-dep-jni/java-dep-jni/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.nar - it0004-pom - 1.0-SNAPSHOT - - - it0004-java-dep-jni - nar - - Maven NAR Java Class - - Java class - - - - integration-test - - - maven-nar-plugin - true - - - maven-surefire-plugin - - true - - - - - - - - org.apache.maven.its.nar - it0004-jni - 1.0-SNAPSHOT - - - 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 deleted file mode 100644 index 24b612b..0000000 --- a/src/it/it0004-java-dep-jni/java-dep-jni/src/test/java/HelloWorldJavaDepJNITest.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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. - */ - -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 deleted file mode 100644 index 6f9e652..0000000 --- a/src/it/it0004-java-dep-jni/jni/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.nar - it0004-pom - 1.0-SNAPSHOT - - - it0004-jni - nar - - Maven NAR JNI Test - - Simple JNI Library - - http://maven.apache.org/ - - - integration-test - - - maven-nar-plugin - true - - - true - - - - jni - com.mycompany.mypackage - false - - - - - - maven-surefire-plugin - - true - - - - - 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 deleted file mode 100644 index 716722e..0000000 --- a/src/it/it0004-java-dep-jni/jni/src/main/c/HelloWorldJNI.c +++ /dev/null @@ -1,16 +0,0 @@ -#include -#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 deleted file mode 100644 index 3aede4c..0000000 --- a/src/it/it0004-java-dep-jni/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.mycompany.mypackage; - -/* - * 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. - */ - -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 deleted file mode 100644 index 683c321..0000000 --- a/src/it/it0004-java-dep-jni/jni/src/test/java/HelloWorldJNITest.java +++ /dev/null @@ -1,25 +0,0 @@ -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 index c527a37..2901f12 100644 --- a/src/it/it0004-java-dep-jni/pom.xml +++ b/src/it/it0004-java-dep-jni/pom.xml @@ -29,21 +29,35 @@ under the License. ../it-parent/pom.xml - it0004-pom - pom + it0004-java-dep-jni + nar - Maven NAR Java Class using JNI library - 1.0-SNAPSHOT + Maven NAR Java Class Depends on JNI - Java class which depends on JNI implemented library. + Java class which depends on a separate JNI library - install - - - - java-dep-jni - jni - + integration-test + + + maven-nar-plugin + true + + + maven-surefire-plugin + + true + + + + + + + + org.apache.maven.its.nar + it0003-jni + 1.0-SNAPSHOT + + diff --git a/src/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java b/src/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java new file mode 100644 index 0000000..7eda5ec --- /dev/null +++ b/src/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java @@ -0,0 +1,54 @@ +package it0004.test; + +/* + * 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. + */ + +import junit.framework.*; + +import it0003.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(); + + Assert.assertEquals( "Hello NAR World!", app.sayHello() ); + } +} -- cgit v1.2.3