From 9ed4b24f6d1d6e5ef9119b8a22744eb16721b1eb Mon Sep 17 00:00:00 2001
From: Mark Donszelmann <Mark.Donszelmann@gmail.com>
Date: Tue, 6 Oct 2009 21:31:40 +0200
Subject: Fixed tests 6, 11 and 12

---
 .../executable-dep-lib-static/pom.xml              | 71 ---------------------
 .../src/main/c/HelloWorldExe.c                     |  9 ---
 .../lib-static/pom.xml                             | 74 ----------------------
 .../lib-static/src/main/c/HelloWorldLib.c          |  7 --
 .../lib-static/src/main/include/HelloWorldLib.h    |  6 --
 .../lib-static/src/test/c/HelloWorldTest.c         |  9 ---
 src/it/it0011-executable-dep-lib-static/pom.xml    | 43 ++++++++++---
 .../src/main/c/HelloWorldExe.c                     |  9 +++
 8 files changed, 42 insertions(+), 186 deletions(-)
 delete mode 100644 src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/pom.xml
 delete mode 100644 src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/src/main/c/HelloWorldExe.c
 delete mode 100644 src/it/it0011-executable-dep-lib-static/lib-static/pom.xml
 delete mode 100644 src/it/it0011-executable-dep-lib-static/lib-static/src/main/c/HelloWorldLib.c
 delete mode 100644 src/it/it0011-executable-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h
 delete mode 100644 src/it/it0011-executable-dep-lib-static/lib-static/src/test/c/HelloWorldTest.c
 create mode 100644 src/it/it0011-executable-dep-lib-static/src/main/c/HelloWorldExe.c

(limited to 'src/it/it0011-executable-dep-lib-static')

diff --git a/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/pom.xml b/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/pom.xml
deleted file mode 100644
index 6c78c71..0000000
--- a/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/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>it0011-pom</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>it0011-executable-dep-lib-static</artifactId>
-  <packaging>nar</packaging>
-  
-  <name>Maven NAR Executable</name>
-  <version>1.0-SNAPSHOT</version>
-  <description>
-    Executable
-  </description>
-  
-  <build>
-    <defaultGoal>integration-test</defaultGoal>
-    <plugins>
-      <plugin>
-        <artifactId>maven-nar-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <libraries>
-            <library>
-              <type>executable</type>
-              <run>true</run>
-            </library>
-          </libraries>
-        </configuration>
-      </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>it0011-lib-static</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/src/main/c/HelloWorldExe.c b/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/src/main/c/HelloWorldExe.c
deleted file mode 100644
index 4aa35d8..0000000
--- a/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/src/main/c/HelloWorldExe.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdio.h>
-#include "HelloWorldLib.h"
-
-int main(int argc, char *argv[]) {
-	printf("%s\n", HelloWorldLib_sayHello());
-	return 0;
-}
-
-
diff --git a/src/it/it0011-executable-dep-lib-static/lib-static/pom.xml b/src/it/it0011-executable-dep-lib-static/lib-static/pom.xml
deleted file mode 100644
index 3ef44a4..0000000
--- a/src/it/it0011-executable-dep-lib-static/lib-static/pom.xml
+++ /dev/null
@@ -1,74 +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>it0011-pom</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>it0011-lib-static</artifactId>
-  <packaging>nar</packaging>
-  
-  <name>Maven NAR Static Library</name>
-  <version>1.0-SNAPSHOT</version>
-  <description>
-    Simple static library and test file
-  </description>
-  <url>http://maven.apache.org/</url>
-<!--
-  <properties>
-    <maven.test.skip>true</maven.test.skip>
-  </properties>
--->  
-
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <plugins>
-      <plugin>
-        <artifactId>maven-nar-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <libraries>
-            <library>
-              <type>static</type>
-            </library>
-          </libraries>
-          <tests>
-            <test>
-              <name>HelloWorldTest</name>
-              <link>static</link>
-            </test>
-          </tests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/src/it/it0011-executable-dep-lib-static/lib-static/src/main/c/HelloWorldLib.c b/src/it/it0011-executable-dep-lib-static/lib-static/src/main/c/HelloWorldLib.c
deleted file mode 100644
index 9f65143..0000000
--- a/src/it/it0011-executable-dep-lib-static/lib-static/src/main/c/HelloWorldLib.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-#include "HelloWorldLib.h"
-
-char* HelloWorldLib_sayHello() {
-	return "Hello NAR LIB World!";
-}
-
diff --git a/src/it/it0011-executable-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h b/src/it/it0011-executable-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h
deleted file mode 100644
index 8c50dfb..0000000
--- a/src/it/it0011-executable-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef HelloWorldLib_H
-#define HelloWorldLib_H
-
-extern char* HelloWorldLib_sayHello();
-
-#endif
diff --git a/src/it/it0011-executable-dep-lib-static/lib-static/src/test/c/HelloWorldTest.c b/src/it/it0011-executable-dep-lib-static/lib-static/src/test/c/HelloWorldTest.c
deleted file mode 100644
index 4aa35d8..0000000
--- a/src/it/it0011-executable-dep-lib-static/lib-static/src/test/c/HelloWorldTest.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdio.h>
-#include "HelloWorldLib.h"
-
-int main(int argc, char *argv[]) {
-	printf("%s\n", HelloWorldLib_sayHello());
-	return 0;
-}
-
-
diff --git a/src/it/it0011-executable-dep-lib-static/pom.xml b/src/it/it0011-executable-dep-lib-static/pom.xml
index 34142a2..74b92cd 100644
--- a/src/it/it0011-executable-dep-lib-static/pom.xml
+++ b/src/it/it0011-executable-dep-lib-static/pom.xml
@@ -29,21 +29,44 @@ under the License.
     <relativePath>../it-parent/pom.xml</relativePath>
   </parent>
 
-  <artifactId>it0011-pom</artifactId>
-  <packaging>pom</packaging>
+  <artifactId>it0011-executable-dep-lib-static</artifactId>
+  <packaging>nar</packaging>
   
   <name>Maven NAR Executable and Static Library</name>
   <version>1.0-SNAPSHOT</version>
   <description>
     Executable depending on a static library.
   </description>
-  
-  <build>
-    <defaultGoal>install</defaultGoal>
-  </build>  
 
-  <modules>
-    <module>executable-dep-lib-static</module>
-    <module>lib-static</module>
-  </modules>
+  <build>
+    <defaultGoal>integration-test</defaultGoal>
+    <plugins>
+      <plugin>
+        <artifactId>maven-nar-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <libraries>
+            <library>
+              <type>executable</type>
+              <run>true</run>
+            </library>
+          </libraries>
+        </configuration>
+      </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>it0010-lib-static</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/src/it/it0011-executable-dep-lib-static/src/main/c/HelloWorldExe.c b/src/it/it0011-executable-dep-lib-static/src/main/c/HelloWorldExe.c
new file mode 100644
index 0000000..4aa35d8
--- /dev/null
+++ b/src/it/it0011-executable-dep-lib-static/src/main/c/HelloWorldExe.c
@@ -0,0 +1,9 @@
+#include <stdio.h>
+#include "HelloWorldLib.h"
+
+int main(int argc, char *argv[]) {
+	printf("%s\n", HelloWorldLib_sayHello());
+	return 0;
+}
+
+
-- 
cgit v1.2.3