From 58feddd6f401561988487d2e40c4850d1f66deeb Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Tue, 6 Oct 2009 15:19:31 +0200 Subject: Fixed it0005 --- src/it/it0005-jni-static/pom.xml | 4 +- .../src/main/c/HelloWorldStaticJNI.c | 23 +++++++++- .../mycompany/mypackage/HelloWorldStaticJNI.java | 36 --------------- .../src/main/java/it0005/HelloWorldStaticJNI.java | 36 +++++++++++++++ .../src/test/java/HelloWorldStaticJNITest.java | 52 --------------------- .../java/it0005/test/HelloWorldStaticJNITest.java | 53 ++++++++++++++++++++++ 6 files changed, 112 insertions(+), 92 deletions(-) delete mode 100644 src/it/it0005-jni-static/src/main/java/com/mycompany/mypackage/HelloWorldStaticJNI.java create mode 100644 src/it/it0005-jni-static/src/main/java/it0005/HelloWorldStaticJNI.java delete mode 100644 src/it/it0005-jni-static/src/test/java/HelloWorldStaticJNITest.java create mode 100644 src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java diff --git a/src/it/it0005-jni-static/pom.xml b/src/it/it0005-jni-static/pom.xml index 97f51e5..f27a874 100644 --- a/src/it/it0005-jni-static/pom.xml +++ b/src/it/it0005-jni-static/pom.xml @@ -45,7 +45,7 @@ under the License. --> - integration-test + install maven-nar-plugin @@ -55,7 +55,7 @@ under the License. jni - com.mycompany.mypackage + it0005 false diff --git a/src/it/it0005-jni-static/src/main/c/HelloWorldStaticJNI.c b/src/it/it0005-jni-static/src/main/c/HelloWorldStaticJNI.c index 62b181b..660e708 100644 --- a/src/it/it0005-jni-static/src/main/c/HelloWorldStaticJNI.c +++ b/src/it/it0005-jni-static/src/main/c/HelloWorldStaticJNI.c @@ -1,7 +1,26 @@ +/* + * 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 -#include "com_mycompany_mypackage_HelloWorldStaticJNI.h" +#include "it0005_HelloWorldStaticJNI.h" -JNIEXPORT jstring JNICALL Java_com_mycompany_mypackage_HelloWorldStaticJNI_sayHello( JNIEnv *env, jobject obj ) { +JNIEXPORT jstring JNICALL Java_it0005_HelloWorldStaticJNI_sayHello( JNIEnv *env, jobject obj ) { jstring value; /* the return value */ char buf[40]; /* working buffer (really only need 20 ) */ diff --git a/src/it/it0005-jni-static/src/main/java/com/mycompany/mypackage/HelloWorldStaticJNI.java b/src/it/it0005-jni-static/src/main/java/com/mycompany/mypackage/HelloWorldStaticJNI.java deleted file mode 100644 index ed21052..0000000 --- a/src/it/it0005-jni-static/src/main/java/com/mycompany/mypackage/HelloWorldStaticJNI.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 HelloWorldStaticJNI -{ - static - { - NarSystem.loadLibrary(); - } - - public native String sayHello(); - - public static void main( String[] args ) - { - HelloWorldStaticJNI app = new HelloWorldStaticJNI(); - System.out.println( app.sayHello() ); - } -} diff --git a/src/it/it0005-jni-static/src/main/java/it0005/HelloWorldStaticJNI.java b/src/it/it0005-jni-static/src/main/java/it0005/HelloWorldStaticJNI.java new file mode 100644 index 0000000..eb02f52 --- /dev/null +++ b/src/it/it0005-jni-static/src/main/java/it0005/HelloWorldStaticJNI.java @@ -0,0 +1,36 @@ +package it0005; + +/* + * 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 HelloWorldStaticJNI +{ + static + { + NarSystem.loadLibrary(); + } + + public native String sayHello(); + + public static void main( String[] args ) + { + HelloWorldStaticJNI app = new HelloWorldStaticJNI(); + System.out.println( app.sayHello() ); + } +} diff --git a/src/it/it0005-jni-static/src/test/java/HelloWorldStaticJNITest.java b/src/it/it0005-jni-static/src/test/java/HelloWorldStaticJNITest.java deleted file mode 100644 index 5210446..0000000 --- a/src/it/it0005-jni-static/src/test/java/HelloWorldStaticJNITest.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.HelloWorldStaticJNI; - -public class HelloWorldStaticJNITest - extends TestCase -{ - - public HelloWorldStaticJNITest( String name ) - { - super( name ); - } - - protected void setUp() - throws Exception - { - super.setUp(); - } - - protected void tearDown() - throws Exception - { - super.tearDown(); - } - - public void testNativeHelloWorldJNI() - throws Exception - { - HelloWorldStaticJNI app = new HelloWorldStaticJNI(); - - this.assertEquals( "Hello Static NAR World!", app.sayHello() ); - } -} 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 new file mode 100644 index 0000000..0326d9a --- /dev/null +++ b/src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java @@ -0,0 +1,53 @@ +package it0005.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 it0005.HelloWorldStaticJNI; +import junit.framework.TestCase; + +public class HelloWorldStaticJNITest + extends TestCase +{ + + public HelloWorldStaticJNITest( String name ) + { + super( name ); + } + + protected void setUp() + throws Exception + { + super.setUp(); + } + + protected void tearDown() + throws Exception + { + super.tearDown(); + } + + public void testNativeHelloWorldJNI() + throws Exception + { + HelloWorldStaticJNI app = new HelloWorldStaticJNI(); + + this.assertEquals( "Hello Static NAR World!", app.sayHello() ); + } +} -- cgit v1.2.3