From 0cf7643d7cb83cb3a4bfe1065a993cbeae984b19 Mon Sep 17 00:00:00 2001
From: evenisse <evenisse@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 6 Feb 2003 17:04:28 +0000
Subject: [PATCH] Update to new id format

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@112849 13f79535-47bb-0310-9956-ffa450edef68
---
 cactus/src/plugin-resources/scripts/resin.2x.jelly    | 4 ++--
 cactus/src/plugin-resources/scripts/weblogic.7x.jelly | 4 ++--
 gump/xdocs/properties.xml                             | 2 +-
 jnlp/plugin.properties                                | 2 +-
 jnlp/xdocs/properties.xml                             | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cactus/src/plugin-resources/scripts/resin.2x.jelly b/cactus/src/plugin-resources/scripts/resin.2x.jelly
index e1875d93..14cffadd 100644
--- a/cactus/src/plugin-resources/scripts/resin.2x.jelly
+++ b/cactus/src/plugin-resources/scripts/resin.2x.jelly
@@ -88,7 +88,7 @@
     description="Deploy the test webapp in Resin">
 
     <copy todir="${maven.cactus.build.dir}/resin2x/test">
-      <fileset dir="${maven.cactus.build.dir}/${pom.id}"/>
+      <fileset dir="${maven.cactus.build.dir}/${pom.artifactId}"/>
     </copy>
 
   </goal>
@@ -103,7 +103,7 @@
     description="Redeploy the test webapp in Resin">
 
     <copy todir="${maven.cactus.build.dir}/resin2x/test">
-      <fileset dir="${maven.cactus.build.dir}/${pom.id}">
+      <fileset dir="${maven.cactus.build.dir}/${pom.artifactId}">
         <include name="WEB-INF/classes/**"/>
       </fileset>
     </copy>
diff --git a/cactus/src/plugin-resources/scripts/weblogic.7x.jelly b/cactus/src/plugin-resources/scripts/weblogic.7x.jelly
index 994c55e1..3a33e5e6 100644
--- a/cactus/src/plugin-resources/scripts/weblogic.7x.jelly
+++ b/cactus/src/plugin-resources/scripts/weblogic.7x.jelly
@@ -88,7 +88,7 @@
     description="Deploy the test webapp in WebLogic">
 
     <copy todir="${maven.cactus.build.dir}/weblogic7x/testdomain/applications/test">
-      <fileset dir="${maven.cactus.build.dir}/${pom.id}"/>
+      <fileset dir="${maven.cactus.build.dir}/${pom.artifactId}"/>
       <!-- Update the war to include the proprietary weblogic.xml config
            file. -->
       <fileset dir="${maven.cactus.conf.containers.dir}/weblogic7x">
@@ -107,7 +107,7 @@
     description="Redeploy the test webapp in WebLogic">
 
     <copy todir="${maven.cactus.build.dir}/tomcat4x/webapps/test">
-      <fileset dir="${maven.cactus.build.dir}/${pom.id}">
+      <fileset dir="${maven.cactus.build.dir}/${pom.artifactId}">
         <include name="WEB-INF/classes/**"/>
       </fileset>
     </copy>
diff --git a/gump/xdocs/properties.xml b/gump/xdocs/properties.xml
index d1fb8a11..451373e8 100644
--- a/gump/xdocs/properties.xml
+++ b/gump/xdocs/properties.xml
@@ -32,7 +32,7 @@
           </td>
         </tr>
         <tr>
-          <td>pom.id</td>
+          <td>pom.artifactId</td>
           <td>Yes</td>
           <td>
 			Use to generate the <code>module</code>, <code>project</code>
diff --git a/jnlp/plugin.properties b/jnlp/plugin.properties
index 7b82a258..e8434231 100644
--- a/jnlp/plugin.properties
+++ b/jnlp/plugin.properties
@@ -26,7 +26,7 @@ maven.jnlp.j2se.heapsize.max=128m
 
 ##maven.jnlp.signjar.store
 ##maven.jnlp.signjar.storepass
-maven.jnlp.signjar.alias=${pom.id}
+maven.jnlp.signjar.alias=${pom.artifactId}
 
 maven.jnlp.signjar.validity=720
 ##maven.jnlp.signjar.dname.cn //Common name
diff --git a/jnlp/xdocs/properties.xml b/jnlp/xdocs/properties.xml
index 276b7d81..67934060 100644
--- a/jnlp/xdocs/properties.xml
+++ b/jnlp/xdocs/properties.xml
@@ -257,7 +257,7 @@
             The alias for the keystore.
           </td>
           <td>
-            ${pom.id}
+            ${pom.artifactId}
           </td>
         </tr>
         <tr>