From f8f2fda5699908139fc5f610358538d2247ffc4d Mon Sep 17 00:00:00 2001
From: Mark Donszelmann <Mark.Donszelmann@gmail.com>
Date: Mon, 11 Jan 2010 11:39:26 +0100
Subject: Renamed some directories

---
 .../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 +++
 .../pom.xml                                        | 72 ----------------------
 .../src/main/c/HelloWorldExe.c                     |  9 ---
 .../pom.xml                                        | 70 ---------------------
 .../src/main/c/HelloWorldExe.c                     |  9 ---
 .../apache/maven/plugin/nar/NarCompileMojo.java    |  2 +-
 9 files changed, 161 insertions(+), 161 deletions(-)
 create mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/pom.xml
 create mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c
 create mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/pom.xml
 create mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c
 delete mode 100644 src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/pom.xml
 delete mode 100644 src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c
 delete mode 100644 src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/pom.xml
 delete mode 100644 src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c

(limited to 'src')

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
new file mode 100644
index 0000000..3ec4393
--- /dev/null
+++ b/src/it/it0016-layout/it0016-exe-dep-lib-shared-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-executable-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
new file mode 100644
index 0000000..4aa35d8
--- /dev/null
+++ b/src/it/it0016-layout/it0016-exe-dep-lib-shared-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-shared-layout21/pom.xml b/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/pom.xml
new file mode 100644
index 0000000..d5e21ef
--- /dev/null
+++ b/src/it/it0016-layout/it0016-exe-dep-lib-shared-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-executable-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
new file mode 100644
index 0000000..4aa35d8
--- /dev/null
+++ b/src/it/it0016-layout/it0016-exe-dep-lib-shared-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-executable-dep-lib-shared-layout20/pom.xml b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/pom.xml
deleted file mode 100644
index 3ec4393..0000000
--- a/src/it/it0016-layout/it0016-executable-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-executable-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-executable-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c
deleted file mode 100644
index 4aa35d8..0000000
--- a/src/it/it0016-layout/it0016-executable-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-executable-dep-lib-shared-layout21/pom.xml b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/pom.xml
deleted file mode 100644
index d5e21ef..0000000
--- a/src/it/it0016-layout/it0016-executable-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-executable-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-executable-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c
deleted file mode 100644
index 4aa35d8..0000000
--- a/src/it/it0016-layout/it0016-executable-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/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
index fad50fa..811ce70 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
@@ -141,7 +141,7 @@ public class NarCompileMojo
         // configure task
         CCTask task = new CCTask();
         task.setProject( antProject );
-
+        
         // subsystem
         SubsystemEnum subSystem = new SubsystemEnum();
         subSystem.setValue( library.getSubSystem() );
-- 
cgit v1.2.3