svn commit: r356991 - in /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly: AbstractAssemblyMojo.java DirectoryMojo.java

[aramirez]

Author: aramirez
Date: Wed Dec 14 23:11:11 2005
New Revision: 356991

URL: http://svn.apache.org/viewcvs?rev=356991&view=rev
Log:
PR: MNG-1844
Submitted by: Henry Isidro
Reviewed by: Allan Ramirez

Enables user to have an option not to append assembly id on the final name.

Modified:
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java?rev=356991&r1=356990&r2=356991&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
 Wed Dec 14 23:11:11 2005
@@ -128,6 +128,13 @@
      * @parameter expression="${includeSite}" default-value="false"
      */
     private boolean includeSite;
+    
+    /**
+     * Set to false to exclude the assembly id from the assembly final name.
+     *
+     * @parameter expression="${appendAssemblyId}" default-value="true"
+     */
+    protected boolean appendAssemblyId;
 
     private ComponentsXmlArchiverFileFilter componentsXmlFilter = new 
ComponentsXmlArchiverFileFilter();
 
@@ -176,7 +183,14 @@
                 throw new MojoExecutionException( "Error creating assembly: " 
+ e.getMessage(), e );
             }
 
-            projectHelper.attachArtifact( project, format, assembly.getId(), 
destFile );
+            if ( appendAssemblyId )
+            {
+                projectHelper.attachArtifact( project, format, 
assembly.getId(), destFile );
+            }
+            else
+            {
+                projectHelper.attachArtifact( project, format, null, destFile 
);
+            }
         }
     }
 
@@ -192,8 +206,15 @@
         {
             return finalName;
         }
-
-        return finalName + "-" + assembly.getId();
+        
+        if ( appendAssemblyId )
+        {
+            return finalName + "-" + assembly.getId();
+        }
+        else
+        {
+            return finalName;
+        }
     }
 
     protected File createArchive( Archiver archiver, Assembly assembly, String 
filename )

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java?rev=356991&r1=356990&r2=356991&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java
 Wed Dec 14 23:11:11 2005
@@ -40,9 +40,13 @@
         throws MojoExecutionException, MojoFailureException
     {
         Assembly assembly = readAssembly();
+        String fullName = finalName;
 
-        String fullName = finalName + "-" + assembly.getId();
-
+        if ( appendAssemblyId)
+        {
+            fullName = fullName + "-" + assembly.getId();
+        }
+        
         try
         {
             Archiver archiver = new DirectoryArchiver();