Author: krosenvold
Date: Sat Oct 25 11:30:57 2014
New Revision: 1634215
URL: http://svn.apache.org/r1634215
Log:
p-a to 2.8.1, converted tests to use diags versions from p-a
Removed:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1634215&r1=1634214&r2=1634215&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sat Oct 25 11:30:57 2014
@@ -125,7 +125,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>2.8</version>
+ <version>2.8.1</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java?rev=1634215&r1=1634214&r2=1634215&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
Sat Oct 25 11:30:57 2014
@@ -35,6 +35,7 @@ import org.apache.maven.plugin.testing.s
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
+import org.codehaus.plexus.archiver.diags.NoOpArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
import org.codehaus.plexus.util.DirectoryScanner;
@@ -184,7 +185,7 @@ public class BasicAbstractAssemblyMojoFe
}
public static final class FileLoggingArchiverStub
- implements Archiver
+ extends NoOpArchiver
{
private Set files = new LinkedHashSet();
@@ -264,67 +265,6 @@ public class BasicAbstractAssemblyMojoFe
throw new ArchiverException( "Error scanning for file names.",
e );
}
}
-
- public void createArchive() throws ArchiverException, IOException
- {
- // TODO Auto-generated method stub
-
- }
-
- public int getDefaultDirectoryMode()
- {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public int getDefaultFileMode()
- {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public File getDestFile()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Map getFiles()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean getIncludeEmptyDirs()
- {
- // TODO Auto-generated method stub
- return false;
- }
-
- public void setDefaultDirectoryMode( int arg0 )
- {
- // TODO Auto-generated method stub
-
- }
-
- public void setDefaultFileMode( int arg0 )
- {
- // TODO Auto-generated method stub
-
- }
-
- public void setDestFile( File arg0 )
- {
- // TODO Auto-generated method stub
-
- }
-
- public void setIncludeEmptyDirs( boolean arg0 )
- {
- // TODO Auto-generated method stub
-
- }
-
}
public static final class TwoDependencyReactorProjectStub
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=1634215&r1=1634214&r2=1634215&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
Sat Oct 25 11:30:57 2014
@@ -41,6 +41,7 @@ import org.codehaus.plexus.archiver.Arch
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.FileSet;
import org.codehaus.plexus.archiver.ResourceIterator;
+import org.codehaus.plexus.archiver.diags.NoOpArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
import org.codehaus.plexus.archiver.tar.TarArchiver;
@@ -606,229 +607,21 @@ public class DefaultAssemblyArchiverTest
}
public static final class TestArchiverWithConfig
- implements Archiver
+ extends NoOpArchiver
{
private String simpleConfig;
- private boolean useJvmChmod;
-
- private boolean ignorePermissions;
-
public String getSimpleConfig()
{
return simpleConfig;
}
- public void addArchivedFileSet( final File arg0 )
- throws ArchiverException
- {
- }
-
- public void addArchivedFileSet( final ArchivedFileSet arg0 )
- throws ArchiverException
- {
- }
-
- public void addArchivedFileSet( final File arg0, final String arg1 )
- throws ArchiverException
- {
- }
- public void addArchivedFileSet( final File arg0, final String[] arg1,
final String[] arg2 )
- throws ArchiverException
- {
- }
-
- public void addArchivedFileSet( final File arg0, final String arg1,
final String[] arg2, final String[] arg3 )
- throws ArchiverException
- {
- }
-
- public void addDirectory( final File arg0 )
- throws ArchiverException
- {
- }
-
- public void addDirectory( final File arg0, final String arg1 )
- throws ArchiverException
- {
- }
-
- public void addDirectory( final File arg0, final String[] arg1, final
String[] arg2 )
- throws ArchiverException
- {
- }
-
- public void addDirectory( final File arg0, final String arg1, final
String[] arg2, final String[] arg3 )
- throws ArchiverException
- {
- }
-
- public void addFile( final File arg0, final String arg1 )
- throws ArchiverException
- {
- }
-
- public void addFile( final File arg0, final String arg1, final int
arg2 )
- throws ArchiverException
- {
- }
-
- public void addFileSet( final FileSet arg0 )
- throws ArchiverException
- {
- }
-
- public void addResource( final PlexusIoResource arg0, final String
arg1, final int arg2 )
- throws ArchiverException
- {
- }
-
- public void addSymlink( String s, String s2 )
- throws ArchiverException
- {
-
- }
-
- public void addSymlink( String s, int i, String s2 )
- throws ArchiverException
- {
-
- }
-
- public void addResources( final PlexusIoResourceCollection arg0 )
- throws ArchiverException
- {
- }
-
- public void createArchive()
- throws ArchiverException, IOException
- {
- }
-
- public int getDefaultDirectoryMode()
- {
- return 0;
- }
-
- public int getDefaultFileMode()
- {
- return 0;
- }
-
- public File getDestFile()
- {
- return null;
- }
-
- @SuppressWarnings( "rawtypes" )
- public Map getFiles()
- {
- return null;
- }
-
- public boolean getIncludeEmptyDirs()
- {
- return false;
- }
-
- public ResourceIterator getResources()
- throws ArchiverException
- {
- return null;
- }
-
- public boolean isForced()
- {
- return false;
- }
-
- public boolean isSupportingForced()
- {
- return false;
- }
-
- public void setDefaultDirectoryMode( final int arg0 )
- {
- }
-
- public void setDefaultFileMode( final int arg0 )
- {
- }
-
- public void setDestFile( final File arg0 )
- {
- }
-
- public void setDotFileDirectory( final File arg0 )
- {
- }
-
- public void setForced( final boolean arg0 )
- {
- }
-
- public void setIncludeEmptyDirs( final boolean arg0 )
- {
- }
public String getDuplicateBehavior()
{
return Archiver.DUPLICATES_ADD;
}
-
- public void setDuplicateBehavior( final String duplicate )
- {
- }
-
- public int getDirectoryMode()
- {
- return 0;
- }
-
- public int getFileMode()
- {
- return 0;
- }
-
- public int getOverrideDirectoryMode()
- {
- return 0;
- }
-
- public int getOverrideFileMode()
- {
- return 0;
- }
-
- public void setDirectoryMode( final int mode )
- {
- }
-
- public void setFileMode( final int mode )
- {
- }
-
- public boolean isUseJvmChmod()
- {
- return useJvmChmod;
- }
-
- public void setUseJvmChmod( final boolean useJvmChmod )
- {
- this.useJvmChmod = useJvmChmod;
- }
-
- public boolean isIgnorePermissions()
- {
- return ignorePermissions;
- }
-
- public void setIgnorePermissions( final boolean ignorePermissions )
- {
- this.ignorePermissions = ignorePermissions;
- }
-
}
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.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?rev=1634215&r1=1634214&r2=1634215&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java
Sat Oct 25 11:30:57 2014
@@ -30,10 +30,9 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.apache.maven.plugin.assembly.testutils.TrackingArchiverStub;
-import
org.apache.maven.plugin.assembly.testutils.TrackingArchiverStub.Addition;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.diags.TrackingArchiver;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.util.DefaultFileSet;
import org.codehaus.plexus.components.io.fileselectors.FileInfo;
@@ -70,7 +69,7 @@ public class AssemblyProxyArchiverTest
final File workdir = new File( sources, "workdir" );
- final TrackingArchiverStub tracker = new TrackingArchiverStub();
+ final TrackingArchiver tracker = new TrackingArchiver();
final AssemblyProxyArchiver archiver =
new AssemblyProxyArchiver( "", tracker, null, null, null, workdir,
logger, false );
@@ -96,7 +95,7 @@ public class AssemblyProxyArchiverTest
fileManager.createFile( sources, "test-included.txt", "This is
included" );
fileManager.createFile( workdir, "test-excluded.txt", "This is
excluded" );
- final TrackingArchiverStub tracker = new TrackingArchiverStub();
+ final TrackingArchiver tracker = new TrackingArchiver();
final AssemblyProxyArchiver archiver =
new AssemblyProxyArchiver( "", tracker, null, null, null, workdir,
logger, false );
@@ -109,7 +108,7 @@ public class AssemblyProxyArchiverTest
assertEquals( 1, tracker.added.size() );
- final Addition addition = tracker.added.get( 0 );
+ final TrackingArchiver.Addition addition = tracker.added.get( 0 );
assertNotNull( addition.excludes );
assertEquals( 1, addition.excludes.length );
assertEquals( workdir.getName(), addition.excludes[0] );
@@ -125,7 +124,7 @@ public class AssemblyProxyArchiverTest
delegate.addFile( (File)anyObject(), (String)anyObject() );
EasyMock.expectLastCall().anyTimes();
- delegate.setForced( true );
+ delegate.setForced(true);
EasyMock.expectLastCall().anyTimes();
final CounterSelector counter = new CounterSelector( true );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java?rev=1634215&r1=1634214&r2=1634215&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
Sat Oct 25 11:30:57 2014
@@ -44,6 +44,7 @@ import org.codehaus.plexus.archiver.Arch
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.FileSet;
import org.codehaus.plexus.archiver.ResourceIterator;
+import org.codehaus.plexus.archiver.diags.NoOpArchiver;
import org.codehaus.plexus.archiver.zip.ZipArchiver;
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
@@ -373,17 +374,13 @@ public class ComponentsXmlArchiverFileFi
}
private static final class FileCatchingArchiver
- implements Archiver
+ extends NoOpArchiver
{
private File inputFile;
private String destFileName;
- private boolean useJvmChmod;
-
- private boolean ignorePermissions;
-
public void addDirectory( final @Nonnull File directory )
throws ArchiverException
{
@@ -629,26 +626,6 @@ public class ComponentsXmlArchiverFileFi
{
throw new UnsupportedOperationException( "not supported" );
}
-
- public boolean isUseJvmChmod()
- {
- return useJvmChmod;
- }
-
- public void setUseJvmChmod( final boolean useJvmChmod )
- {
- this.useJvmChmod = useJvmChmod;
- }
-
- public boolean isIgnorePermissions()
- {
- return ignorePermissions;
- }
-
- public void setIgnorePermissions( final boolean ignorePermissions )
- {
- this.ignorePermissions = ignorePermissions;
- }
}
}
