From f627552a60d32aa15e5487b04263bcc755b2f430 Mon Sep 17 00:00:00 2001
From: Mark Donszelmann <Mark.Donszelmann@gmail.com>
Date: Mon, 11 Jan 2010 12:35:02 +0100
Subject: Shortened most names

---
 .../it0016-exe-dep-lib-layout20/pom.xml            | 72 ++++++++++++++++++++++
 .../src/main/c/HelloWorldExe.c                     |  9 +++
 .../it0016-exe-dep-lib-layout21/pom.xml            | 70 +++++++++++++++++++++
 .../src/main/c/HelloWorldExe.c                     |  9 +++
 .../it0016-exe-dep-lib-shared-layout20/pom.xml     | 72 ----------------------
 .../src/main/c/HelloWorldExe.c                     |  9 ---
 .../it0016-exe-dep-lib-shared-layout21/pom.xml     | 70 ---------------------
 .../src/main/c/HelloWorldExe.c                     |  9 ---
 src/it/it0016-layout/it0016-lib-layout20/pom.xml   | 68 ++++++++++++++++++++
 .../it0016-lib-layout20/src/main/c/HelloWorldLib.c |  7 +++
 .../src/main/include/HelloWorldLib.h               |  9 +++
 .../src/test/c/HelloWorldTest.c                    |  9 +++
 src/it/it0016-layout/it0016-lib-layout21/pom.xml   | 68 ++++++++++++++++++++
 .../it0016-lib-layout21/src/main/c/HelloWorldLib.c |  7 +++
 .../src/main/include/HelloWorldLib.h               |  9 +++
 .../src/test/c/HelloWorldTest.c                    |  9 +++
 .../it0016-lib-shared-layout20/pom.xml             | 68 --------------------
 .../src/main/c/HelloWorldLib.c                     |  7 ---
 .../src/main/include/HelloWorldLib.h               |  9 ---
 .../src/test/c/HelloWorldTest.c                    |  9 ---
 .../it0016-lib-shared-layout21/pom.xml             | 68 --------------------
 .../src/main/c/HelloWorldLib.c                     |  7 ---
 .../src/main/include/HelloWorldLib.h               |  9 ---
 .../src/test/c/HelloWorldTest.c                    |  9 ---
 src/it/it0016-layout/pom.xml                       |  8 +--
 25 files changed, 350 insertions(+), 350 deletions(-)
 create mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-layout20/pom.xml
 create mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-layout20/src/main/c/HelloWorldExe.c
 create mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-layout21/pom.xml
 create mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-layout21/src/main/c/HelloWorldExe.c
 delete mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/pom.xml
 delete mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c
 delete mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/pom.xml
 delete mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c
 create mode 100644 src/it/it0016-layout/it0016-lib-layout20/pom.xml
 create mode 100644 src/it/it0016-layout/it0016-lib-layout20/src/main/c/HelloWorldLib.c
 create mode 100644 src/it/it0016-layout/it0016-lib-layout20/src/main/include/HelloWorldLib.h
 create mode 100644 src/it/it0016-layout/it0016-lib-layout20/src/test/c/HelloWorldTest.c
 create mode 100644 src/it/it0016-layout/it0016-lib-layout21/pom.xml
 create mode 100644 src/it/it0016-layout/it0016-lib-layout21/src/main/c/HelloWorldLib.c
 create mode 100644 src/it/it0016-layout/it0016-lib-layout21/src/main/include/HelloWorldLib.h
 create mode 100644 src/it/it0016-layout/it0016-lib-layout21/src/test/c/HelloWorldTest.c
 delete mode 100644 src/it/it0016-layout/it0016-lib-shared-layout20/pom.xml
 delete mode 100644 src/it/it0016-layout/it0016-lib-shared-layout20/src/main/c/HelloWorldLib.c
 delete mode 100644 src/it/it0016-layout/it0016-lib-shared-layout20/src/main/include/HelloWorldLib.h
 delete mode 100644 src/it/it0016-layout/it0016-lib-shared-layout20/src/test/c/HelloWorldTest.c
 delete mode 100644 src/it/it0016-layout/it0016-lib-shared-layout21/pom.xml
 delete mode 100644 src/it/it0016-layout/it0016-lib-shared-layout21/src/main/c/HelloWorldLib.c
 delete mode 100644 src/it/it0016-layout/it0016-lib-shared-layout21/src/main/include/HelloWorldLib.h
 delete mode 100644 src/it/it0016-layout/it0016-lib-shared-layout21/src/test/c/HelloWorldTest.c

diff --git a/src/it/it0016-layout/it0016-exe-dep-lib-layout20/pom.xml b/src/it/it0016-layout/it0016-exe-dep-lib-layout20/pom.xml
new file mode 100644
index 0000000..e1d4b26
--- /dev/null
+++ b/src/it/it0016-layout/it0016-exe-dep-lib-layout20/pom.xml
@@ -0,0 +1,72 @@
+<?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>it0016-pom</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>it0016-exe-dep-lib-layout20</artifactId>
+  <packaging>nar</packaging>
+  
+  <name>Maven NAR Executable and Shared Library (Layout20)</name>
+  <version>1.0-SNAPSHOT</version>
+  <description>
+    Executable depending on a shared library.
+  </description>
+
+  <properties>
+    <skipTests>true</skipTests>
+  </properties>
+   
+  <build>
+    <defaultGoal>integration-test</defaultGoal>
+    <plugins>
+      <plugin>
+        <artifactId>maven-nar-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <!-- dependencies get unpacked in NarLayout 20 -->
+          <layout>NarLayout20</layout>
+          <libraries>
+            <library>
+              <type>executable</type>
+              <run>true</run>
+            </library>
+          </libraries>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.nar</groupId>
+      <artifactId>it0016-lib-layout20</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <type>nar</type>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/src/it/it0016-layout/it0016-exe-dep-lib-layout20/src/main/c/HelloWorldExe.c b/src/it/it0016-layout/it0016-exe-dep-lib-layout20/src/main/c/HelloWorldExe.c
new file mode 100644
index 0000000..4aa35d8
--- /dev/null
+++ b/src/it/it0016-layout/it0016-exe-dep-lib-layout20/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;
+}
+
+
diff --git a/src/it/it0016-layout/it0016-exe-dep-lib-layout21/pom.xml b/src/it/it0016-layout/it0016-exe-dep-lib-layout21/pom.xml
new file mode 100644
index 0000000..f620fae
--- /dev/null
+++ b/src/it/it0016-layout/it0016-exe-dep-lib-layout21/pom.xml
@@ -0,0 +1,70 @@
+<?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>it0016-pom</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>it0016-exe-dep-lib-layout21</artifactId>
+  <packaging>nar</packaging>
+  
+  <name>Maven NAR Executable and Shared Library (Layout21)</name>
+  <version>1.0-SNAPSHOT</version>
+  <description>
+    Executable depending on a shared library.
+  </description>
+
+  <properties>
+    <skipTests>true</skipTests>
+  </properties>
+   
+  <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>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.nar</groupId>
+      <artifactId>it0016-lib-layout21</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <type>nar</type>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/src/it/it0016-layout/it0016-exe-dep-lib-layout21/src/main/c/HelloWorldExe.c b/src/it/it0016-layout/it0016-exe-dep-lib-layout21/src/main/c/HelloWorldExe.c
new file mode 100644
index 0000000..4aa35d8
--- /dev/null
+++ b/src/it/it0016-layout/it0016-exe-dep-lib-layout21/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;
+}
+
+
diff --git a/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/pom.xml b/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/pom.xml
deleted file mode 100644
index 483e86c..0000000
--- a/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/pom.xml
+++ /dev/null
@@ -1,72 +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>it0016-pom</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>it0016-exe-dep-lib-shared-layout20</artifactId>
-  <packaging>nar</packaging>
-  
-  <name>Maven NAR Executable and Shared Library (Layout20)</name>
-  <version>1.0-SNAPSHOT</version>
-  <description>
-    Executable depending on a shared library.
-  </description>
-
-  <properties>
-    <skipTests>true</skipTests>
-  </properties>
-   
-  <build>
-    <defaultGoal>integration-test</defaultGoal>
-    <plugins>
-      <plugin>
-        <artifactId>maven-nar-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <!-- dependencies get unpacked in NarLayout 20 -->
-          <layout>NarLayout20</layout>
-          <libraries>
-            <library>
-              <type>executable</type>
-              <run>true</run>
-            </library>
-          </libraries>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.nar</groupId>
-      <artifactId>it0016-lib-shared-layout20</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>nar</type>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c b/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c
deleted file mode 100644
index 4aa35d8..0000000
--- a/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/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/it0016-layout/it0016-exe-dep-lib-shared-layout21/pom.xml b/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/pom.xml
deleted file mode 100644
index 63f8851..0000000
--- a/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/pom.xml
+++ /dev/null
@@ -1,70 +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>it0016-pom</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>it0016-exe-dep-lib-shared-layout21</artifactId>
-  <packaging>nar</packaging>
-  
-  <name>Maven NAR Executable and Shared Library (Layout21)</name>
-  <version>1.0-SNAPSHOT</version>
-  <description>
-    Executable depending on a shared library.
-  </description>
-
-  <properties>
-    <skipTests>true</skipTests>
-  </properties>
-   
-  <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>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.nar</groupId>
-      <artifactId>it0016-lib-shared-layout21</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>nar</type>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c b/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c
deleted file mode 100644
index 4aa35d8..0000000
--- a/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/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/it0016-layout/it0016-lib-layout20/pom.xml b/src/it/it0016-layout/it0016-lib-layout20/pom.xml
new file mode 100644
index 0000000..36971d0
--- /dev/null
+++ b/src/it/it0016-layout/it0016-lib-layout20/pom.xml
@@ -0,0 +1,68 @@
+<?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>it0016-pom</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>it0016-lib-layout20</artifactId>
+  <packaging>nar</packaging>
+  
+  <name>Maven NAR Shared Library (Layout20)</name>
+  <version>1.0-SNAPSHOT</version>  
+  <description>
+    Simple shared library and test file
+  </description>
+  <url>http://maven.apache.org/</url>
+
+  <properties>
+    <skipTests>true</skipTests>
+  </properties>
+  
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <plugins>
+      <plugin>
+        <artifactId>maven-nar-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <layout>NarLayout20</layout>
+          <libraries>
+            <library>
+              <type>shared</type>
+            </library>
+          </libraries>
+          <tests>
+            <test>
+              <name>HelloWorldTest</name>
+              <link>shared</link>
+            </test>
+          </tests>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/it/it0016-layout/it0016-lib-layout20/src/main/c/HelloWorldLib.c b/src/it/it0016-layout/it0016-lib-layout20/src/main/c/HelloWorldLib.c
new file mode 100644
index 0000000..9f65143
--- /dev/null
+++ b/src/it/it0016-layout/it0016-lib-layout20/src/main/c/HelloWorldLib.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+#include "HelloWorldLib.h"
+
+char* HelloWorldLib_sayHello() {
+	return "Hello NAR LIB World!";
+}
+
diff --git a/src/it/it0016-layout/it0016-lib-layout20/src/main/include/HelloWorldLib.h b/src/it/it0016-layout/it0016-lib-layout20/src/main/include/HelloWorldLib.h
new file mode 100644
index 0000000..e801bec
--- /dev/null
+++ b/src/it/it0016-layout/it0016-lib-layout20/src/main/include/HelloWorldLib.h
@@ -0,0 +1,9 @@
+#ifndef HelloWorldLib_H
+#define HelloWorldLib_H
+
+#ifdef WIN32
+__declspec(dllexport) 
+#endif
+extern char* HelloWorldLib_sayHello();
+
+#endif
diff --git a/src/it/it0016-layout/it0016-lib-layout20/src/test/c/HelloWorldTest.c b/src/it/it0016-layout/it0016-lib-layout20/src/test/c/HelloWorldTest.c
new file mode 100644
index 0000000..4aa35d8
--- /dev/null
+++ b/src/it/it0016-layout/it0016-lib-layout20/src/test/c/HelloWorldTest.c
@@ -0,0 +1,9 @@
+#include <stdio.h>
+#include "HelloWorldLib.h"
+
+int main(int argc, char *argv[]) {
+	printf("%s\n", HelloWorldLib_sayHello());
+	return 0;
+}
+
+
diff --git a/src/it/it0016-layout/it0016-lib-layout21/pom.xml b/src/it/it0016-layout/it0016-lib-layout21/pom.xml
new file mode 100644
index 0000000..1bf9af4
--- /dev/null
+++ b/src/it/it0016-layout/it0016-lib-layout21/pom.xml
@@ -0,0 +1,68 @@
+<?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>it0016-pom</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>it0016-lib-layout21</artifactId>
+  <packaging>nar</packaging>
+  
+  <name>Maven NAR Shared Library (Layout21)</name>
+  <version>1.0-SNAPSHOT</version>  
+  <description>
+    Simple shared library and test file
+  </description>
+  <url>http://maven.apache.org/</url>
+
+  <properties>
+    <skipTests>true</skipTests>
+  </properties>
+  
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <plugins>
+      <plugin>
+        <artifactId>maven-nar-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <layout>NarLayout21</layout>
+          <libraries>
+            <library>
+              <type>shared</type>
+            </library>
+          </libraries>
+          <tests>
+            <test>
+              <name>HelloWorldTest</name>
+              <link>shared</link>
+            </test>
+          </tests>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/it/it0016-layout/it0016-lib-layout21/src/main/c/HelloWorldLib.c b/src/it/it0016-layout/it0016-lib-layout21/src/main/c/HelloWorldLib.c
new file mode 100644
index 0000000..9f65143
--- /dev/null
+++ b/src/it/it0016-layout/it0016-lib-layout21/src/main/c/HelloWorldLib.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+#include "HelloWorldLib.h"
+
+char* HelloWorldLib_sayHello() {
+	return "Hello NAR LIB World!";
+}
+
diff --git a/src/it/it0016-layout/it0016-lib-layout21/src/main/include/HelloWorldLib.h b/src/it/it0016-layout/it0016-lib-layout21/src/main/include/HelloWorldLib.h
new file mode 100644
index 0000000..e801bec
--- /dev/null
+++ b/src/it/it0016-layout/it0016-lib-layout21/src/main/include/HelloWorldLib.h
@@ -0,0 +1,9 @@
+#ifndef HelloWorldLib_H
+#define HelloWorldLib_H
+
+#ifdef WIN32
+__declspec(dllexport) 
+#endif
+extern char* HelloWorldLib_sayHello();
+
+#endif
diff --git a/src/it/it0016-layout/it0016-lib-layout21/src/test/c/HelloWorldTest.c b/src/it/it0016-layout/it0016-lib-layout21/src/test/c/HelloWorldTest.c
new file mode 100644
index 0000000..4aa35d8
--- /dev/null
+++ b/src/it/it0016-layout/it0016-lib-layout21/src/test/c/HelloWorldTest.c
@@ -0,0 +1,9 @@
+#include <stdio.h>
+#include "HelloWorldLib.h"
+
+int main(int argc, char *argv[]) {
+	printf("%s\n", HelloWorldLib_sayHello());
+	return 0;
+}
+
+
diff --git a/src/it/it0016-layout/it0016-lib-shared-layout20/pom.xml b/src/it/it0016-layout/it0016-lib-shared-layout20/pom.xml
deleted file mode 100644
index 1b4c319..0000000
--- a/src/it/it0016-layout/it0016-lib-shared-layout20/pom.xml
+++ /dev/null
@@ -1,68 +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>it0016-pom</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>it0016-lib-shared-layout20</artifactId>
-  <packaging>nar</packaging>
-  
-  <name>Maven NAR Shared Library (Layout20)</name>
-  <version>1.0-SNAPSHOT</version>  
-  <description>
-    Simple shared library and test file
-  </description>
-  <url>http://maven.apache.org/</url>
-
-  <properties>
-    <skipTests>true</skipTests>
-  </properties>
-  
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <plugins>
-      <plugin>
-        <artifactId>maven-nar-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <layout>NarLayout20</layout>
-          <libraries>
-            <library>
-              <type>shared</type>
-            </library>
-          </libraries>
-          <tests>
-            <test>
-              <name>HelloWorldTest</name>
-              <link>shared</link>
-            </test>
-          </tests>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/src/it/it0016-layout/it0016-lib-shared-layout20/src/main/c/HelloWorldLib.c b/src/it/it0016-layout/it0016-lib-shared-layout20/src/main/c/HelloWorldLib.c
deleted file mode 100644
index 9f65143..0000000
--- a/src/it/it0016-layout/it0016-lib-shared-layout20/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/it0016-layout/it0016-lib-shared-layout20/src/main/include/HelloWorldLib.h b/src/it/it0016-layout/it0016-lib-shared-layout20/src/main/include/HelloWorldLib.h
deleted file mode 100644
index e801bec..0000000
--- a/src/it/it0016-layout/it0016-lib-shared-layout20/src/main/include/HelloWorldLib.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef HelloWorldLib_H
-#define HelloWorldLib_H
-
-#ifdef WIN32
-__declspec(dllexport) 
-#endif
-extern char* HelloWorldLib_sayHello();
-
-#endif
diff --git a/src/it/it0016-layout/it0016-lib-shared-layout20/src/test/c/HelloWorldTest.c b/src/it/it0016-layout/it0016-lib-shared-layout20/src/test/c/HelloWorldTest.c
deleted file mode 100644
index 4aa35d8..0000000
--- a/src/it/it0016-layout/it0016-lib-shared-layout20/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/it0016-layout/it0016-lib-shared-layout21/pom.xml b/src/it/it0016-layout/it0016-lib-shared-layout21/pom.xml
deleted file mode 100644
index 8eceedc..0000000
--- a/src/it/it0016-layout/it0016-lib-shared-layout21/pom.xml
+++ /dev/null
@@ -1,68 +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>it0016-pom</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>it0016-lib-shared-layout21</artifactId>
-  <packaging>nar</packaging>
-  
-  <name>Maven NAR Shared Library (Layout21)</name>
-  <version>1.0-SNAPSHOT</version>  
-  <description>
-    Simple shared library and test file
-  </description>
-  <url>http://maven.apache.org/</url>
-
-  <properties>
-    <skipTests>true</skipTests>
-  </properties>
-  
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <plugins>
-      <plugin>
-        <artifactId>maven-nar-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <layout>NarLayout21</layout>
-          <libraries>
-            <library>
-              <type>shared</type>
-            </library>
-          </libraries>
-          <tests>
-            <test>
-              <name>HelloWorldTest</name>
-              <link>shared</link>
-            </test>
-          </tests>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/src/it/it0016-layout/it0016-lib-shared-layout21/src/main/c/HelloWorldLib.c b/src/it/it0016-layout/it0016-lib-shared-layout21/src/main/c/HelloWorldLib.c
deleted file mode 100644
index 9f65143..0000000
--- a/src/it/it0016-layout/it0016-lib-shared-layout21/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/it0016-layout/it0016-lib-shared-layout21/src/main/include/HelloWorldLib.h b/src/it/it0016-layout/it0016-lib-shared-layout21/src/main/include/HelloWorldLib.h
deleted file mode 100644
index e801bec..0000000
--- a/src/it/it0016-layout/it0016-lib-shared-layout21/src/main/include/HelloWorldLib.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef HelloWorldLib_H
-#define HelloWorldLib_H
-
-#ifdef WIN32
-__declspec(dllexport) 
-#endif
-extern char* HelloWorldLib_sayHello();
-
-#endif
diff --git a/src/it/it0016-layout/it0016-lib-shared-layout21/src/test/c/HelloWorldTest.c b/src/it/it0016-layout/it0016-lib-shared-layout21/src/test/c/HelloWorldTest.c
deleted file mode 100644
index 4aa35d8..0000000
--- a/src/it/it0016-layout/it0016-lib-shared-layout21/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/it0016-layout/pom.xml b/src/it/it0016-layout/pom.xml
index ec4395c..1a64d38 100644
--- a/src/it/it0016-layout/pom.xml
+++ b/src/it/it0016-layout/pom.xml
@@ -44,9 +44,9 @@ under the License.
   </build>
 
   <modules>
-    <module>it0016-exe-dep-lib-shared-layout20</module>
-    <module>it0016-exe-dep-lib-shared-layout21</module>
-    <module>it0016-lib-shared-layout20</module>
-    <module>it0016-lib-shared-layout21</module>
+    <module>it0016-exe-dep-lib-layout20</module>
+    <module>it0016-exe-dep-lib-layout21</module>
+    <module>it0016-lib-layout20</module>
+    <module>it0016-lib-layout21</module>
   </modules>
 </project>
-- 
cgit v1.2.3