From 05a5ec113e5187efdf88b658ea98b6cc80d63625 Mon Sep 17 00:00:00 2001
From: felipeal <felipeal@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 18 Oct 2004 17:19:31 +0000
Subject: [PATCH] MPJAR-38: added property maven.jar.final.name

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116150 13f79535-47bb-0310-9956-ffa450edef68
---
 jar/plugin.jelly                              | 10 ++--
 jar/plugin.properties                         |  1 +
 jar/project.xml                               |  2 +-
 jar/src/plugin-test/.cvsignore                |  5 ++
 jar/src/plugin-test/maven.xml                 | 22 ++++++++
 jar/src/plugin-test/project.xml               | 43 +++++++++++++++
 jar/src/plugin-test/test01/.cvsignore         |  2 +
 jar/src/plugin-test/test01/maven.xml          | 34 ++++++++++++
 jar/src/plugin-test/test01/project.properties |  1 +
 jar/src/plugin-test/test01/project.xml        | 52 +++++++++++++++++++
 jar/xdocs/changes.xml                         |  3 ++
 jar/xdocs/properties.xml                      |  9 ++++
 12 files changed, 178 insertions(+), 6 deletions(-)
 create mode 100644 jar/src/plugin-test/.cvsignore
 create mode 100644 jar/src/plugin-test/maven.xml
 create mode 100644 jar/src/plugin-test/project.xml
 create mode 100644 jar/src/plugin-test/test01/.cvsignore
 create mode 100644 jar/src/plugin-test/test01/maven.xml
 create mode 100644 jar/src/plugin-test/test01/project.properties
 create mode 100644 jar/src/plugin-test/test01/project.xml

diff --git a/jar/plugin.jelly b/jar/plugin.jelly
index 88657442..891afb15 100644
--- a/jar/plugin.jelly
+++ b/jar/plugin.jelly
@@ -66,7 +66,7 @@
     <!-- See http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html -->
     <!-- See http://java.sun.com/j2se/1.4.1/docs/guide/jar/jar.html -->
     <ant:jar
-      jarfile="${maven.build.dir}/${maven.final.name}.jar"
+      jarfile="${maven.build.dir}/${maven.jar.final.name}"
       basedir="${maven.build.dest}"
       index="${maven.jar.index}"
       compress="${maven.jar.compress}"
@@ -209,7 +209,7 @@
     description="Deploy a snapshot jar to the remote repository">
 
     <artifact:deploy-snapshot
-      artifact="${maven.build.dir}/${maven.final.name}.jar"
+      artifact="${maven.build.dir}/${maven.jar.final.name}"
       type="jar"
       project="${pom}"
     />
@@ -225,7 +225,7 @@
     description="Deploy a jar to the remote repository">
 
     <artifact:deploy
-      artifact="${maven.build.dir}/${maven.final.name}.jar"
+      artifact="${maven.build.dir}/${maven.jar.final.name}"
       type="jar"
       project="${pom}"
     />
@@ -239,7 +239,7 @@
     description="Install the jar in the local repository">
     
     <artifact:install
-      artifact="${maven.build.dir}/${maven.final.name}.jar"
+      artifact="${maven.build.dir}/${maven.jar.final.name}"
       type="jar"
       project="${pom}"
     />
@@ -254,7 +254,7 @@
     description="Install a snapshot jar in the local repository">
 
     <artifact:install-snapshot
-      artifact="${maven.build.dir}/${maven.final.name}.jar"
+      artifact="${maven.build.dir}/${maven.jar.final.name}"
       type="jar"
       project="${pom}"
     />
diff --git a/jar/plugin.properties b/jar/plugin.properties
index cc400958..97bb6053 100644
--- a/jar/plugin.properties
+++ b/jar/plugin.properties
@@ -24,3 +24,4 @@ maven.jar.manifest.extensions.add=false
 maven.jar.excludes = **/package.html
 maven.jar.index=false
 maven.jar.compress=true
+maven.jar.final.name = ${maven.final.name}.jar
diff --git a/jar/project.xml b/jar/project.xml
index 292dd433..ba6ac860 100644
--- a/jar/project.xml
+++ b/jar/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jar-plugin</id>
   <name>Maven Jar Plug-in</name>
-  <currentVersion>1.6</currentVersion>
+  <currentVersion>1.7-SNAPSHOT</currentVersion>
   <description>Plugin for creating JAR files. Requires Maven 1.0 RC2.</description>
   <shortDescription>Create jar files</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jar/</url>
diff --git a/jar/src/plugin-test/.cvsignore b/jar/src/plugin-test/.cvsignore
new file mode 100644
index 00000000..64d85f5a
--- /dev/null
+++ b/jar/src/plugin-test/.cvsignore
@@ -0,0 +1,5 @@
+gump.xml
+*.log
+targetdist
+dist
+target
diff --git a/jar/src/plugin-test/maven.xml b/jar/src/plugin-test/maven.xml
new file mode 100644
index 00000000..339f04bd
--- /dev/null
+++ b/jar/src/plugin-test/maven.xml
@@ -0,0 +1,22 @@
+<!-- 
+/*
+ * 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:util="jelly:util" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:assert="assert" xmlns:ant="jelly:ant">
+  <goal name="testPlugin">
+    <maven:reactor basedir="${basedir}" includes="test*/project.xml" goals="testPlugin" banner="Test" ignoreFailures="false"/>
+  </goal>
+</project>
diff --git a/jar/src/plugin-test/project.xml b/jar/src/plugin-test/project.xml
new file mode 100644
index 00000000..da4748c1
--- /dev/null
+++ b/jar/src/plugin-test/project.xml
@@ -0,0 +1,43 @@
+<?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-jar-plugin</id>
+  <name>Test project for Maven Jar Plugin</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 Jar plugin</description>
+  <shortDescription>Test for Maven Jar plugin</shortDescription>
+  <url>http://maven.apache.org/reference/plugins/jar/</url>
+  <siteDirectory>/www/maven.apache.org/reference/plugins/jar/</siteDirectory>
+  <repository>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jar/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/jar/</url>
+  </repository>
+</project>
\ No newline at end of file
diff --git a/jar/src/plugin-test/test01/.cvsignore b/jar/src/plugin-test/test01/.cvsignore
new file mode 100644
index 00000000..4e1b955e
--- /dev/null
+++ b/jar/src/plugin-test/test01/.cvsignore
@@ -0,0 +1,2 @@
+*.log
+target
diff --git a/jar/src/plugin-test/test01/maven.xml b/jar/src/plugin-test/test01/maven.xml
new file mode 100644
index 00000000..7fe035de
--- /dev/null
+++ b/jar/src/plugin-test/test01/maven.xml
@@ -0,0 +1,34 @@
+<!-- 
+/*
+ * 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 default="testPlugin"
+         xmlns:ant="jelly:ant"
+         xmlns:util="jelly:util"
+         xmlns:j="jelly:core">
+         
+  <goal name="testPlugin" prereqs="jar:jar">
+     <j:set var="jarNotFound" value="true"/>
+     <util:available file="${maven.build.dir}/${maven.jar.final.name}">
+        <j:set var="jarNotFound" value="false"/>
+     </util:available>
+     <j:if test="${jarNotFound}">
+        <ant:fail>Jar with customized name (${maven.jar.final.name}) not build!</ant:fail>
+     </j:if>
+  </goal>
+  
+  
+</project>
\ No newline at end of file
diff --git a/jar/src/plugin-test/test01/project.properties b/jar/src/plugin-test/test01/project.properties
new file mode 100644
index 00000000..4091cebd
--- /dev/null
+++ b/jar/src/plugin-test/test01/project.properties
@@ -0,0 +1 @@
+maven.jar.final.name=whatever.jar
diff --git a/jar/src/plugin-test/test01/project.xml b/jar/src/plugin-test/test01/project.xml
new file mode 100644
index 00000000..9f94d04a
--- /dev/null
+++ b/jar/src/plugin-test/test01/project.xml
@@ -0,0 +1,52 @@
+<?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-jar-plugin-MPJAR-38</id>
+  <name>Maven Jar Plugin 01</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 Jar plugin, issue MPJAR-38</description>
+  <shortDescription>MPJAR-38</shortDescription>
+  <url>http://maven.apache.org/reference/plugins/jar/</url>
+  <siteDirectory>/www/maven.apache.org/reference/plugins/jar/</siteDirectory>
+  <repository>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jar/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/jar/</url>
+  </repository>
+  <developers>
+    <developer>
+      <name>Felipe Leme</name>
+      <id>felipeal</id>
+      <email>maven@felipeal.net</email>
+      <organization>Falcon Informatica</organization>
+      <timezone>-3</timezone>
+    </developer>
+  </developers>
+</project>
diff --git a/jar/xdocs/changes.xml b/jar/xdocs/changes.xml
index c7553ffd..59e362e1 100644
--- a/jar/xdocs/changes.xml
+++ b/jar/xdocs/changes.xml
@@ -25,6 +25,9 @@
     <author email="dion@apache.org">dIon Gillard</author>
   </properties>
   <body>
+    <release version="1.7-SNAPSHOT" date="in CVS">
+      <action dev="felipeal" type="add">Added new property <code>maven.jar.final.name</code>.</action>
+    </release>
     <release version="1.6" date="2004-06-28">
       <action dev="brett" type="update">Deprecated jar:snapshot</action>
       <action dev="brett" type="update">Use the artifact plugin for installation</action>
diff --git a/jar/xdocs/properties.xml b/jar/xdocs/properties.xml
index 4d8a0cf4..5a1e0ec4 100644
--- a/jar/xdocs/properties.xml
+++ b/jar/xdocs/properties.xml
@@ -28,6 +28,15 @@
   <body>
     <section name="Jar Settings">
       <table>
+        <tr><th>Property</th><th>Optional?</th><th>Description</th></tr>
+        <tr>
+          <td>maven.jar.final.name</td>
+          <td>Yes</td>
+          <td>
+            Name of the generated JAR file.
+            Defaults to ${maven.final.name}.jar.
+          </td>
+        </tr>
         <tr>
           <td>maven.has.jar.resource.patterns</td>
           <td>Yes</td>