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/08/29 18:38:28 UTC
svn commit: r570858 - 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/archive/archiver/
main/java/org/apache/m...
Author: jdcasey
Date: Wed Aug 29 09:38:23 2007
New Revision: 570858
URL: http://svn.apache.org/viewvc?rev=570858&view=rev
Log:
Renaming the PrefixingProxyArchiver to reflect its other customizations for assembly use, adding some debug statements here and there, adding a dryRun parameter to the mojos to allow simulated assembly builds.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
- copied, changed from r570462, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java
- copied, changed from r570462, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiverTest.java
Removed:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiverTest.java
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/archive/task/AddFileSetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.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=570858&r1=570857&r2=570858&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 Aug 29 09:38:23 2007
@@ -55,4 +55,6 @@
List getRemoteRepositories();
+ boolean isDryRun();
+
}
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=570858&r1=570857&r2=570858&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 Aug 29 09:38:23 2007
@@ -2,7 +2,7 @@
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.archiver.PrefixingProxyArchiver;
+import org.apache.maven.plugin.assembly.archive.archiver.AssemblyProxyArchiver;
import org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase;
import org.apache.maven.plugin.assembly.filter.ComponentsXmlArchiverFileFilter;
import org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler;
@@ -219,7 +219,7 @@
prefix = finalName;
}
- archiver = new PrefixingProxyArchiver( prefix, archiver, containerHandlers, extraSelectors, extraFinalizers );
+ archiver = new AssemblyProxyArchiver( prefix, archiver, containerHandlers, extraSelectors, extraFinalizers, getLogger(), configSource.isDryRun() );
return archiver;
}
Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java (from r570462, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiver.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiver.java&r1=570462&r2=570858&rev=570858&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java Wed Aug 29 09:38:23 2007
@@ -11,17 +11,31 @@
import org.codehaus.plexus.archiver.util.DefaultFileSet;
import org.codehaus.plexus.components.io.fileselectors.FileInfo;
import org.codehaus.plexus.components.io.fileselectors.FileSelector;
+import org.codehaus.plexus.logging.Logger;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
-public class PrefixingProxyArchiver
+/**
+ * Delegating archiver implementation that supports:
+ * <ul>
+ * <li>dry-running (where the delegate archiver is never actually called)</li>
+ * <li>prefixing (where all paths have a set global prefix prepended before addition)</li>
+ * <li>duplication checks on archive additions (for archive-file path + prefix)</li>
+ * </ul>
+ *
+ * @author jdcasey
+ *
+ */
+public class AssemblyProxyArchiver
implements Archiver
{
@@ -33,11 +47,25 @@
private ThreadLocal inPublicApi = new ThreadLocal();
- public PrefixingProxyArchiver( String rootPrefix, Archiver delegate, List containerDescriptorHandlers,
- List extraSelectors, List extraFinalizers )
+ private final Logger logger;
+
+ private final boolean dryRun;
+
+ private Set seenPaths = new HashSet();
+
+ public AssemblyProxyArchiver( String rootPrefix, Archiver delegate, List containerDescriptorHandlers,
+ List extraSelectors, List extraFinalizers, Logger logger )
+ {
+ this( rootPrefix, delegate, containerDescriptorHandlers, extraSelectors, extraFinalizers, logger, false );
+ }
+
+ public AssemblyProxyArchiver( String rootPrefix, Archiver delegate, List containerDescriptorHandlers,
+ List extraSelectors, List extraFinalizers, Logger logger, boolean dryRun )
{
this.rootPrefix = rootPrefix;
this.delegate = delegate;
+ this.logger = logger;
+ this.dryRun = dryRun;
if ( !"".equals( rootPrefix ) && !rootPrefix.endsWith( "/" ) )
{
@@ -89,6 +117,13 @@
public void addArchivedFileSet( File archiveFile, String prefix, String[] includes, String[] excludes )
throws ArchiverException
{
+ String archiveKey = getArchiveKey( archiveFile, prefix );
+ if ( seenPaths.contains( archiveKey ) )
+ {
+ warn( "Archive: " + archiveFile + " has already been added. Skipping." );
+ return;
+ }
+
inPublicApi.set( Boolean.TRUE );
try
{
@@ -100,7 +135,17 @@
fs.setPrefix( rootPrefix + prefix );
fs.setFileSelectors( selectors );
- delegate.addArchivedFileSet( fs );
+ debug( "Adding archived file-set in: " + archiveFile + " to archive location: " + fs.getPrefix() );
+
+ if ( dryRun )
+ {
+ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() );
+ }
+ else
+ {
+ delegate.addArchivedFileSet( fs );
+ seenPaths.add( archiveKey );
+ }
}
finally
{
@@ -108,9 +153,37 @@
}
}
+ private String getArchiveKey( File archiveFile, String prefix )
+ {
+ return archiveFile.getAbsolutePath() + ":" + prefix;
+ }
+
+ private void debug( String message )
+ {
+ if ( ( logger != null ) && logger.isDebugEnabled() )
+ {
+ logger.debug( message );
+ }
+ }
+
+ private void warn( String message )
+ {
+ if ( ( logger != null ) && logger.isWarnEnabled() )
+ {
+ logger.warn( message );
+ }
+ }
+
public void addArchivedFileSet( File archiveFile, String prefix )
throws ArchiverException
{
+ String archiveKey = getArchiveKey( archiveFile, prefix );
+ if ( seenPaths.contains( archiveKey ) )
+ {
+ warn( "Archive: " + archiveFile + " has already been added. Skipping." );
+ return;
+ }
+
inPublicApi.set( Boolean.TRUE );
try
{
@@ -120,7 +193,17 @@
fs.setPrefix( rootPrefix + prefix );
fs.setFileSelectors( selectors );
- delegate.addArchivedFileSet( fs );
+ debug( "Adding archived file-set in: " + archiveFile + " to archive location: " + fs.getPrefix() );
+
+ if ( dryRun )
+ {
+ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() );
+ }
+ else
+ {
+ delegate.addArchivedFileSet( fs );
+ seenPaths.add( archiveKey );
+ }
}
finally
{
@@ -131,6 +214,13 @@
public void addArchivedFileSet( File archiveFile, String[] includes, String[] excludes )
throws ArchiverException
{
+ String archiveKey = getArchiveKey( archiveFile, "" );
+ if ( seenPaths.contains( archiveKey ) )
+ {
+ warn( "Archive: " + archiveFile + " has already been added. Skipping." );
+ return;
+ }
+
inPublicApi.set( Boolean.TRUE );
try
{
@@ -142,7 +232,17 @@
fs.setPrefix( rootPrefix );
fs.setFileSelectors( selectors );
- delegate.addArchivedFileSet( fs );
+ debug( "Adding archived file-set in: " + archiveFile + " to archive location: " + fs.getPrefix() );
+
+ if ( dryRun )
+ {
+ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() );
+ }
+ else
+ {
+ delegate.addArchivedFileSet( fs );
+ seenPaths.add( archiveKey );
+ }
}
finally
{
@@ -153,6 +253,13 @@
public void addArchivedFileSet( File archiveFile )
throws ArchiverException
{
+ String archiveKey = getArchiveKey( archiveFile, "" );
+ if ( seenPaths.contains( archiveKey ) )
+ {
+ warn( "Archive: " + archiveFile + " has already been added. Skipping." );
+ return;
+ }
+
inPublicApi.set( Boolean.TRUE );
try
{
@@ -162,7 +269,17 @@
fs.setPrefix( rootPrefix );
fs.setFileSelectors( selectors );
- delegate.addArchivedFileSet( fs );
+ debug( "Adding archived file-set in: " + archiveFile + " to archive location: " + fs.getPrefix() );
+
+ if ( dryRun )
+ {
+ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() );
+ }
+ else
+ {
+ delegate.addArchivedFileSet( fs );
+ seenPaths.add( archiveKey );
+ }
}
finally
{
@@ -184,7 +301,16 @@
fs.setPrefix( rootPrefix + prefix );
fs.setFileSelectors( selectors );
- delegate.addFileSet( fs );
+ debug( "Adding directory file-set in: " + directory + " to archive location: " + fs.getPrefix() );
+
+ if ( dryRun )
+ {
+ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() );
+ }
+ else
+ {
+ delegate.addFileSet( fs );
+ }
}
finally
{
@@ -204,7 +330,16 @@
fs.setPrefix( rootPrefix + prefix );
fs.setFileSelectors( selectors );
- delegate.addFileSet( fs );
+ debug( "Adding directory file-set in: " + directory + " to archive location: " + fs.getPrefix() );
+
+ if ( dryRun )
+ {
+ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() );
+ }
+ else
+ {
+ delegate.addFileSet( fs );
+ }
}
finally
{
@@ -226,7 +361,16 @@
fs.setPrefix( rootPrefix );
fs.setFileSelectors( selectors );
- delegate.addFileSet( fs );
+ debug( "Adding directory file-set in: " + directory + " to archive location: " + fs.getPrefix() );
+
+ if ( dryRun )
+ {
+ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() );
+ }
+ else
+ {
+ delegate.addFileSet( fs );
+ }
}
finally
{
@@ -246,7 +390,16 @@
fs.setPrefix( rootPrefix );
fs.setFileSelectors( selectors );
- delegate.addFileSet( fs );
+ debug( "Adding directory file-set in: " + directory + " to archive location: " + fs.getPrefix() );
+
+ if ( dryRun )
+ {
+ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() );
+ }
+ else
+ {
+ delegate.addFileSet( fs );
+ }
}
finally
{
@@ -262,7 +415,16 @@
inPublicApi.set( Boolean.TRUE );
try
{
- delegate.addFile( inputFile, rootPrefix + destFileName, permissions );
+ debug( "Adding file: " + inputFile + " to archive location: " + rootPrefix + destFileName );
+
+ if ( dryRun )
+ {
+ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() );
+ }
+ else
+ {
+ delegate.addFile( inputFile, rootPrefix + destFileName, permissions );
+ }
}
finally
{
@@ -279,7 +441,16 @@
inPublicApi.set( Boolean.TRUE );
try
{
- delegate.addFile( inputFile, rootPrefix + destFileName );
+ debug( "Adding file: " + inputFile + " to archive location: " + rootPrefix + destFileName );
+
+ if ( dryRun )
+ {
+ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() );
+ }
+ else
+ {
+ delegate.addFile( inputFile, rootPrefix + destFileName );
+ }
}
finally
{
@@ -294,7 +465,14 @@
inPublicApi.set( Boolean.TRUE );
try
{
- delegate.createArchive();
+ if ( dryRun )
+ {
+ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() );
+ }
+ else
+ {
+ delegate.createArchive();
+ }
}
finally
{
@@ -460,25 +638,35 @@
public void setDotFileDirectory( File dotFileDirectory )
{
- inPublicApi.set( Boolean.TRUE );
- try
- {
- throw new UnsupportedOperationException(
- "Undocumented feature of plexus-archiver; this is not yet supported." );
- }
- finally
- {
- inPublicApi.set( null );
- }
+ throw new UnsupportedOperationException( "Undocumented feature of plexus-archiver; this is not yet supported." );
}
public void addArchivedFileSet( ArchivedFileSet fileSet )
throws ArchiverException
{
+ String archiveKey = getArchiveKey( fileSet.getArchive(), "" );
+ if ( seenPaths.contains( archiveKey ) )
+ {
+ warn( "Archive: " + fileSet.getArchive() + " has already been added. Skipping." );
+ return;
+ }
+
inPublicApi.set( Boolean.TRUE );
try
{
- delegate.addArchivedFileSet( new PrefixedArchivedFileSet( fileSet, rootPrefix, selectors ) );
+ PrefixedArchivedFileSet fs = new PrefixedArchivedFileSet( fileSet, rootPrefix, selectors );
+
+ debug( "Adding archived file-set in: " + fileSet.getArchive() + " to archive location: " + fs.getPrefix() );
+
+ if ( dryRun )
+ {
+ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() );
+ }
+ else
+ {
+ delegate.addArchivedFileSet( fs );
+ seenPaths.add( archiveKey );
+ }
}
finally
{
@@ -492,12 +680,33 @@
inPublicApi.set( Boolean.TRUE );
try
{
- delegate.addFileSet( new PrefixedFileSet( fileSet, rootPrefix, selectors ) );
+ PrefixedFileSet fs = new PrefixedFileSet( fileSet, rootPrefix, selectors );
+
+ debug( "Adding file-set in: " + fileSet.getDirectory() + " to archive location: " + fs.getPrefix() );
+
+ if ( dryRun )
+ {
+ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() );
+ }
+ else
+ {
+ delegate.addFileSet( fs );
+ }
}
finally
{
inPublicApi.set( null );
}
+ }
+
+ private String getMethodName()
+ {
+ NullPointerException npe = new NullPointerException();
+ StackTraceElement[] trace = npe.getStackTrace();
+
+ StackTraceElement methodElement = trace[1];
+
+ return methodElement.getMethodName() + " (archiver line: " + methodElement.getLineNumber() + ")";
}
private boolean acceptFile( File inputFile )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java?rev=570858&r1=570857&r2=570858&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java Wed Aug 29 09:38:23 2007
@@ -115,8 +115,7 @@
+ e.getMessage(), e );
}
- logger.debug( "file-set directory: '" + fileSetDir.getAbsolutePath() + "'" );
- logger.debug( "output directory: '" + destDirectory + "'" );
+ logger.debug( "Adding file-set from directory: '" + fileSetDir.getAbsolutePath() + "'\nassembly output directory is: \'" + destDirectory + "\'" );
AddDirectoryTask task = new AddDirectoryTask( fileSetDir );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java?rev=570858&r1=570857&r2=570858&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java Wed Aug 29 09:38:23 2007
@@ -28,6 +28,7 @@
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+import org.codehaus.plexus.util.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
@@ -101,6 +102,8 @@
Set dependencyArtifacts =
MavenMetadataSource.createArtifacts( factory, project.getDependencies(), null, filter, project );
+
+ getLogger().debug( "Project dependencies are:\n" + StringUtils.join( dependencyArtifacts.iterator(), "\n" ) );
ArtifactResolutionResult result;
try
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=570858&r1=570857&r2=570858&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 Aug 29 09:38:23 2007
@@ -48,6 +48,13 @@
{
/**
+ * If this flag is set, everything up to the call to Archiver.createArchive() will be executed.
+ *
+ * @parameter expression="${assembly.dryRun}" default-value="false"
+ */
+ private boolean dryRun;
+
+ /**
* Local Maven repository where artifacts are cached during the build process.
*
* @parameter default-value="${localRepository}"
@@ -575,6 +582,11 @@
public List getRemoteRepositories()
{
return remoteRepositories;
+ }
+
+ public boolean isDryRun()
+ {
+ return dryRun;
}
}
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=570858&r1=570857&r2=570858&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 Aug 29 09:38:23 2007
@@ -75,6 +75,9 @@
configSource.getTemporaryRootDirectory();
csControl.setReturnValue( tempDir, MockControl.ZERO_OR_MORE );
+ configSource.isDryRun();
+ csControl.setReturnValue( false, MockControl.ZERO_OR_MORE );
+
File outDir = fileManager.createTempDir();
macMgr.archiver.setDestFile( new File( outDir, "full-name.zip" ) );
@@ -126,6 +129,9 @@
configSource.getTarLongFileMode();
configCtl.setReturnValue( TarLongFileMode.FAIL, MockControl.ZERO_OR_MORE );
+ configSource.isDryRun();
+ configCtl.setReturnValue( false, MockControl.ZERO_OR_MORE );
+
mm.add( configCtl );
mm.replayAll();
@@ -152,12 +158,18 @@
macArchiverManager.expectGetArchiver( "war", twArchiver );
+ MockControl configCtl = MockControl.createControl( AssemblerConfigurationSource.class );
+ AssemblerConfigurationSource configSource = (AssemblerConfigurationSource) configCtl.getMock();
+
+ configSource.isDryRun();
+ configCtl.setReturnValue( false, MockControl.ZERO_OR_MORE );
+
mm.replayAll();
DefaultAssemblyArchiver subject =
createSubject( macArchiverManager, Collections.EMPTY_LIST, null );
- subject.createArchiver( "war", false, null, null, null );
+ subject.createArchiver( "war", false, null, configSource, null );
assertFalse( twArchiver.ignoreWebxml );
}
@@ -173,12 +185,18 @@
macArchiverManager.expectGetArchiver( "zip", archiver );
+ MockControl configCtl = MockControl.createControl( AssemblerConfigurationSource.class );
+ AssemblerConfigurationSource configSource = (AssemblerConfigurationSource) configCtl.getMock();
+
+ configSource.isDryRun();
+ configCtl.setReturnValue( false, MockControl.ZERO_OR_MORE );
+
mm.replayAll();
DefaultAssemblyArchiver subject =
createSubject( macArchiverManager, Collections.EMPTY_LIST, null );
- subject.createArchiver( "zip", false, null, null, null );
+ subject.createArchiver( "zip", false, null, configSource, null );
}
// TODO: Re-implement these tests on the createArchiver(..) method. For now, they're no big loss.
Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java (from r570462, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiverTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiverTest.java&r1=570462&r2=570858&rev=570858&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java Wed Aug 29 09:38:23 2007
@@ -6,6 +6,8 @@
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.components.io.fileselectors.FileInfo;
import org.codehaus.plexus.components.io.fileselectors.FileSelector;
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.easymock.MockControl;
import java.io.File;
@@ -15,7 +17,7 @@
import junit.framework.TestCase;
-public class PrefixingProxyArchiverTest
+public class AssemblyProxyArchiverTest
extends TestCase
{
@@ -42,8 +44,8 @@
delegateControl.replay();
- PrefixingProxyArchiver archiver = new PrefixingProxyArchiver( "", delegate, Collections.EMPTY_LIST, selectors,
- Collections.EMPTY_LIST );
+ AssemblyProxyArchiver archiver = new AssemblyProxyArchiver( "", delegate, Collections.EMPTY_LIST, selectors,
+ Collections.EMPTY_LIST, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
File inputFile = fileManager.createTempFile();
@@ -65,8 +67,8 @@
CounterSelector counter = new CounterSelector( false );
List selectors = Collections.singletonList( counter );
- PrefixingProxyArchiver archiver = new PrefixingProxyArchiver( "", delegate, Collections.EMPTY_LIST, selectors,
- Collections.EMPTY_LIST );
+ AssemblyProxyArchiver archiver = new AssemblyProxyArchiver( "", delegate, Collections.EMPTY_LIST, selectors,
+ Collections.EMPTY_LIST, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
File dir = fileManager.createTempDir();
fileManager.createFile( dir, "file.txt", "This is a test." );