From e5033fc41be910c0f80d73c10e2baa4737569bfb Mon Sep 17 00:00:00 2001
From: snicoll <snicoll@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 17 Apr 2006 15:22:05 +0000
Subject: [PATCH] MPWAR-32: Fixed inclusion of LICENSE file in war

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@394695 13f79535-47bb-0310-9956-ffa450edef68
---
 war/plugin.jelly                              |  3 +
 war/src/plugin-test/test02/LICENSE.txt        |  1 +
 war/src/plugin-test/test02/maven.xml          | 39 +++++++++++++
 war/src/plugin-test/test02/project.properties |  1 +
 war/src/plugin-test/test02/project.xml        | 55 +++++++++++++++++++
 .../plugin-test/test02/src/webapp/index.html  | 25 +++++++++
 6 files changed, 124 insertions(+)
 create mode 100644 war/src/plugin-test/test02/LICENSE.txt
 create mode 100644 war/src/plugin-test/test02/maven.xml
 create mode 100644 war/src/plugin-test/test02/project.properties
 create mode 100644 war/src/plugin-test/test02/project.xml
 create mode 100644 war/src/plugin-test/test02/src/webapp/index.html

diff --git a/war/plugin.jelly b/war/plugin.jelly
index 516c8885..8c73f681 100644
--- a/war/plugin.jelly
+++ b/war/plugin.jelly
@@ -62,6 +62,9 @@
          destfile="${maven.war.build.dir}/${maven.war.final.name}"
          basedir="${maven.war.webapp.dir}"         
          index="${maven.war.index}">
+
+      <j:set var="licenseFileName"><license:fileName/></j:set>
+      <util:file name="${licenseFileName}" var="licenseFile"/>
       <ant:metainf dir="${licenseFile.canonicalFile.parent}">
         <ant:include name="${licenseFile.canonicalFile.name}"/>
       </ant:metainf>
diff --git a/war/src/plugin-test/test02/LICENSE.txt b/war/src/plugin-test/test02/LICENSE.txt
new file mode 100644
index 00000000..6192027b
--- /dev/null
+++ b/war/src/plugin-test/test02/LICENSE.txt
@@ -0,0 +1 @@
+Sample license
\ No newline at end of file
diff --git a/war/src/plugin-test/test02/maven.xml b/war/src/plugin-test/test02/maven.xml
new file mode 100644
index 00000000..2ae6a407
--- /dev/null
+++ b/war/src/plugin-test/test02/maven.xml
@@ -0,0 +1,39 @@
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed 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:j="jelly:core"
+         xmlns:assert="assert"
+         xmlns:u="jelly:util">
+
+  <goal name="testPlugin" prereqs="test-war"/>
+  
+  <goal name="test-war" prereqs="clean">
+    <attainGoal name="war"/>
+    <j:set var="warFile" value="${maven.build.dir}/${pom.artifactId}.war"/>
+    <j:set var="warDir" value="${maven.build.dir}/${pom.artifactId}"/>
+    <assert:assertFileExists file="${warFile}"/>
+    <assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging-1.0.4.jar"/>
+
+    <!-- check for LICENSE file -->
+    <j:set var="unzipDir" value="${maven.build.dir}/unzippedWar"/>
+    <mkdir dir="${unzipDir}"/>
+    <unzip src="${warFile}" dest="${unzipDir}"/>
+
+    <!-- check for the LICENSE -->
+    <assert:assertFileExists file="${unzipDir}/META-INF/LICENSE.txt"/>
+  </goal>
+</project>
\ No newline at end of file
diff --git a/war/src/plugin-test/test02/project.properties b/war/src/plugin-test/test02/project.properties
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/war/src/plugin-test/test02/project.properties
@@ -0,0 +1 @@
+
diff --git a/war/src/plugin-test/test02/project.xml b/war/src/plugin-test/test02/project.xml
new file mode 100644
index 00000000..ec628ede
--- /dev/null
+++ b/war/src/plugin-test/test02/project.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed 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>
+  <pomVersion>3</pomVersion>
+  <id>test-maven-war-plugin-license</id>
+  <name>Maven War Plugin 02</name>
+  <groupId>maven</groupId>
+  <currentVersion>1.0</currentVersion>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+    <logo>http://maven.apache.org/images/apache-maven-project.png</logo>
+  </organization>
+  <inceptionYear>2001</inceptionYear>
+  <package>org.apache.maven</package>
+  <logo>http://maven.apache.org/images/maven.gif</logo>
+  <description>Test for Maven War plugin, tests property maven.war.manifest</description>
+  <shortDescription>test for maven.war.manifest</shortDescription>
+  <url>http://maven.apache.org/maven-1.x/plugins/war/</url>
+  <siteDirectory>/www/maven.apache.org/maven-1.x/plugins/war/</siteDirectory>
+  <repository>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/war/</connection>
+    <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/war/</url>
+  </repository>
+  <dependencies>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.4</version>
+      <url>http://jakarta.apache.org/commons/logging.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+        <war.manifest.classpath>true</war.manifest.classpath>
+      </properties>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/war/src/plugin-test/test02/src/webapp/index.html b/war/src/plugin-test/test02/src/webapp/index.html
new file mode 100644
index 00000000..71af9dd6
--- /dev/null
+++ b/war/src/plugin-test/test02/src/webapp/index.html
@@ -0,0 +1,25 @@
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed 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.
+ */
+ -->
+<html>
+  <body>
+    <h1>Simple WebApp Home</h1>
+    <p>
+      This is a html page for Simple Web App
+    </p>
+  </body>
+</html>
\ No newline at end of file