You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/01/03 11:44:57 UTC
svn commit: r365599 - in
/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly:
AbstractAssemblyMojo.java AbstractUnpackingMojo.java DirectoryMojo.java
Author: brett
Date: Tue Jan 3 02:44:53 2006
New Revision: 365599
URL: http://svn.apache.org/viewcvs?rev=365599&view=rev
Log:
PR: MASSEMBLY-49
better handling of classifiers and artifact attachment
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/AbstractUnpackingMojo.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=365599&r1=365598&r2=365599&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 Tue Jan 3 02:44:53 2006
@@ -209,9 +209,13 @@
{
projectHelper.attachArtifact( project, format, assembly.getId(), destFile );
}
+ else if ( classifier != null )
+ {
+ projectHelper.attachArtifact( project, format, classifier, destFile );
+ }
else
{
- projectHelper.attachArtifact( project, format, null, destFile );
+ getLog().info( "No artifact attached as no classifier was given." );
}
}
}
@@ -224,14 +228,17 @@
*/
protected String getDistributionName( Assembly assembly )
{
- String distributionName;
- if ( appendAssemblyId && !StringUtils.isEmpty( assembly.getId() ) )
+ String distributionName = finalName;
+ if ( appendAssemblyId )
{
- distributionName = finalName + "-" + assembly.getId();
+ if ( !StringUtils.isEmpty( assembly.getId() ) )
+ {
+ distributionName = finalName + "-" + assembly.getId();
+ }
}
- else
+ else if ( classifier != null )
{
- distributionName = finalName;
+ distributionName = finalName + "-" + classifier;
}
return distributionName;
}
@@ -837,4 +844,5 @@
assembly.addFileSet( siteFileSet );
}
+
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java?rev=365599&r1=365598&r2=365599&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java Tue Jan 3 02:44:53 2006
@@ -97,6 +97,11 @@
private MavenProject executedProject;
/**
+ * @parameter expression="${classifier}"
+ */
+ protected String classifier;
+
+ /**
* Retrieves all artifact dependencies within the reactor
*
* @return A HashSet of artifacts
@@ -163,9 +168,7 @@
try
{
- UnArchiver unArchiver;
-
- unArchiver = this.archiverManager.getUnArchiver( archiveExt );
+ UnArchiver unArchiver = this.archiverManager.getUnArchiver( archiveExt );
unArchiver.setSourceFile( file );
@@ -183,4 +186,8 @@
}
}
+ public String getClassifier()
+ {
+ return classifier;
+ }
}
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=365599&r1=365598&r2=365599&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 Tue Jan 3 02:44:53 2006
@@ -34,7 +34,7 @@
* @execute phase="package"
*/
public class DirectoryMojo
- extends AssemblyMojo
+ extends AbstractAssemblyMojo
{
public void execute()
throws MojoExecutionException, MojoFailureException
@@ -42,11 +42,15 @@
Assembly assembly = readAssembly();
String fullName = finalName;
- if ( appendAssemblyId)
+ if ( appendAssemblyId )
{
fullName = fullName + "-" + assembly.getId();
}
-
+ else if ( getClassifier() != null )
+ {
+ fullName = fullName + "-" + getClassifier();
+ }
+
try
{
Archiver archiver = new DirectoryArchiver();