You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/09/06 02:06:54 UTC
svn commit: r573111 - in /maven/plugins/trunk/maven-assembly-plugin/src:
main/java/org/apache/maven/plugin/assembly/
main/java/org/apache/maven/plugin/assembly/archive/
main/java/org/apache/maven/plugin/assembly/mojos/
test/java/org/apache/maven/plugin...
Author: jdcasey
Date: Wed Sep 5 17:06:53 2007
New Revision: 573111
URL: http://svn.apache.org/viewvc?rev=573111&view=rev
Log:
Adding ignoreDirFormatExtensions parameter to allow suppression of '.dir' suffix on directory assemblies, and moving the setDestFile(..) call to be in front of the phase executions, for archivers that process more or less in real time.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java?rev=573111&r1=573110&r2=573111&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java Wed Sep 5 17:06:53 2007
@@ -57,4 +57,6 @@
boolean isDryRun();
+ boolean isIgnoreDirFormatExtensions();
+
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=573111&r1=573110&r2=573111&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java Wed Sep 5 17:06:53 2007
@@ -70,7 +70,11 @@
AssemblerConfigurationSource configSource )
throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
{
- String filename = fullName + "." + format;
+ String filename = fullName;
+ if ( !configSource.isIgnoreDirFormatExtensions() || !format.startsWith( "dir" ) )
+ {
+ filename += "." + format;
+ }
AssemblyFileUtils.verifyTempDirectoryAvailability( configSource.getTemporaryRootDirectory(), getLogger() );
@@ -96,14 +100,14 @@
Archiver archiver = createArchiver( format, assembly.isIncludeBaseDirectory(), basedir, configSource,
containerHandlers );
+ archiver.setDestFile( destFile );
+
for ( Iterator phaseIterator = assemblyPhases.iterator(); phaseIterator.hasNext(); )
{
AssemblyArchiverPhase phase = (AssemblyArchiverPhase) phaseIterator.next();
phase.execute( assembly, archiver, configSource );
}
-
- archiver.setDestFile( destFile );
archiver.createArchive();
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=573111&r1=573110&r2=573111&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java Wed Sep 5 17:06:53 2007
@@ -55,6 +55,15 @@
private boolean dryRun;
/**
+ * If this flag is set, the ".dir" suffix will be suppressed in the output
+ * directory name when using assembly/format == 'dir' and other formats
+ * that begin with 'dir'.
+ *
+ * @parameter default-value="false"
+ */
+ private boolean ignoreDirFormatExtensions;
+
+ /**
* Local Maven repository where artifacts are cached during the build process.
*
* @parameter default-value="${localRepository}"
@@ -587,6 +596,11 @@
public boolean isDryRun()
{
return dryRun;
+ }
+
+ public boolean isIgnoreDirFormatExtensions()
+ {
+ return ignoreDirFormatExtensions;
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java?rev=573111&r1=573110&r2=573111&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java Wed Sep 5 17:06:53 2007
@@ -78,6 +78,9 @@
configSource.isDryRun();
csControl.setReturnValue( false, MockControl.ZERO_OR_MORE );
+ configSource.isIgnoreDirFormatExtensions();
+ csControl.setReturnValue( false, MockControl.ZERO_OR_MORE );
+
File outDir = fileManager.createTempDir();
macMgr.archiver.setDestFile( new File( outDir, "full-name.zip" ) );