summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-10-06 15:19:31 +0200
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-10-06 15:19:31 +0200
commit58feddd6f401561988487d2e40c4850d1f66deeb (patch)
treedafcfdef7ca1924e74e3bcd677f37cb0b6f8cf9f /src
parent6cf097f0c054dba7b3de4391c31427be1b82154f (diff)
downloadmaven-nar-plugin-58feddd6f401561988487d2e40c4850d1f66deeb.tar.gz
maven-nar-plugin-58feddd6f401561988487d2e40c4850d1f66deeb.tar.bz2
maven-nar-plugin-58feddd6f401561988487d2e40c4850d1f66deeb.tar.xz
maven-nar-plugin-58feddd6f401561988487d2e40c4850d1f66deeb.zip
Fixed it0005
Diffstat (limited to 'src')
-rw-r--r--src/it/it0005-jni-static/pom.xml4
-rw-r--r--src/it/it0005-jni-static/src/main/c/HelloWorldStaticJNI.c23
-rw-r--r--src/it/it0005-jni-static/src/main/java/it0005/HelloWorldStaticJNI.java (renamed from src/it/it0005-jni-static/src/main/java/com/mycompany/mypackage/HelloWorldStaticJNI.java)2
-rw-r--r--src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java (renamed from src/it/it0005-jni-static/src/test/java/HelloWorldStaticJNITest.java)7
4 files changed, 28 insertions, 8 deletions
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.
-->
<build>
- <defaultGoal>integration-test</defaultGoal>
+ <defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<artifactId>maven-nar-plugin</artifactId>
@@ -55,7 +55,7 @@ under the License.
<libraries>
<library>
<type>jni</type>
- <narSystemPackage>com.mycompany.mypackage</narSystemPackage>
+ <narSystemPackage>it0005</narSystemPackage>
<linkCPP>false</linkCPP>
</library>
</libraries>
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 <stdio.h>
-#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/it0005/HelloWorldStaticJNI.java
index ed21052..eb02f52 100644
--- a/src/it/it0005-jni-static/src/main/java/com/mycompany/mypackage/HelloWorldStaticJNI.java
+++ b/src/it/it0005-jni-static/src/main/java/it0005/HelloWorldStaticJNI.java
@@ -1,4 +1,4 @@
-package com.mycompany.mypackage;
+package it0005;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/it/it0005-jni-static/src/test/java/HelloWorldStaticJNITest.java b/src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java
index 5210446..0326d9a 100644
--- a/src/it/it0005-jni-static/src/test/java/HelloWorldStaticJNITest.java
+++ b/src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java
@@ -1,3 +1,5 @@
+package it0005.test;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,9 +19,8 @@
* under the License.
*/
-import junit.framework.*;
-
-import com.mycompany.mypackage.HelloWorldStaticJNI;
+import it0005.HelloWorldStaticJNI;
+import junit.framework.TestCase;
public class HelloWorldStaticJNITest
extends TestCase