From 2bfbff367710967712193ee9713a113253ff4104 Mon Sep 17 00:00:00 2001
From: felipeal <felipeal@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 11 Nov 2004 11:55:45 +0000
Subject: [PATCH] fix for MPEAR-20: changed the default value of the
 maven.ear.displayname

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116226 13f79535-47bb-0310-9956-ffa450edef68
---
 ear/plugin.properties    | 4 ++--
 ear/xdocs/changes.xml    | 3 ++-
 ear/xdocs/properties.xml | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ear/plugin.properties b/ear/plugin.properties
index da363147..b0dafe69 100644
--- a/ear/plugin.properties
+++ b/ear/plugin.properties
@@ -28,7 +28,7 @@ maven.ear.descriptordir=${maven.ear.src}/META-INF
 maven.ear.appxml=${maven.ear.descriptordir}/application.xml
 maven.ear.manifest=${maven.ear.descriptordir}/MANIFEST.MF
 maven.ear.appxml.generate=false
-maven.ear.displayname=${pom.id}
+maven.ear.displayname=${pom.artifactId}
 maven.ear.appxml.version=1.3
 maven.ear.resources=${maven.build.dir}/ear
-maven.ear.appxml.encoding=UTF-8
\ No newline at end of file
+maven.ear.appxml.encoding=UTF-8
diff --git a/ear/xdocs/changes.xml b/ear/xdocs/changes.xml
index a8da879f..9249715e 100644
--- a/ear/xdocs/changes.xml
+++ b/ear/xdocs/changes.xml
@@ -25,7 +25,8 @@
   </properties>
   <body>
     <release version="1.6-SNAPSHOT" date="in CVS">
-      <action dev="felipeal" type="felipeal" issue="MPEAR-23" due-to="Wiley Fuller">Add new property dependency(<code>ear.target.path</code>) to define where a dependency should be added in the EAR.</action>
+      <action dev="felipeal" type="fix" issue="MPEAR-20">Changed the default value of <code>maven.ear.displayname</code>.</action>
+      <action dev="felipeal" type="add" issue="MPEAR-23" due-to="Wiley Fuller">Add new property dependency(<code>ear.target.path</code>) to define where a dependency should be added in the EAR.</action>
       <action dev="felipeal" type="fix" issue="MPEAR-9" due-to="Sean Timm">Build now fails in some cases were the dependencies are copied with wrong case.</action>
       <action dev="felipeal" type="add" issue="MPEAR-21">Added property <code>maven.ear.appxml.encoding</code>.</action>
       <action dev="vmassol" type="update" issue="MPEAR-19">
diff --git a/ear/xdocs/properties.xml b/ear/xdocs/properties.xml
index 2ab7e13c..8e0ce41e 100644
--- a/ear/xdocs/properties.xml
+++ b/ear/xdocs/properties.xml
@@ -78,7 +78,7 @@
             when <code>application.xml</code> file is autogenerated
           </td>
           <td>
-            ${pom.id}
+            ${pom.artifactId}
           </td>
         </tr>
         <tr>