From 428d590c789ba22dc00235fefa920eaea73f427d Mon Sep 17 00:00:00 2001
From: snicoll <snicoll@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 1 May 2007 16:09:07 +0000
Subject: [PATCH] MPWAR-61:  Introduced war.target.filename dependency's
 property to customize the bundle filename. Note that this property should be
 used wit the war.target.path property

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@534142 13f79535-47bb-0310-9956-ffa450edef68
---
 war/plugin.jelly                              | 12 +++-
 war/src/plugin-test/test06/LICENSE.txt        |  1 +
 war/src/plugin-test/test06/maven.xml          | 33 +++++++++++
 war/src/plugin-test/test06/project.properties |  8 +++
 war/src/plugin-test/test06/project.xml        | 56 +++++++++++++++++++
 .../plugin-test/test06/src/webapp/index.html  | 26 +++++++++
 war/xdocs/changes.xml                         |  4 ++
 war/xdocs/index.xml                           | 16 +++++-
 8 files changed, 151 insertions(+), 5 deletions(-)
 create mode 100644 war/src/plugin-test/test06/LICENSE.txt
 create mode 100644 war/src/plugin-test/test06/maven.xml
 create mode 100644 war/src/plugin-test/test06/project.properties
 create mode 100644 war/src/plugin-test/test06/project.xml
 create mode 100644 war/src/plugin-test/test06/src/webapp/index.html

diff --git a/war/plugin.jelly b/war/plugin.jelly
index 1cad8b92..c6e5aff3 100644
--- a/war/plugin.jelly
+++ b/war/plugin.jelly
@@ -235,9 +235,15 @@
       <!-- END OF TO BE REMOVED -->
 
       <j:set var="targetPath" value="${dep.getProperty('war.target.path')}"/>
-      <j:if test="${!empty(targetPath)}">
-        <ant:copy todir="${maven.war.webapp.dir}/${targetPath}" file="${lib.path}"/>
-      </j:if>
+      <j:set var="targetFileName" value="${dep.getProperty('war.target.filename')}"/>
+      <j:choose>
+        <j:when test="${!empty(targetPath) and empty(targetFileName)}">
+          <ant:copy todir="${maven.war.webapp.dir}/${targetPath}" file="${lib.path}"/>
+        </j:when>
+        <j:when test="${!empty(targetPath) and !empty(targetFileName)}">
+          <ant:copy tofile="${maven.war.webapp.dir}/${targetPath}/${targetFileName}" file="${lib.path}"/>
+        </j:when>
+      </j:choose>
     </j:forEach>
 
     <util:available file="${maven.build.dest}">
diff --git a/war/src/plugin-test/test06/LICENSE.txt b/war/src/plugin-test/test06/LICENSE.txt
new file mode 100644
index 00000000..6192027b
--- /dev/null
+++ b/war/src/plugin-test/test06/LICENSE.txt
@@ -0,0 +1 @@
+Sample license
\ No newline at end of file
diff --git a/war/src/plugin-test/test06/maven.xml b/war/src/plugin-test/test06/maven.xml
new file mode 100644
index 00000000..d0629369
--- /dev/null
+++ b/war/src/plugin-test/test06/maven.xml
@@ -0,0 +1,33 @@
+<!-- 
+/*
+ * 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: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}/libs/commons-logging.jar"/>
+
+  </goal>
+</project>
\ No newline at end of file
diff --git a/war/src/plugin-test/test06/project.properties b/war/src/plugin-test/test06/project.properties
new file mode 100644
index 00000000..9bf0a69b
--- /dev/null
+++ b/war/src/plugin-test/test06/project.properties
@@ -0,0 +1,8 @@
+
+#
+# Expand properties
+maven.war.property.expansion=true
+
+#
+# Property being replaced
+my.cool.property=${pom.artifactId}
diff --git a/war/src/plugin-test/test06/project.xml b/war/src/plugin-test/test06/project.xml
new file mode 100644
index 00000000..733f2ae2
--- /dev/null
+++ b/war/src/plugin-test/test06/project.xml
@@ -0,0 +1,56 @@
+<?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>
+  <pomVersion>3</pomVersion>
+  <id>test-maven-war-plugin-target-filename</id>
+  <name>Maven War Plugin 06</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 maven.war.target.filename</description>
+  <shortDescription>test for maven.war.property.expansion</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.target.path>libs</war.target.path>
+        <war.target.filename>commons-logging.jar</war.target.filename>
+      </properties>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/war/src/plugin-test/test06/src/webapp/index.html b/war/src/plugin-test/test06/src/webapp/index.html
new file mode 100644
index 00000000..a57c1fc5
--- /dev/null
+++ b/war/src/plugin-test/test06/src/webapp/index.html
@@ -0,0 +1,26 @@
+<!-- 
+/*
+ * 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.
+ */
+ -->
+<html>
+  <body>
+    <h1>Simple WebApp Home</h1>
+    <p>
+      This is a html page for ${my.cool.property}
+    </p>
+  </body>
+</html>
\ No newline at end of file
diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml
index 9528cd6e..5e0fb117 100644
--- a/war/xdocs/changes.xml
+++ b/war/xdocs/changes.xml
@@ -25,6 +25,10 @@
   </properties>
   <body>
     <release version="1.6.3-SNAPSHOT" date="in SVN">
+      <action dev="snicoll" type="fix" issue="MPWAR-61">
+          Introduced war.target.filename dependency's property to customize the bundle filename. Note
+          that this property should be used wit the war.target.path property.
+      </action>
       <action dev="snicoll" type="fix" issue="MPWAR-65">Added maven.war.expansion.excludes property
           to exclude files during a property expansion copy (Fixes corruption of binary files).
           Applied property expansion to web.xml handling for consistency. Introduced the maven.war.src.filtering
diff --git a/war/xdocs/index.xml b/war/xdocs/index.xml
index 0d69d2c7..8f8b755e 100644
--- a/war/xdocs/index.xml
+++ b/war/xdocs/index.xml
@@ -40,9 +40,12 @@ properties you can use.</p>
 <code>/WEB-INF/lib</code></td></tr>
 <tr><td><code>war.target.path</code></td><td>This bundles the dependency in the path
 specified relative to the base of the web application.</td></tr>
+<tr><td><code>war.target.filename</code></td><td>This specifies the filename of the
+the dependency in the path specified by the <code>war.target.path</code> property.</td></tr>
 </table>
-<p>For example, the following adds commons-lang to <code>/WEB-INF/lib</code> and
-myApplet to the <code>/applets</code> directory.
+<p>For example, the following adds commons-lang to <code>/WEB-INF/lib</code>,
+myApplet to the <code>/applets</code> directory and anotherApplet in
+<code>/applets/another-applet.jar</code>.
         </p>
 <source><![CDATA[
   <dependency>
@@ -59,6 +62,15 @@ myApplet to the <code>/applets</code> directory.
     <properties>
       <war.target.path>applets</war.target.path>
     </properties>
+  </dependency>
+
+   <dependency>
+    <id>anotherApplet</id>
+    <version>1.2</version>
+    <properties>
+      <war.target.path>applets</war.target.path>
+      <war.target.filename>another-applet.jar</war.target.filename>
+    </properties>
   </dependency>]]></source>
       </subsection>
       <subsection name="Filtering web.xml">