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 2010/09/21 22:39:13 UTC
svn commit: r999622 - in /maven/plugins/trunk/maven-assembly-plugin/src:
main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java
Author: jdcasey
Date: Tue Sep 21 20:39:12 2010
New Revision: 999622
URL: http://svn.apache.org/viewvc?rev=999622&view=rev
Log:
removing unused constructor, and cleaning up formats.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.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?rev=999622&r1=999621&r2=999622&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java Tue Sep 21 20:39:12 2010
@@ -78,14 +78,6 @@ public class AssemblyProxyArchiver
public AssemblyProxyArchiver( final String rootPrefix, final Archiver delegate,
final List<ContainerDescriptorHandler> containerDescriptorHandlers,
final List<FileSelector> extraSelectors,
- final List<ArchiveFinalizer> extraFinalizers, final Logger logger )
- {
- this( rootPrefix, delegate, containerDescriptorHandlers, extraSelectors, extraFinalizers, logger, false );
- }
-
- public AssemblyProxyArchiver( final String rootPrefix, final Archiver delegate,
- final List<ContainerDescriptorHandler> containerDescriptorHandlers,
- final List<FileSelector> extraSelectors,
final List<ArchiveFinalizer> extraFinalizers, final Logger logger,
final boolean dryRun )
{
@@ -142,7 +134,8 @@ public class AssemblyProxyArchiver
}
public void addArchivedFileSet( final File archiveFile, final String prefix, final String[] includes,
- final String[] excludes ) throws ArchiverException
+ final String[] excludes )
+ throws ArchiverException
{
final String archiveKey = getArchiveKey( archiveFile, prefix );
if ( seenPaths.contains( archiveKey ) )
@@ -201,7 +194,8 @@ public class AssemblyProxyArchiver
}
}
- public void addArchivedFileSet( final File archiveFile, final String prefix ) throws ArchiverException
+ public void addArchivedFileSet( final File archiveFile, final String prefix )
+ throws ArchiverException
{
final String archiveKey = getArchiveKey( archiveFile, prefix );
if ( seenPaths.contains( archiveKey ) )
@@ -276,7 +270,8 @@ public class AssemblyProxyArchiver
}
}
- public void addArchivedFileSet( final File archiveFile ) throws ArchiverException
+ public void addArchivedFileSet( final File archiveFile )
+ throws ArchiverException
{
final String archiveKey = getArchiveKey( archiveFile, "" );
if ( seenPaths.contains( archiveKey ) )
@@ -313,7 +308,8 @@ public class AssemblyProxyArchiver
}
public void addDirectory( final File directory, final String prefix, final String[] includes,
- final String[] excludes ) throws ArchiverException
+ final String[] excludes )
+ throws ArchiverException
{
inPublicApi.set( Boolean.TRUE );
try
@@ -343,7 +339,8 @@ public class AssemblyProxyArchiver
}
}
- public void addDirectory( final File directory, final String prefix ) throws ArchiverException
+ public void addDirectory( final File directory, final String prefix )
+ throws ArchiverException
{
inPublicApi.set( Boolean.TRUE );
try
@@ -402,7 +399,8 @@ public class AssemblyProxyArchiver
}
}
- public void addDirectory( final File directory ) throws ArchiverException
+ public void addDirectory( final File directory )
+ throws ArchiverException
{
inPublicApi.set( Boolean.TRUE );
try
@@ -456,7 +454,8 @@ public class AssemblyProxyArchiver
}
}
- public void addFile( final File inputFile, final String destFileName ) throws ArchiverException
+ public void addFile( final File inputFile, final String destFileName )
+ throws ArchiverException
{
if ( acceptFile( inputFile ) )
{
@@ -481,7 +480,8 @@ public class AssemblyProxyArchiver
}
}
- public void createArchive() throws ArchiverException, IOException
+ public void createArchive()
+ throws ArchiverException, IOException
{
inPublicApi.set( Boolean.TRUE );
try
@@ -663,7 +663,8 @@ public class AssemblyProxyArchiver
throw new UnsupportedOperationException( "Undocumented feature of plexus-archiver; this is not yet supported." );
}
- public void addArchivedFileSet( final ArchivedFileSet fileSet ) throws ArchiverException
+ public void addArchivedFileSet( final ArchivedFileSet fileSet )
+ throws ArchiverException
{
final String archiveKey = getArchiveKey( fileSet.getArchive(), "" );
if ( seenPaths.contains( archiveKey ) )
@@ -695,7 +696,8 @@ public class AssemblyProxyArchiver
}
}
- public void addFileSet( final FileSet fileSet ) throws ArchiverException
+ public void addFileSet( final FileSet fileSet )
+ throws ArchiverException
{
inPublicApi.set( Boolean.TRUE );
try
@@ -729,7 +731,8 @@ public class AssemblyProxyArchiver
return methodElement.getMethodName() + " (archiver line: " + methodElement.getLineNumber() + ")";
}
- private boolean acceptFile( final File inputFile ) throws ArchiverException
+ private boolean acceptFile( final File inputFile )
+ throws ArchiverException
{
if ( Boolean.TRUE != inPublicApi.get() )
{
@@ -771,7 +774,8 @@ public class AssemblyProxyArchiver
this.inputFile = inputFile;
}
- public InputStream getContents() throws IOException
+ public InputStream getContents()
+ throws IOException
{
return new FileInputStream( inputFile );
}
@@ -807,7 +811,8 @@ public class AssemblyProxyArchiver
}
}
- public void addResources( final PlexusIoResourceCollection resources ) throws ArchiverException
+ public void addResources( final PlexusIoResourceCollection resources )
+ throws ArchiverException
{
inPublicApi.set( Boolean.TRUE );
try
@@ -820,7 +825,8 @@ public class AssemblyProxyArchiver
}
}
- public ResourceIterator getResources() throws ArchiverException
+ public ResourceIterator getResources()
+ throws ArchiverException
{
return delegate.getResources();
}
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=999622&r1=999621&r2=999622&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 Tue Sep 21 20:39:12 2010
@@ -43,12 +43,14 @@ public class AssemblyProxyArchiverTest
private final TestFileManager fileManager = new TestFileManager( "massembly-proxyArchiver", "" );
@Override
- public void tearDown() throws Exception
+ public void tearDown()
+ throws Exception
{
fileManager.cleanUp();
}
- public void testAddFile_NoPerms_CallAcceptFilesOnlyOnce() throws IOException, ArchiverException
+ public void testAddFile_NoPerms_CallAcceptFilesOnlyOnce()
+ throws IOException, ArchiverException
{
final MockControl delegateControl = MockControl.createControl( Archiver.class );
final Archiver delegate = (Archiver) delegateControl.getMock();
@@ -65,7 +67,7 @@ public class AssemblyProxyArchiverTest
final AssemblyProxyArchiver archiver =
new AssemblyProxyArchiver( "", delegate, null, selectors, null, new ConsoleLogger( Logger.LEVEL_DEBUG,
- "test" ) );
+ "test" ), false );
final File inputFile = fileManager.createTempFile();
@@ -76,7 +78,8 @@ public class AssemblyProxyArchiverTest
delegateControl.verify();
}
- public void testAddDirectory_NoPerms_CallAcceptFilesOnlyOnce() throws IOException, ArchiverException
+ public void testAddDirectory_NoPerms_CallAcceptFilesOnlyOnce()
+ throws IOException, ArchiverException
{
final Archiver delegate = new JarArchiver();
@@ -89,7 +92,7 @@ public class AssemblyProxyArchiverTest
final AssemblyProxyArchiver archiver =
new AssemblyProxyArchiver( "", delegate, null, selectors, null, new ConsoleLogger( Logger.LEVEL_DEBUG,
- "test" ) );
+ "test" ), false );
final File dir = fileManager.createTempDir();
fileManager.createFile( dir, "file.txt", "This is a test." );
@@ -119,7 +122,8 @@ public class AssemblyProxyArchiverTest
return count;
}
- public boolean isSelected( final FileInfo fileInfo ) throws IOException
+ public boolean isSelected( final FileInfo fileInfo )
+ throws IOException
{
if ( fileInfo.isFile() )
{