? test-maven-581
? test-mpxdoc-118
? codeswitcher/target
? deploy/target
? jar/.classpath
? jar/.project
? jar/src
? perforce/target
Index: dist/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/dist/plugin.jelly,v
retrieving revision 1.20
diff -u -r1.20 plugin.jelly
--- dist/plugin.jelly	3 Jul 2004 18:08:21 -0000	1.20
+++ dist/plugin.jelly	23 Aug 2004 02:11:04 -0000
@@ -82,7 +82,7 @@
     <!-- Copy Jars -->
     <ant:copy todir="${maven.dist.bin.assembly.dir}">
       <ant:fileset dir="${maven.build.dir}">
-        <ant:include name="${maven.final.name}.jar"/>
+        <ant:include name="${maven.jar.final.name}"/>
       </ant:fileset>
     </ant:copy>
 
Index: ear/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/ear/plugin.jelly,v
retrieving revision 1.20
diff -u -r1.20 plugin.jelly
--- ear/plugin.jelly	21 Jul 2004 08:03:22 -0000	1.20
+++ ear/plugin.jelly	23 Aug 2004 02:11:04 -0000
@@ -56,12 +56,12 @@
        <attainGoal name="ear:generate-ear-descriptor"/>
      </j:if >
     
-    <ant:echo>Building EAR ${maven.final.name} with appxml "${maven.ear.appxml}"</ant:echo>
+    <ant:echo>Building EAR ${maven.ear.final.name} with appxml "${maven.ear.appxml}"</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="${maven.ear.appxml}">
 
       <!-- include files from maven.ear.src if available -->
@@ -204,7 +204,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}"/> 
   
@@ -218,7 +218,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}"/> 
         
@@ -232,7 +232,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}"/>   
         
@@ -246,7 +246,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}"/>    
         
Index: ear/plugin.properties
===================================================================
RCS file: /home/cvspublic/maven-plugins/ear/plugin.properties,v
retrieving revision 1.6
diff -u -r1.6 plugin.properties
--- ear/plugin.properties	15 Mar 2004 10:54:10 -0000	1.6
+++ ear/plugin.properties	23 Aug 2004 02:11:04 -0000
@@ -30,4 +30,8 @@
 maven.ear.appxml.generate=false
 maven.ear.displayname=${pom.id}
 maven.ear.appxml.version=1.3
-maven.ear.resources=${maven.build.dir}/ear
\ No newline at end of file
+maven.ear.resources=${maven.build.dir}/ear
+
+# Location of generated EAR file
+maven.ear.final.name = ${maven.final.name}.ear
+
Index: ear/xdocs/properties.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/ear/xdocs/properties.xml,v
retrieving revision 1.13
diff -u -r1.13 properties.xml
--- ear/xdocs/properties.xml	12 Apr 2004 22:53:01 -0000	1.13
+++ ear/xdocs/properties.xml	23 Aug 2004 02:11:04 -0000
@@ -29,6 +29,13 @@
       <table>
         <tr><th>Property</th><th>Optional?</th><th>Description</th><th>Default</th></tr>
         <tr>
+          <td>maven.ear.final.name</td>
+          <td>The assembled component will be <code>${maven.build.dir}/${maven.ear.final.name}</code></td>
+          <td>
+            ${maven.final.name}.ear
+          </td>
+        </tr>
+        <tr>
           <td>maven.ear.manifest</td>
           <td>Yes</td>
           <td>
@@ -111,13 +118,6 @@
           <td>where the component will be assembled</td>
           <td>
             <A href="../java/properties.html#Other Settings">maven.build.dir</A>
-          </td>
-        </tr>
-        <tr>
-          <td>maven.final.name</td>
-          <td>The assembled component will be <code>${maven.build.dir}/${maven.final.name}.ear</code></td>
-          <td>
-            <A href="../java/properties.html#Other Settings">maven.final.name</A>
           </td>
         </tr>
       </table>
Index: ejb/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/ejb/plugin.jelly,v
retrieving revision 1.20
diff -u -r1.20 plugin.jelly
--- ejb/plugin.jelly	15 Jul 2004 10:08:14 -0000	1.20
+++ ejb/plugin.jelly	23 Aug 2004 02:11:04 -0000
@@ -45,7 +45,7 @@
   <!--==================================================================-->
   <goal name="ejb:ejb" prereqs="ejb:init" description="Build an ejb file">
 
-    <ant:echo>Building ejb ${maven.final.name}</ant:echo>
+    <ant:echo>Building ejb ${maven.ejb.final.name}</ant:echo>
 
     <ant:available property="maven.ejb.manifest.available"
       file="${maven.ejb.manifest}"/>
@@ -136,7 +136,7 @@
   <!-- Builds an ejb client jar file                                    -->
   <!--==================================================================-->
   <goal name="ejb:ejb-client" prereqs="ejb:ejb" description="Build a client ejb file">
-    <ant:jar jarfile="${maven.ejb.build.dir}/${maven.final.name}-client.jar"
+    <ant:jar jarfile="${maven.ejb.build.dir}/${maven.ejb.client.final.name}.jar"
              basedir="${maven.build.dest}"
              excludes="${maven.ejb.client.base.excludes},${maven.ejb.client.excludes}"
              index="${maven.ejb.client.index}"
@@ -152,7 +152,7 @@
         description="Install the ejb client in the local repository">
      
      <artifact:install
-        artifact="${maven.ejb.build.dir}/${maven.final.name}-client.jar"
+        artifact="${maven.ejb.build.dir}/${maven.ejb.client.final.name}.jar"
         type="jar"
         project="${pom}"/> 
   
@@ -222,7 +222,7 @@
         description="Deploys the ejb client to the remote repository">
 
      <artifact:deploy
-        artifact="${maven.ejb.build.dir}/${maven.final.name}-client.jar"
+        artifact="${maven.ejb.build.dir}/${maven.ejb.client.final.name}"
         type="jar"
         project="${pom}"/>   
   </goal>
Index: ejb/plugin.properties
===================================================================
RCS file: /home/cvspublic/maven-plugins/ejb/plugin.properties,v
retrieving revision 1.8
diff -u -r1.8 plugin.properties
--- ejb/plugin.properties	15 Jul 2004 10:08:14 -0000	1.8
+++ ejb/plugin.properties	23 Aug 2004 02:11:04 -0000
@@ -32,6 +32,9 @@
 # Name of the generated EJB file (without the path).
 maven.ejb.final.name = ${maven.final.name}.jar
 
+# Name of the generated EJB client file (without the path).
+maven.ejb.client.final.name = ${maven.final.name}-client.jar
+
 # Location of ejb xml configs - not used atm due to using jar task not ejbjar
 maven.ejb.descriptordir=${maven.ejb.src}/META-INF
 
Index: ejb/xdocs/properties.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/ejb/xdocs/properties.xml,v
retrieving revision 1.10
diff -u -r1.10 properties.xml
--- ejb/xdocs/properties.xml	15 Jul 2004 10:08:14 -0000	1.10
+++ ejb/xdocs/properties.xml	23 Aug 2004 02:11:04 -0000
@@ -77,6 +77,16 @@
           </td>
         </tr>
         <tr>
+          <td>maven.ejb.client.final.name</td>
+          <td>Yes</td>
+          <td>
+            Name of the generated EJB client file.
+          </td>
+          <td>
+            ${maven.final.name}-client.jar
+          </td>
+        </tr>
+        <tr>
           <td>maven.ejb.includes</td>
           <td>Yes</td>
           <td>
Index: examples/exampleear-1.0/project.properties
===================================================================
RCS file: /home/cvspublic/maven-plugins/examples/exampleear-1.0/project.properties,v
retrieving revision 1.2
diff -u -r1.2 project.properties
--- examples/exampleear-1.0/project.properties	4 Mar 2004 18:05:26 -0000	1.2
+++ examples/exampleear-1.0/project.properties	23 Aug 2004 02:11:04 -0000
@@ -14,7 +14,7 @@
 # limitations under the License.
 # -------------------------------------------------------------------
 
-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: examples/plugin-script/maven.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/examples/plugin-script/maven.xml,v
retrieving revision 1.3
diff -u -r1.3 maven.xml
--- examples/plugin-script/maven.xml	4 Apr 2004 03:50:06 -0000	1.3
+++ examples/plugin-script/maven.xml	23 Aug 2004 02:11:04 -0000
@@ -36,13 +36,13 @@
     </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>
     
     <!-- copy the jar to the local repository as a maven jar -->
     <copy
-      file="${maven.build.dir}/${maven.final.name}.jar"
+      file="${maven.build.dir}/${maven.jar.final.name}"
       todir="${maven.repo.local}/maven/jars"/>
   </goal>
 
@@ -50,7 +50,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"/>
 
   </goal>
@@ -60,7 +60,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: jar/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/jar/plugin.jelly,v
retrieving revision 1.42
diff -u -r1.42 plugin.jelly
--- jar/plugin.jelly	12 Jul 2004 23:35:06 -0000	1.42
+++ jar/plugin.jelly	23 Aug 2004 02:11:05 -0000
@@ -76,7 +76,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}"
@@ -219,7 +219,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}"
     />
@@ -235,7 +235,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}"
     />
@@ -249,7 +249,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}"
     />
@@ -264,7 +264,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}"
     />
Index: jar/plugin.properties
===================================================================
RCS file: /home/cvspublic/maven-plugins/jar/plugin.properties,v
retrieving revision 1.12
diff -u -r1.12 plugin.properties
--- jar/plugin.properties	12 Jul 2004 23:35:06 -0000	1.12
+++ jar/plugin.properties	23 Aug 2004 02:11:05 -0000
@@ -24,3 +24,4 @@
 maven.jar.excludes = **/package.html
 maven.jar.index=false
 maven.jar.compress=true
+maven.jar.final.name = ${maven.final.name}.jar
Index: jar/xdocs/properties.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/jar/xdocs/properties.xml,v
retrieving revision 1.10
diff -u -r1.10 properties.xml
--- jar/xdocs/properties.xml	12 Jul 2004 06:58:01 -0000	1.10
+++ jar/xdocs/properties.xml	23 Aug 2004 02:11:05 -0000
@@ -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>
Index: jboss/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/jboss/plugin.jelly,v
retrieving revision 1.21
diff -u -r1.21 plugin.jelly
--- jboss/plugin.jelly	15 Jul 2004 09:37:30 -0000	1.21
+++ jboss/plugin.jelly	23 Aug 2004 02:11:05 -0000
@@ -352,13 +352,13 @@
   <!-- Once maven has a goal that will build a jarfile of EJBs, this should
        list it as a prereq -->
   <goal name="jboss:deploy-ejb"
-    description="Deploy ${maven.final.name}.jar">
-    <jmx:deploy jmx.deploy.file='${maven.build.dir}/${maven.final.name}.jar'/>
+    description="Deploy ${maven.jar.final.name}">
+    <jmx:deploy jmx.deploy.file='${maven.build.dir}/${maven.jar.final.name}'/>
   </goal>
  
   <goal name="jboss:undeploy-ejb"
-    description="Undeploy ${maven.final.name}.jar">
-    <jmx:undeploy jmx.deploy.file='${maven.build.dir}/${maven.final.name}.jar'/>
+    description="Undeploy ${maven.jar.final.name}">
+    <jmx:undeploy jmx.deploy.file='${maven.build.dir}/${maven.jar.final.name}'/>
   </goal>
   
   <!-- Once maven has a goal that will build an earfile of EJBs, this should
Index: jnlp/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/jnlp/plugin.jelly,v
retrieving revision 1.30
diff -u -r1.30 plugin.jelly
--- jnlp/plugin.jelly	15 Aug 2004 11:34:26 -0000	1.30
+++ jnlp/plugin.jelly	23 Aug 2004 02:11:06 -0000
@@ -61,7 +61,7 @@
         <maven:property name="maven.jnlp.description.short" defaultValue="${pom.shortDescription}"/>
         <maven:property name="maven.jnlp.http.codebase" defaultValue="${pom.url}"/>
         <maven:property name="maven.jnlp.title" defaultValue="${pom.name}"/>
-        <j:set var="final.jar.name" value="${maven.final.name}.jar"/>
+        <j:set var="final.jar.name" value="${maven.jar.final.name}"/>
         
         <j:file name="${maven.jnlp.dir}/${pom.artifactId}.jnlp" prettyPrint="true"
           xmlns="dummy">
@@ -293,7 +293,7 @@
             <ant: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}"
             />
@@ -328,11 +328,11 @@
                 </j:when>
                 <j:otherwise>
                     <ant:echo>Not Using JarDiff ...</ant:echo>
-                    <j:set var="maven.final.signedname" value="${maven.final.name}.jar"/>
+                    <j:set var="maven.final.signedname" value="${maven.jar.final.name}"/>
                 </j:otherwise>
             </j:choose>
             <ant:signjar
-                jar="${maven.jnlp.tmpdir}/${maven.final.name}.jar"
+                jar="${maven.jnlp.tmpdir}/${maven.jar.final.name}"
                 signedjar="${maven.jnlp.dir}/${maven.final.signedname}"
                 alias="${maven.jnlp.signjar.alias}"
                 storetype="${maven.jnlp.signjar.storetype}"
@@ -385,7 +385,7 @@
                 </j:if>
               </j:forEach>
               <ant:fileset dir="${maven.build.dir}">
-                <ant:include name="${maven.final.name}.jar"/>
+                <ant:include name="${maven.jar.final.name}"/>
               </ant:fileset>
             </ant:copy>
           </j:otherwise>
Index: plugin/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/plugin/plugin.jelly,v
retrieving revision 1.43
diff -u -r1.43 plugin.jelly
--- plugin/plugin.jelly	18 Jul 2004 14:20:03 -0000	1.43
+++ plugin/plugin.jelly	23 Aug 2004 02:11:06 -0000
@@ -61,7 +61,7 @@
     <plugin:uninstall name="${pom.artifactId}" />
     <!-- Don't clear the cache. Maven will do this if we happened to clean up an additional version -->
 
-    <copy file="${maven.build.dir}/${maven.final.name}.jar"
+    <copy file="${maven.build.dir}/${maven.jar.final.name}"
       todir="${maven.plugin.dir}" />
   </goal>
 
@@ -70,7 +70,7 @@
     <!-- The cache should remain intact through these operations -->
     <plugin:uninstall name="${pom.artifactId}" />
     <maven:uninstallPlugin artifactId="${pom.artifactId}" />
-    <maven:installPlugin file="${maven.build.dir}/${maven.final.name}.jar" cache="true" />
+    <maven:installPlugin file="${maven.build.dir}/${maven.jar.final.name}" cache="true" />
   </goal>
 
   <goal name="plugin:uninstall" 
@@ -318,7 +318,7 @@
   <goal name="plugin:repository-install" prereqs="plugin:plugin"
     description="install a plugin into the local repository">
     <artifact:install
-      artifact="${maven.build.dir}/${maven.final.name}.jar"
+      artifact="${maven.build.dir}/${maven.jar.final.name}"
       type="plugin"
       project="${pom}"
     />
@@ -327,7 +327,7 @@
   <goal name="plugin:repository-install-snapshot" prereqs="plugin:plugin"
     description="install a plugin snapshot into the local repository">
     <artifact:install-snapshot
-      artifact="${maven.build.dir}/${maven.final.name}.jar"
+      artifact="${maven.build.dir}/${maven.jar.final.name}"
       type="plugin"
       project="${pom}"
     />
@@ -336,7 +336,7 @@
   <goal name="plugin:repository-deploy" prereqs="plugin:plugin"
     description="deploy a plugin into the local repository">
     <artifact:deploy
-      artifact="${maven.build.dir}/${maven.final.name}.jar"
+      artifact="${maven.build.dir}/${maven.jar.final.name}"
       type="plugin"
       project="${pom}"
     />
@@ -345,7 +345,7 @@
   <goal name="plugin:repository-deploy-snapshot" prereqs="plugin:plugin"
     description="deploy a plugin snapshot into the local repository">
     <artifact:deploy-snapshot
-      artifact="${maven.build.dir}/${maven.final.name}.jar"
+      artifact="${maven.build.dir}/${maven.jar.final.name}"
       type="plugin"
       project="${pom}"
     />
Index: rar/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/rar/plugin.jelly,v
retrieving revision 1.3
diff -u -r1.3 plugin.jelly
--- rar/plugin.jelly	6 Jul 2004 12:37:18 -0000	1.3
+++ rar/plugin.jelly	23 Aug 2004 02:11:06 -0000
@@ -47,12 +47,12 @@
     <!--==================================================================-->
     <goal name="rar:rar" prereqs="rar:init" description="Build a rar file">
 
-        <ant:echo>Building rar ${maven.final.name} with ra.xml "${maven.rar.raxml}"</ant:echo>
+        <ant:echo>Building rar ${maven.rar.final.name} with ra.xml "${maven.rar.raxml}"</ant:echo>
 
         <ant:available property="maven.rar.manifest.available"
             file="${maven.rar.manifest}"/>
 
-        <ant:jar destfile="${maven.build.dir}/${maven.final.name}.rar">
+        <ant:jar destfile="${maven.build.dir}/${maven.rar.final.name}">
 
             <!-- include files from maven.rar.src if available -->
             <util:available file="${maven.rar.src}">
@@ -60,10 +60,10 @@
             </util:available>
 
             <!-- include built jar if available -->
-            <ant:echo>trying to include ${maven.build.dir}/${maven.final.name}.jar</ant:echo>
-            <util:available file="${maven.build.dir}/${maven.final.name}.jar">
+            <ant:echo>trying to include ${maven.build.dir}/${maven.jar.final.name}</ant:echo>
+            <util:available file="${maven.build.dir}/${maven.jar.final.name}">
                 <ant:fileset dir="${maven.build.dir}">
-                    <ant:include name="${maven.final.name}.jar"/>
+                    <ant:include name="${maven.jar.final.name}"/>
                 </ant:fileset>
             </util:available>
 
@@ -134,7 +134,7 @@
         description="Install the rar in the local repository">
 
         <artifact:install
-            artifact="${maven.build.dir}/${maven.final.name}.rar"
+            artifact="${maven.build.dir}/${maven.rar.final.name}"
             type="rar"
             project="${pom}"/>
 
@@ -148,7 +148,7 @@
         description="Install the snapshot version of the rar in the local repository">
 
         <artifact:install-snapshot
-            artifact="${maven.build.dir}/${maven.final.name}.rar"
+            artifact="${maven.build.dir}/${maven.rar.final.name}"
             type="rar"
             project="${pom}"/>
 
@@ -162,7 +162,7 @@
         description="Deploys the rar to the remote repository">
 
         <artifact:deploy
-            artifact="${maven.build.dir}/${maven.final.name}.rar"
+            artifact="${maven.build.dir}/${maven.rar.final.name}"
             type="rar"
             project="${pom}"/>
 
@@ -176,7 +176,7 @@
         description="Deploys the snapshot version of  the rar to remote repository">
 
         <artifact:deploy-snapshot
-            artifact="${maven.build.dir}/${maven.final.name}.rar"
+            artifact="${maven.build.dir}/${maven.rar.final.name}"
             type="rar"
             project="${pom}"/>
 
Index: rar/plugin.properties
===================================================================
RCS file: /home/cvspublic/maven-plugins/rar/plugin.properties,v
retrieving revision 1.1
diff -u -r1.1 plugin.properties
--- rar/plugin.properties	17 Jun 2004 02:51:53 -0000	1.1
+++ rar/plugin.properties	23 Aug 2004 02:11:06 -0000
@@ -28,4 +28,5 @@
 maven.rar.raxml=${maven.rar.descriptordir}/ra.xml
 maven.rar.manifest=${maven.rar.descriptordir}/MANIFEST.MF
 maven.rar.displayname=${pom.id}
-maven.rar.resources=${maven.build.dir}/rar
\ No newline at end of file
+maven.rar.resources=${maven.build.dir}/rar
+maven.rar.final.name = ${maven.final.name}.rar
Index: rar/xdocs/properties.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/rar/xdocs/properties.xml,v
retrieving revision 1.1
diff -u -r1.1 properties.xml
--- rar/xdocs/properties.xml	17 Jun 2004 02:51:53 -0000	1.1
+++ rar/xdocs/properties.xml	23 Aug 2004 02:11:06 -0000
@@ -13,6 +13,14 @@
           <th>Description</th>
         </tr>
         <tr>
+          <td>maven.rar.final.name</td>
+          <td>Yes</td>
+          <td>
+            Name of the generated RAR file.
+            Defaults to ${maven.final.name}.rar.
+          </td>
+        </tr>
+        <tr>
           <td>maven.rar.manifest</td>
           <td>Yes</td>
           <td>
@@ -63,4 +71,4 @@
       </table>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>
Index: repository/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/repository/plugin.jelly,v
retrieving revision 1.25
diff -u -r1.25 plugin.jelly
--- repository/plugin.jelly	21 Apr 2004 01:03:25 -0000	1.25
+++ repository/plugin.jelly	23 Aug 2004 02:11:07 -0000
@@ -150,7 +150,7 @@
     <ant:mkdir dir="${maven.build.dir}/bundle"/>
     
     <!-- Copy in the artifact -->
-    <ant:copy file="${maven.build.dir}/${maven.final.name}.jar" todir="${maven.build.dir}/bundle"/>
+    <ant:copy file="${maven.build.dir}/${maven.jar.final.name}" todir="${maven.build.dir}/bundle"/>
     
     <!-- Copy in the POM -->
     <ant:copy file="${basedir}/project.xml" todir="${maven.build.dir}/bundle"/>
Index: uberjar/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/uberjar/plugin.jelly,v
retrieving revision 1.11
diff -u -r1.11 plugin.jelly
--- uberjar/plugin.jelly	10 Apr 2004 03:17:22 -0000	1.11
+++ uberjar/plugin.jelly	23 Aug 2004 02:11:07 -0000
@@ -69,7 +69,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 -->