From c80ea17ed1750003c6c8d884bd199882ffc06ea1 Mon Sep 17 00:00:00 2001
From: felipeal <felipeal@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 17 Jan 2005 02:05:08 +0000
Subject: [PATCH] MPEAR-25: added property maven.ear.final.name

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@125384 13f79535-47bb-0310-9956-ffa450edef68
---
 ear/plugin.jelly                                   | 12 ++++++------
 ear/plugin.properties                              |  2 ++
 ear/src/plugin-test/appXmlBundledTest/maven.xml    |  5 +++--
 ear/src/plugin-test/appXmlLocationTest/maven.xml   |  5 +++--
 ear/src/plugin-test/bundlePropertiesTest/maven.xml |  5 ++---
 ear/src/plugin-test/sarBundledTest/maven.xml       |  4 ++--
 ear/src/plugin-test/simpleTest/maven.xml           |  5 ++---
 ear/xdocs/changes.xml                              |  2 ++
 ear/xdocs/properties.xml                           |  7 +++++++
 9 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/ear/plugin.jelly b/ear/plugin.jelly
index dc52a4c9..f1e23dba 100644
--- a/ear/plugin.jelly
+++ b/ear/plugin.jelly
@@ -72,12 +72,12 @@
     </j:choose>
 
     
-    <ant:echo>Building EAR ${maven.final.name} with appxml "${finalAppxml}"</ant:echo>
+    <ant:echo>Building EAR ${maven.ear.final.name} with appxml "${finalAppxml}"</ant:echo>
     
     <ant:available property="maven.ear.manifest.available"
       file="${maven.ear.manifest}"/>
 
-    <ant:ear destfile="${maven.build.dir}/${maven.final.name}.ear"
+    <ant:ear destfile="${maven.build.dir}/${maven.ear.final.name}"
          appxml="${finalAppxml}">
 
       <!-- include files from maven.ear.src if available -->
@@ -233,7 +233,7 @@
         description="Install the ear in the local repository">
      
      <artifact:install
-        artifact="${maven.build.dir}/${maven.final.name}.ear"
+        artifact="${maven.build.dir}/${maven.ear.final.name}"
         type="ear"
         project="${pom}"/> 
   
@@ -247,7 +247,7 @@
         description="Install the snapshot version of the ear in the local repository">
         
       <artifact:install-snapshot
-        artifact="${maven.build.dir}/${maven.final.name}.ear"
+        artifact="${maven.build.dir}/${maven.ear.final.name}"
         type="ear"
         project="${pom}"/> 
         
@@ -261,7 +261,7 @@
         description="Deploys the ear to the remote repository">
 
      <artifact:deploy
-        artifact="${maven.build.dir}/${maven.final.name}.ear"
+        artifact="${maven.build.dir}/${maven.ear.final.name}"
         type="ear"
         project="${pom}"/>   
         
@@ -275,7 +275,7 @@
         description="Deploys the snapshot version of  the ear to remote repository">  
 
      <artifact:deploy-snapshot
-        artifact="${maven.build.dir}/${maven.final.name}.ear"
+        artifact="${maven.build.dir}/${maven.ear.final.name}"
         type="ear"
         project="${pom}"/>    
         
diff --git a/ear/plugin.properties b/ear/plugin.properties
index f26190d6..dc09d5fc 100644
--- a/ear/plugin.properties
+++ b/ear/plugin.properties
@@ -32,3 +32,5 @@ maven.ear.displayname=${pom.artifactId}
 maven.ear.appxml.version=1.3
 maven.ear.resources=${maven.build.dir}/ear
 maven.ear.appxml.encoding=UTF-8
+# Name of generated EAR file
+maven.ear.final.name=${maven.final.name}.ear
diff --git a/ear/src/plugin-test/appXmlBundledTest/maven.xml b/ear/src/plugin-test/appXmlBundledTest/maven.xml
index 120721d0..90d3be7c 100644
--- a/ear/src/plugin-test/appXmlBundledTest/maven.xml
+++ b/ear/src/plugin-test/appXmlBundledTest/maven.xml
@@ -37,10 +37,11 @@
     <assert:assertFileExists file="${maven.ear.src}/META-INF/application.xml"/>
 
     <!-- tests that the ear is generated -->
-    <assert:assertFileExists file="${maven.build.dir}/${maven.final.name}.ear"/>
+    <j:set var="earFile" value="${maven.build.dir}/${maven.ear.final.name}"/>
+    <assert:assertFileExists file="${earFile}"/>
     <!-- extracts the EAR -->
     <j:set var="tmpEarDir" value="${maven.build.dir}/extractedEar"/>
-    <ant:unzip src="${maven.build.dir}/${maven.final.name}.ear" dest="${tmpEarDir}"/>
+    <ant:unzip src="${earFile}" dest="${tmpEarDir}"/>
 
     <!-- asserts the application.xml is there -->
     <assert:assertFileExists file="${tmpEarDir}/META-INF/application.xml"/>
diff --git a/ear/src/plugin-test/appXmlLocationTest/maven.xml b/ear/src/plugin-test/appXmlLocationTest/maven.xml
index 38e65374..1acf23eb 100644
--- a/ear/src/plugin-test/appXmlLocationTest/maven.xml
+++ b/ear/src/plugin-test/appXmlLocationTest/maven.xml
@@ -40,10 +40,11 @@
     </util:available>
 
     <!-- tests that the ear is generated -->
-    <assert:assertFileExists file="${maven.build.dir}/${maven.final.name}.ear"/>
+    <j:set var="earFile" value="${maven.build.dir}/${maven.ear.final.name}"/>
+    <assert:assertFileExists file="${earFile}"/>
     <!-- extracts the EAR -->
     <j:set var="tmpEarDir" value="${maven.build.dir}/extractedEar"/>
-    <ant:unzip src="${maven.build.dir}/${maven.final.name}.ear" dest="${tmpEarDir}"/>
+    <ant:unzip src="${earFile}" dest="${tmpEarDir}"/>
 
     <!-- asserts the application.xml is there -->
     <assert:assertFileExists file="${tmpEarDir}/META-INF/application.xml"/>
diff --git a/ear/src/plugin-test/bundlePropertiesTest/maven.xml b/ear/src/plugin-test/bundlePropertiesTest/maven.xml
index c5d3646a..aa433780 100644
--- a/ear/src/plugin-test/bundlePropertiesTest/maven.xml
+++ b/ear/src/plugin-test/bundlePropertiesTest/maven.xml
@@ -28,11 +28,10 @@
   <goal name="test-ear">
 
     <!-- tests that the ear is generated -->
-    <assert:assertFileExists file="${maven.build.dir}/${maven.final.name}.ear"/>
+    <j:set var="earFile" value="${maven.build.dir}/${maven.ear.final.name}"/>
+    <assert:assertFileExists file="${earFile}"/>
     
     <!-- unzip the ear and look for the jars -->
-    <j:set var="earFile" 
-      value="${maven.build.dir}/${maven.final.name}.ear"/>
     <j:set var="unzipDir" value= "${maven.build.dir}/eartest"/>
     <mkdir dir="${unzipDir}"/>
     <unzip src="${earFile}" dest="${unzipDir}"/>
diff --git a/ear/src/plugin-test/sarBundledTest/maven.xml b/ear/src/plugin-test/sarBundledTest/maven.xml
index 035ff053..8bdfbe78 100644
--- a/ear/src/plugin-test/sarBundledTest/maven.xml
+++ b/ear/src/plugin-test/sarBundledTest/maven.xml
@@ -28,9 +28,9 @@
   <goal name="test-ear" prereqs="ear">
 
     <!-- tests that the ear is generated -->
-    <assert:assertFileExists file="${maven.build.dir}/${maven.final.name}.ear"/>
+    <j:set var="earFile" value="${maven.build.dir}/${maven.ear.final.name}"/>
+    <assert:assertFileExists file="${earFile}"/>
     <!-- unzip the ear and look for the jars -->
-    <j:set var="earFile" value="${maven.build.dir}/${maven.final.name}.ear"/>
     <j:set var="unzipDir" value= "${maven.build.dir}/eartest"/>
     <mkdir dir="${unzipDir}"/>
     <unzip src="${earFile}" dest="${unzipDir}"/>
diff --git a/ear/src/plugin-test/simpleTest/maven.xml b/ear/src/plugin-test/simpleTest/maven.xml
index ec549723..dbaf6237 100644
--- a/ear/src/plugin-test/simpleTest/maven.xml
+++ b/ear/src/plugin-test/simpleTest/maven.xml
@@ -28,12 +28,11 @@
   
   <goal name="test-ear">
 
+    <j:set var="earFile" value="${maven.build.dir}/${maven.ear.final.name}"/>
     <!-- tests that the ear is generated -->
-    <assert:assertFileExists file="${maven.build.dir}/${maven.final.name}.ear"/>
+    <assert:assertFileExists file="${earFile}"/>
     
     <!-- unzip the ear and look for the jars -->
-    <j:set var="earFile" 
-      value="${maven.build.dir}/${maven.final.name}.ear"/>
     <j:set var="unzipDir" value= "${maven.build.dir}/eartest"/>
     <mkdir dir="${unzipDir}"/>
     <unzip src="${earFile}" dest="${unzipDir}"/>
diff --git a/ear/xdocs/changes.xml b/ear/xdocs/changes.xml
index 8d8c5ff5..13805b72 100644
--- a/ear/xdocs/changes.xml
+++ b/ear/xdocs/changes.xml
@@ -25,6 +25,8 @@
   </properties>
   <body>
     <release version="1.7-SNAPSHOT" date="on CVS">
+      <action dev="felipeal" type="add" issue="MPEAR-25">Added property <code>maven.ear.final.name</code>.
+      </action>
       <action dev="felipeal" type="remove" issue="MPEAR-37">Removed checking introduced by MPEAR-9, as the fix introduced more bugs than it solved</code>.
       </action>
       <action dev="dion" type="fix" issue="MPEAR-32">Re-added property <code>maven.ear.appxml</code>.
diff --git a/ear/xdocs/properties.xml b/ear/xdocs/properties.xml
index c1e473b5..ff675f27 100644
--- a/ear/xdocs/properties.xml
+++ b/ear/xdocs/properties.xml
@@ -28,6 +28,13 @@
     <section name="ear settings">
       <table>
         <tr><th>Property</th><th>Optional?</th><th>Description</th><th>Default</th></tr>
+         <tr>
+          <td>maven.ear.final.name</td>
+          <td>Name of the generated EAR file.</code></td>
+          <td>
+            ${maven.final.name}.ear
+          </td>
+        </tr>
         <tr>
           <td>maven.ear.manifest</td>
           <td>Yes</td>