diff options
author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-06 15:12:57 +0200 |
---|---|---|
committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-06 15:12:57 +0200 |
commit | 6cf097f0c054dba7b3de4391c31427be1b82154f (patch) | |
tree | df102da688751eac9f0b3a2cdb6bbe4c606dadd2 | |
parent | fe2d4c4194f53f5af52b31584fad1420f9718fa9 (diff) | |
download | maven-nar-plugin-6cf097f0c054dba7b3de4391c31427be1b82154f.tar.gz maven-nar-plugin-6cf097f0c054dba7b3de4391c31427be1b82154f.tar.bz2 maven-nar-plugin-6cf097f0c054dba7b3de4391c31427be1b82154f.tar.xz maven-nar-plugin-6cf097f0c054dba7b3de4391c31427be1b82154f.zip |
Modified it0004
-rw-r--r-- | src/it/it0003-jni/pom.xml | 2 | ||||
-rw-r--r-- | src/it/it0004-java-dep-jni/java-dep-jni/pom.xml | 62 | ||||
-rw-r--r-- | src/it/it0004-java-dep-jni/jni/pom.xml | 71 | ||||
-rw-r--r-- | src/it/it0004-java-dep-jni/jni/src/main/c/HelloWorldJNI.c | 16 | ||||
-rw-r--r-- | src/it/it0004-java-dep-jni/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java | 36 | ||||
-rw-r--r-- | src/it/it0004-java-dep-jni/jni/src/test/java/HelloWorldJNITest.java | 25 | ||||
-rw-r--r-- | src/it/it0004-java-dep-jni/pom.xml | 38 | ||||
-rw-r--r-- | src/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java (renamed from src/it/it0004-java-dep-jni/java-dep-jni/src/test/java/HelloWorldJavaDepJNITest.java) | 6 |
8 files changed, 31 insertions, 225 deletions
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. --> <build> - <defaultGoal>integration-test</defaultGoal> + <defaultGoal>install</defaultGoal> <plugins> <plugin> <artifactId>maven-nar-plugin</artifactId> 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 @@ -<?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>it0004-pom</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - - <artifactId>it0004-java-dep-jni</artifactId> - <packaging>nar</packaging> - - <name>Maven NAR Java Class</name> - <description> - Java class - </description> - - <build> - <defaultGoal>integration-test</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-nar-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.apache.maven.its.nar</groupId> - <artifactId>it0004-jni</artifactId> - <version>1.0-SNAPSHOT</version> - </dependency> - </dependencies> -</project> 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 @@ -<?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>it0004-pom</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - - <artifactId>it0004-jni</artifactId> - <packaging>nar</packaging> - - <name>Maven NAR JNI Test</name> - <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> -</project> 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 <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/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. <relativePath>../it-parent/pom.xml</relativePath> </parent> - <artifactId>it0004-pom</artifactId> - <packaging>pom</packaging> + <artifactId>it0004-java-dep-jni</artifactId> + <packaging>nar</packaging> - <name>Maven NAR Java Class using JNI library</name> - <version>1.0-SNAPSHOT</version> + <name>Maven NAR Java Class Depends on JNI</name> <description> - Java class which depends on JNI implemented library. + Java class which depends on a separate JNI library </description> <build> - <defaultGoal>install</defaultGoal> - </build> - - <modules> - <module>java-dep-jni</module> - <module>jni</module> - </modules> + <defaultGoal>integration-test</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-nar-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.maven.its.nar</groupId> + <artifactId>it0003-jni</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + </dependencies> </project> diff --git a/src/it/it0004-java-dep-jni/java-dep-jni/src/test/java/HelloWorldJavaDepJNITest.java b/src/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java index 24b612b..7eda5ec 100644 --- a/src/it/it0004-java-dep-jni/java-dep-jni/src/test/java/HelloWorldJavaDepJNITest.java +++ b/src/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java @@ -1,3 +1,5 @@ +package it0004.test; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -19,7 +21,7 @@ import junit.framework.*; -import com.mycompany.mypackage.HelloWorldJNI; +import it0003.HelloWorldJNI; public class HelloWorldJavaDepJNITest extends TestCase @@ -47,6 +49,6 @@ public class HelloWorldJavaDepJNITest { HelloWorldJNI app = new HelloWorldJNI(); - this.assertEquals( "Hello NAR World!", app.sayHello() ); + Assert.assertEquals( "Hello NAR World!", app.sayHello() ); } } |