Index: src/plugins-build/aspectj/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/aspectj/plugin.jelly,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 plugin.jelly
--- src/plugins-build/aspectj/plugin.jelly	24 Jan 2003 03:44:36 -0000	1.1.1.1
+++ src/plugins-build/aspectj/plugin.jelly	25 Mar 2003 09:43:32 -0000
@@ -20,7 +20,7 @@
         file="${pom.build.aspectSourceDirectory}"/>

 

       <uptodate property="aspectj.compile.notRequired" 

-        targetfile="${maven.build.dir}/${maven.final.name}.jar">

+        targetfile="${maven.build.dir}/${maven.jar.final.name}">

         <srcfiles dir="${pom.build.sourceDirectory}"/>

         <j:if test="${aspectSourcesPresent == 'true'}">

           <srcfiles dir="${pom.build.aspectSourceDirectory}"/>

Index: src/plugins-build/dist/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/dist/plugin.jelly,v
retrieving revision 1.3
diff -u -r1.3 plugin.jelly
--- src/plugins-build/dist/plugin.jelly	26 Jan 2003 22:34:03 -0000	1.3
+++ src/plugins-build/dist/plugin.jelly	25 Mar 2003 09:43:33 -0000
@@ -48,7 +48,7 @@
     <!-- Copy Jars -->
     <copy todir="${maven.dist.bin.assembly.dir}">
       <fileset dir="${maven.build.dir}">
-        <include name="${maven.final.name}.jar"/>
+        <include name="${maven.jar.final.name}"/>
       </fileset>
     </copy>
 
Index: src/plugins-build/ear/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/ear/plugin.jelly,v
retrieving revision 1.4
diff -u -r1.4 plugin.jelly
--- src/plugins-build/ear/plugin.jelly	11 Feb 2003 10:39:05 -0000	1.4
+++ src/plugins-build/ear/plugin.jelly	25 Mar 2003 09:43:33 -0000
@@ -31,7 +31,7 @@
     <available property="maven.ear.manifest.available"
       file="${maven.ear.manifest}"/>
 
-    <ear destfile="${maven.build.dir}/${maven.final.name}.ear"
+    <ear destfile="${maven.build.dir}/${maven.ear.final.name}"
          appxml="${maven.ear.appxml}"
          basedir="${maven.ear.src}"
          excludes="${maven.ear.appxml}">
@@ -98,8 +98,8 @@
     <property name="maven.ear.install.dir"
       value="${maven.repo.local}/${pom.artifactDirectory}/ears"/>
     <mkdir dir="${maven.ear.install.dir}"/>
-    <copy file="${maven.build.dir}/${maven.final.name}.ear"
-      tofile="${maven.ear.install.dir}/${maven.final.name}.ear"/>
+    <copy file="${maven.build.dir}/${maven.ear.final.name}"
+      tofile="${maven.ear.install.dir}/${maven.ear.final.name}"/>
 
   </goal>
 
Index: src/plugins-build/ear/plugin.properties
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/ear/plugin.properties,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 plugin.properties
--- src/plugins-build/ear/plugin.properties	24 Jan 2003 03:45:09 -0000	1.1.1.1
+++ src/plugins-build/ear/plugin.properties	25 Mar 2003 09:43:33 -0000
@@ -3,6 +3,7 @@
 # -------------------------------------------------------------------
 # ear plugin.
 # -------------------------------------------------------------------
+maven.ear.final.name = ${maven.final.name}.ear
 # Location of additional sources to include in the ear file 
 maven.ear.src=${maven.src.dir}/application
 # Location of xml configs and manifest files
Index: src/plugins-build/ear/xdocs/properties.xml
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/ear/xdocs/properties.xml,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 properties.xml
--- src/plugins-build/ear/xdocs/properties.xml	24 Jan 2003 03:45:09 -0000	1.1.1.1
+++ src/plugins-build/ear/xdocs/properties.xml	25 Mar 2003 09:43:33 -0000
@@ -34,7 +34,7 @@
         </tr>
         <tr>
           <td>maven.final.name</td>
-          <td>The assembled component will be <code>${maven.build.dir}/${maven.final.name}.ear</code></td>
+          <td>The assembled component will be <code>${maven.build.dir}/${maven.ear.final.name}</code></td>
           <td>
             <A href="../../../java/target/docs/properties.html#Other Settings">maven.final.name</A>
           </td>
Index: src/plugins-build/ejb/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/ejb/plugin.jelly,v
retrieving revision 1.3
diff -u -r1.3 plugin.jelly
--- src/plugins-build/ejb/plugin.jelly	10 Feb 2003 04:01:09 -0000	1.3
+++ src/plugins-build/ejb/plugin.jelly	25 Mar 2003 09:43:33 -0000
@@ -41,7 +41,7 @@
 
     <!-- jar task used for now due to problems with ejb jar not including 
          files other than class files -->
-    <jar jarfile="${maven.build.dir}/${maven.final.name}.jar">
+    <jar jarfile="${maven.build.dir}/${maven.ejb.final.name}">
       
       <!-- include marked dependencies -->
       <j:forEach var="dep" items="${pom.dependencies}">
@@ -95,8 +95,8 @@
     <property name="maven.ejb.install.dir"
       value="${maven.repo.local}/${pom.artifactDirectory}/ejbs"/>
     <mkdir dir="${maven.ejb.install.dir}"/>
-    <copy file="${maven.build.dir}/${maven.final.name}.jar"
-      tofile="${maven.ejb.install.dir}/${maven.final.name}.jar"/>
+    <copy file="${maven.build.dir}/${maven.ejb.final.name}"
+      tofile="${maven.ejb.install.dir}/${maven.ejb.final.name}"/>
 
   </goal>
 
Index: src/plugins-build/ejb/plugin.properties
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/ejb/plugin.properties,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 plugin.properties
--- src/plugins-build/ejb/plugin.properties	24 Jan 2003 03:45:10 -0000	1.1.1.1
+++ src/plugins-build/ejb/plugin.properties	25 Mar 2003 09:43:33 -0000
@@ -1 +1 @@
-# -------------------------------------------------------------------
# P L U G I N  P R O P E R T I E S
# -------------------------------------------------------------------
# ejb plugin.
# -------------------------------------------------------------------
# Location of where ejb sources (non-java) are located.
maven.ejb.src=${maven.src.dir}/ejb
# Location of ejb xml configs - not used atm due to using jar task not ejbjar
maven.ejb.descriptordir=${maven.ejb.src}/META-INF
maven.ejb.manifest=${maven.ejb.descriptordir}/MANIFEST.MF

\ No newline at end of file
+# -------------------------------------------------------------------
# P L U G I N  P R O P E R T I E S
# -------------------------------------------------------------------
# ejb plugin.
# -------------------------------------------------------------------
maven.ejb.final.name = ${maven.final.name}.jar
# Location of where ejb sources (non-java) are located.
maven.ejb.src=${maven.src.dir}/ejb
# Location of ejb xml configs - not used atm due to using jar task not ejbjar
maven.ejb.descriptordir=${maven.ejb.src}/META-INF
maven.ejb.manifest=${maven.ejb.descriptordir}/MANIFEST.MF

\ No newline at end of file
Index: src/plugins-build/ejb/xdocs/properties.xml
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/ejb/xdocs/properties.xml,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 properties.xml
--- src/plugins-build/ejb/xdocs/properties.xml	24 Jan 2003 03:45:10 -0000	1.1.1.1
+++ src/plugins-build/ejb/xdocs/properties.xml	25 Mar 2003 09:43:33 -0000
@@ -43,9 +43,10 @@
           </td>
         </tr>
         <tr>
-          <td>maven.final.name</td>
-          <td>The assembled component will be <code>${maven.build.dir}/${maven.final.name}.jar</code></td>
+          <td>maven.ejb.final.name</td>
+          <td>The assembled component will be <code>${maven.build.dir}/${maven.ejb.final.name}</code></td>
           <td>
+            <code>maven.ejb.final.name</code> defaults to ${maven.final.name}.jar:
             <A href="../../../java/target/docs/properties.html#Other Settings">maven.final.name</A>
           </td>
         </tr>
Index: src/plugins-build/examples/maven.xml
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/examples/maven.xml,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 maven.xml
--- src/plugins-build/examples/maven.xml	24 Jan 2003 03:44:33 -0000	1.1.1.1
+++ src/plugins-build/examples/maven.xml	25 Mar 2003 09:43:34 -0000
@@ -19,7 +19,7 @@
     </copy>
     
     <!-- jar the files up -->
-    <jar jarfile="${maven.build.dir}/${maven.final.name}.jar">
+    <jar jarfile="${maven.build.dir}/${maven.jar.final.name}">
       <fileset dir="${assemblyDir}"/>
     </jar>
     
Index: src/plugins-build/examples/exampleear-1.0/project.properties
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/examples/exampleear-1.0/project.properties,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 project.properties
--- src/plugins-build/examples/exampleear-1.0/project.properties	24 Jan 2003 03:44:33 -0000	1.1.1.1
+++ src/plugins-build/examples/exampleear-1.0/project.properties	25 Mar 2003 09:43:34 -0000
@@ -1,4 +1,4 @@
-maven.deployable.component=${maven.final.name}.ear
+maven.deployable.component=${maven.ear.final.name}
 maven.j2ee.ear.appxml=${maven.conf.dir}/application.xml
 maven.weblogic.home=C:\\bea\\wlserver6.1
 maven.weblogic.host=localhost
Index: src/plugins-build/examples/plugin-script/maven.xml
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/examples/plugin-script/maven.xml,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 maven.xml
--- src/plugins-build/examples/plugin-script/maven.xml	24 Jan 2003 03:44:34 -0000	1.1.1.1
+++ src/plugins-build/examples/plugin-script/maven.xml	25 Mar 2003 09:43:34 -0000
@@ -19,7 +19,7 @@
     </copy>
     
     <!-- jar the files up -->
-    <jar jarfile="${maven.build.dir}/${maven.final.name}.jar">
+    <jar jarfile="${maven.build.dir}/${maven.jar.final.name}">
       <fileset dir="${assemblyDir}"/>
     </jar>
     
Index: src/plugins-build/java/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/java/plugin.jelly,v
retrieving revision 1.10
diff -u -r1.10 plugin.jelly
--- src/plugins-build/java/plugin.jelly	4 Mar 2003 15:05:25 -0000	1.10
+++ src/plugins-build/java/plugin.jelly	25 Mar 2003 09:43:34 -0000
@@ -155,7 +155,7 @@
       file="${maven.jar.manifest}"/>
 
     <jar
-      jarfile="${maven.build.dir}/${maven.final.name}.jar"
+      jarfile="${maven.build.dir}/${maven.jar.final.name}"
       basedir="${maven.build.dest}"
       excludes="${maven.jar.excludes}"> 
       
@@ -212,7 +212,7 @@
 
     <m:user-check user="${maven.username}"/>
     <attainGoal name="jar:snapshot"/>
-    <property name="maven.jar.to.deploy" value="${maven.final.name}.jar"/>
+    <property name="maven.jar.to.deploy" value="${maven.jar.final.name}"/>
     <property name="dir" value="${maven.repo.central.directory}/${pom.artifactDirectory}/jars"/>
     
     <util:replace var="jarToDeploy" oldChar="\" newChar="/">${maven.build.dir}/${maven.jar.to.deploy}</util:replace>
@@ -241,7 +241,7 @@
 
     <m:user-check user="${maven.username}"/>
     <attainGoal name="java:jar"/>
-    <property name="maven.jar.to.deploy" value="${maven.final.name}.jar"/>
+    <property name="maven.jar.to.deploy" value="${maven.jar.final.name}"/>
     
     <j:set var="sl" value="/"/>
     <util:replace var="jarToDeploy" oldChar="\" newChar="/">${maven.build.dir}/${maven.jar.to.deploy}</util:replace>
@@ -276,7 +276,7 @@
     <property name="jardir__" value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
     <mkdir dir="${jardir__}"/>    
     <copy 
-      file="${maven.build.dir}/${maven.final.name}.jar"
+      file="${maven.build.dir}/${maven.jar.final.name}"
       todir="${jardir__}"
       overwrite="true"
     />
@@ -293,13 +293,13 @@
     <property name="jardir__" value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
     <mkdir dir="${jardir__}"/>
     <copy
-      file="${maven.build.dir}/${maven.final.name}.jar"
+      file="${maven.build.dir}/${maven.jar.final.name}"
       tofile="${jardir__}/${pom.artifactId}-SNAPSHOT.jar"
       overwrite="true"
     />
     <copy
-      file="${maven.build.dir}/${maven.final.name}.jar"
-      tofile="${jardir__}/${maven.final.name}.jar"
+      file="${maven.build.dir}/${maven.jar.final.name}"
+      tofile="${jardir__}/${maven.jar.final.name}"
     />
   </goal>
 
Index: src/plugins-build/java/plugin.properties
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/java/plugin.properties,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 plugin.properties
--- src/plugins-build/java/plugin.properties	24 Jan 2003 03:44:30 -0000	1.1.1.1
+++ src/plugins-build/java/plugin.properties	25 Mar 2003 09:43:34 -0000
@@ -2,4 +2,5 @@
 # P L U G I N P R O P E R T I E S
 # -------------------------------------------------------------------
 
-maven.jar.manifest = ${maven.conf.dir}/Manifest.mf
\ No newline at end of file
+maven.jar.manifest = ${maven.conf.dir}/Manifest.mf
+maven.jar.final.name = ${maven.final.name}.jar
Index: src/plugins-build/java/xdocs/properties.xml
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/java/xdocs/properties.xml,v
retrieving revision 1.4
diff -u -r1.4 properties.xml
--- src/plugins-build/java/xdocs/properties.xml	19 Mar 2003 06:11:24 -0000	1.4
+++ src/plugins-build/java/xdocs/properties.xml	25 Mar 2003 09:43:35 -0000
@@ -310,10 +310,10 @@
           </td>
         </tr>
         <tr>
-          <td>maven.final.name</td>
+          <td>maven.jar.final.name</td>
           <td>Yes</td>
           <td>
-            Usually this property is set to <code>${project.id}-${project.currentVersion}</code>
+            Usually this property is set to <code>${project.id}-${project.currentVersion}.jar</code>
             but the snapshot goal overwrites it to be the snapshot signature
           </td>
         </tr>
Index: src/plugins-build/jnlp/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/jnlp/plugin.jelly,v
retrieving revision 1.4
diff -u -r1.4 plugin.jelly
--- src/plugins-build/jnlp/plugin.jelly	9 Mar 2003 08:40:46 -0000	1.4
+++ src/plugins-build/jnlp/plugin.jelly	25 Mar 2003 09:43:35 -0000
@@ -81,7 +81,7 @@
                     <j2se version="${maven.jnlp.j2se.version}"
                            initial-heap-size="${maven.jnlp.j2se.heapsize.initial}"
                            maximum-heap-size="${maven.jnlp.j2se.heapsize.max}"/>
-                    <jar href="${maven.final.name}.jar" main="true"/>
+                    <jar href="${maven.jar.final.name}" main="true"/>
 
                     <j:forEach var="lib" items="${pom.dependencies}">
                         <j:if test="${lib.getProperty('jnlp.jar')=='true'}">
@@ -139,7 +139,7 @@
             <mkdir dir="${maven.jnlp.tmpdir}"/>
             
             <jarfile:updateManifest
-                inputJar="${maven.build.dir}/${maven.final.name}.jar"
+                inputJar="${maven.build.dir}/${maven.jar.final.name}"
                 manifest="${plugin.resources}/jnlp.manifest"
                 outputDir="${maven.jnlp.tmpdir}"
             />
@@ -168,8 +168,8 @@
 
             <echo>Signing jar files ...</echo>
             <signjar
-                jar="${maven.jnlp.tmpdir}/${maven.final.name}.jar"
-                signedjar="${maven.jnlp.dir}/${maven.final.name}.jar"
+                jar="${maven.jnlp.tmpdir}/${maven.jar.final.name}"
+                signedjar="${maven.jnlp.dir}/${maven.jar.final.name}"
                 alias="${maven.jnlp.signjar.alias}"
                 storepass="${maven.jnlp.signjar.storepass}"
                 keystore="${maven.jnlp.signjar.store}"/>
@@ -206,7 +206,7 @@
                   </j:forEach>
                 </fileset>
                 <fileset dir="${maven.build.dir}">
-                  <include name="${maven.final.name}.jar"/>
+                  <include name="${maven.jar.final.name}"/>
                 </fileset>
               </copy>
           </j:otherwise>
Index: src/plugins-build/plugin/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/plugin/plugin.jelly,v
retrieving revision 1.3
diff -u -r1.3 plugin.jelly
--- src/plugins-build/plugin/plugin.jelly	5 Mar 2003 00:40:18 -0000	1.3
+++ src/plugins-build/plugin/plugin.jelly	25 Mar 2003 09:43:36 -0000
@@ -13,7 +13,7 @@
       -->  
     <attainGoal name="java:jar"/>
 
-    <copy file="${maven.build.dir}/${maven.final.name}.jar"
+    <copy file="${maven.build.dir}/${maven.jar.final.name}"
       todir="${maven.repo.local}/maven/jars" />
 
   </goal>
@@ -21,7 +21,7 @@
   <goal name="plugin:install" prereqs="plugin"
     description="Install the plugin in Maven's plugins dir">
 
-    <copy file="${maven.build.dir}/${maven.final.name}.jar"
+    <copy file="${maven.build.dir}/${maven.jar.final.name}"
       todir="${maven.home}/plugins"/>
 
     <delete includeEmptyDirs="true" verbose="false">
@@ -29,7 +29,7 @@
         <include name="*.cache"/>
         <include name="**/.processed" />
         <include name="${pom.artifactId}-*/**" />
-        <exclude name="${maven.final.name}.jar" />
+        <exclude name="${maven.jar.final.name}" />
       </fileset>
     </delete>
     
@@ -39,7 +39,7 @@
     description="Install an unpacked version of the plugin">
 
     <mkdir dir="${maven.home}/plugins/${maven.final.name}"/>
-    <unzip src="${maven.build.dir}/${maven.final.name}.jar" 
+    <unzip src="${maven.build.dir}/${maven.jar.final.name}" 
       dest="${maven.home}/plugins/${maven.final.name}"/>
 
   </goal>
Index: src/plugins-build/uberjar/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/uberjar/plugin.jelly,v
retrieving revision 1.2
diff -u -r1.2 plugin.jelly
--- src/plugins-build/uberjar/plugin.jelly	24 Jan 2003 21:06:53 -0000	1.2
+++ src/plugins-build/uberjar/plugin.jelly	25 Mar 2003 09:43:37 -0000
@@ -47,7 +47,7 @@
 
     <!-- Copy the project's complete jar -->
     <copy 
-      file="${maven.build.dir}/${maven.final.name}.jar"
+      file="${maven.build.dir}/${maven.jar.final.name}"
       todir="${libdir}"/>
 
     <!-- Copy each dep to our working dir -->
Index: src/plugins-build/war/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/war/plugin.jelly,v
retrieving revision 1.8
diff -u -r1.8 plugin.jelly
--- src/plugins-build/war/plugin.jelly	21 Mar 2003 20:29:13 -0000	1.8
+++ src/plugins-build/war/plugin.jelly	25 Mar 2003 09:43:37 -0000
@@ -29,9 +29,6 @@
   <!-- Builds a war file                                                -->
   <!--==================================================================-->    
   <goal name="war:war" prereqs="war:init" description="Build a war file">
-
-    <property name="maven.war.final.name" 
-      value="${pom.artifactId}.war"/>
   
     <echo>Building WAR ${pom.artifactId}</echo>
 
Index: src/plugins-build/war/plugin.properties
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/war/plugin.properties,v
retrieving revision 1.2
diff -u -r1.2 plugin.properties
--- src/plugins-build/war/plugin.properties	21 Mar 2003 01:26:29 -0000	1.2
+++ src/plugins-build/war/plugin.properties	25 Mar 2003 09:43:37 -0000
@@ -3,6 +3,7 @@
 # -------------------------------------------------------------------
 # War plugin.
 # -------------------------------------------------------------------
+maven.war.final.name = ${maven.final.name}.war
 # Location of where the webapp is located in the source tree. The
 # WEB-INF directory is located right under ${maven.war.src}.
 maven.war.src=${maven.src.dir}/webapp
Index: src/plugins-build/war/xdocs/properties.xml
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/war/xdocs/properties.xml,v
retrieving revision 1.2
diff -u -r1.2 properties.xml
--- src/plugins-build/war/xdocs/properties.xml	21 Mar 2003 01:26:29 -0000	1.2
+++ src/plugins-build/war/xdocs/properties.xml	25 Mar 2003 09:43:37 -0000
@@ -11,6 +11,13 @@
       <table>
         <tr><th>Property</th><th>Optional?</th><th>Description</th></tr>
         <tr>
+          <td>maven.war.final.name</td>
+          <td>The assembled component will be <code>${maven.build.dir}/${maven.war.final.name}</code></td>
+          <td>
+            <code>maven.war.final.name</code> defaults to ${maven.final.name}.war.
+          </td>
+        </tr>
+        <tr>
           <td>maven.war.src</td>
           <td>Yes</td>
           <td>