From fe2d4c4194f53f5af52b31584fad1420f9718fa9 Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Tue, 6 Oct 2009 15:01:22 +0200 Subject: Reformatted it0003-jni --- src/it/it0003-jni/pom.xml | 2 +- src/it/it0003-jni/src/main/c/HelloWorldJNI.c | 23 ++++++++- .../com/mycompany/mypackage/HelloWorldJNI.java | 36 --------------- .../src/main/java/it0003/HelloWorldJNI.java | 36 +++++++++++++++ .../src/test/java/HelloWorldJNITest.java | 25 ---------- .../test/java/it0003/test/HelloWorldJNITest.java | 54 ++++++++++++++++++++++ 6 files changed, 112 insertions(+), 64 deletions(-) delete mode 100644 src/it/it0003-jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java create mode 100644 src/it/it0003-jni/src/main/java/it0003/HelloWorldJNI.java delete mode 100644 src/it/it0003-jni/src/test/java/HelloWorldJNITest.java create mode 100644 src/it/it0003-jni/src/test/java/it0003/test/HelloWorldJNITest.java (limited to 'src/it') diff --git a/src/it/it0003-jni/pom.xml b/src/it/it0003-jni/pom.xml index eaf71c6..9069e8f 100644 --- a/src/it/it0003-jni/pom.xml +++ b/src/it/it0003-jni/pom.xml @@ -57,7 +57,7 @@ under the License. jni - com.mycompany.mypackage + it0003 false diff --git a/src/it/it0003-jni/src/main/c/HelloWorldJNI.c b/src/it/it0003-jni/src/main/c/HelloWorldJNI.c index 716722e..f663a54 100644 --- a/src/it/it0003-jni/src/main/c/HelloWorldJNI.c +++ b/src/it/it0003-jni/src/main/c/HelloWorldJNI.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_HelloWorldJNI.h" +#include "it0003_HelloWorldJNI.h" -JNIEXPORT jstring JNICALL Java_com_mycompany_mypackage_HelloWorldJNI_sayHello( JNIEnv *env, jobject obj ) { +JNIEXPORT jstring JNICALL Java_it0003_HelloWorldJNI_sayHello( JNIEnv *env, jobject obj ) { jstring value; /* the return value */ char buf[40]; /* working buffer (really only need 20 ) */ diff --git a/src/it/it0003-jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java b/src/it/it0003-jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java deleted file mode 100644 index 3aede4c..0000000 --- a/src/it/it0003-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/it0003-jni/src/main/java/it0003/HelloWorldJNI.java b/src/it/it0003-jni/src/main/java/it0003/HelloWorldJNI.java new file mode 100644 index 0000000..b1f3a84 --- /dev/null +++ b/src/it/it0003-jni/src/main/java/it0003/HelloWorldJNI.java @@ -0,0 +1,36 @@ +package it0003; + +/* + * 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/it0003-jni/src/test/java/HelloWorldJNITest.java b/src/it/it0003-jni/src/test/java/HelloWorldJNITest.java deleted file mode 100644 index 683c321..0000000 --- a/src/it/it0003-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/it0003-jni/src/test/java/it0003/test/HelloWorldJNITest.java b/src/it/it0003-jni/src/test/java/it0003/test/HelloWorldJNITest.java new file mode 100644 index 0000000..cfbf1db --- /dev/null +++ b/src/it/it0003-jni/src/test/java/it0003/test/HelloWorldJNITest.java @@ -0,0 +1,54 @@ +package it0003.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 it0003.HelloWorldJNI; +import junit.framework.*; + + +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(); + + Assert.assertEquals( "Hello NAR World!", app.sayHello() ); + } +} -- cgit v1.2.3