Author: jdcasey
Date: Fri Mar 30 09:24:12 2007
New Revision: 524155
URL: http://svn.apache.org/viewvc?view=rev&rev=524155
Log:
Rolling out MASSEMBLY-155 fix and file-mode fix; will roll file-mode fix back
in next...investigating whether the -155 fix causes an OutOfMemoryError.
Removed:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/AllTests.java
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java?view=diff&rev=524155&r1=524154&r2=524155
==============================================================================
---
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
(original)
+++
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
Fri Mar 30 09:24:12 2007
@@ -11,7 +11,6 @@
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.FileItem;
import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -81,7 +80,7 @@
try
{
- archiver.addFile( source, target,
TypeConversionUtils.modeToInt( fileItem.getFileMode(), getLogger() ) );
+ archiver.addFile( source, target, Integer.decode(
fileItem.getFileMode() ).intValue() );
}
catch ( ArchiverException e )
{
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java?view=diff&rev=524155&r1=524154&r2=524155
==============================================================================
---
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
(original)
+++
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
Fri Mar 30 09:24:12 2007
@@ -232,7 +232,7 @@
+ "Please ensure the package phase is run before
the assembly is generated." );
}
- AddArtifactTask task = new AddArtifactTask( artifact, getLogger() );
+ AddArtifactTask task = new AddArtifactTask( artifact );
task.setFileNameMapping( binaries.getOutputFileNameMapping() );
task.setOutputDirectory( binaries.getOutputDirectory() );
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java?view=diff&rev=524155&r1=524154&r2=524155
==============================================================================
---
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
(original)
+++
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
Fri Mar 30 09:24:12 2007
@@ -9,7 +9,6 @@
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.Repository;
import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
import org.apache.maven.shared.repository.RepositoryAssembler;
import org.apache.maven.shared.repository.RepositoryAssemblyException;
import org.apache.maven.shared.repository.RepositoryBuilderConfigSource;
@@ -79,8 +78,8 @@
AddDirectoryTask task = new AddDirectoryTask( repositoryDirectory
);
- task.setDirectoryMode( TypeConversionUtils.modeToInt(
repository.getDirectoryMode(), getLogger() ) );
- task.setFileMode( TypeConversionUtils.modeToInt(
repository.getFileMode(), getLogger() ) );
+ task.setDirectoryMode( Integer.decode(
repository.getDirectoryMode() ).intValue() );
+ task.setFileMode( Integer.decode( repository.getFileMode()
).intValue() );
task.setUseDefaultExcludes( repository.isUseDefaultExcludes() );
task.setOutputDirectory( outputDirectory );
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java?view=diff&rev=524155&r1=524154&r2=524155
==============================================================================
---
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
(original)
+++
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
Fri Mar 30 09:24:12 2007
@@ -12,15 +12,14 @@
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.logging.Logger;
public class AddArtifactTask
implements ArchiverTask
{
- private String directoryMode;
+ private int directoryMode = -1;
- private String fileMode;
+ private int fileMode = -1;
private boolean unpack = false;
@@ -36,12 +35,9 @@
private String outputFileNameMapping;
- private final Logger logger;
-
- public AddArtifactTask( Artifact artifact, Logger logger )
+ public AddArtifactTask( Artifact artifact )
{
this.artifact = artifact;
- this.logger = logger;
}
public void execute( Archiver archiver, AssemblerConfigurationSource
configSource )
@@ -70,14 +66,14 @@
try
{
- if ( fileMode != null )
+ if ( fileMode > -1 )
{
- archiver.setDefaultFileMode(
TypeConversionUtils.modeToInt( fileMode, logger ) );
+ archiver.setDefaultFileMode( fileMode );
}
- if ( directoryMode != null )
+ if ( directoryMode > -1 )
{
- archiver.setDefaultDirectoryMode(
TypeConversionUtils.modeToInt( directoryMode, logger ) );
+ archiver.setDefaultDirectoryMode( directoryMode );
}
archiver.addArchivedFileSet( artifact.getFile(),
outputLocation, includesArray, excludesArray );
@@ -97,13 +93,11 @@
{
try
{
- if ( fileMode != null )
+ if ( fileMode > -1 )
{
File artifactFile = artifact.getFile();
- int mode = TypeConversionUtils.modeToInt( fileMode, logger
);
-
- archiver.addFile( artifactFile, outputLocation, mode );
+ archiver.addFile( artifactFile, outputLocation, fileMode );
}
else
{
@@ -118,14 +112,14 @@
}
}
- public void setDirectoryMode( String directoryMode )
+ public void setDirectoryMode( String rawDirectoryMode )
{
- this.directoryMode = directoryMode;
+ this.directoryMode = Integer.decode( rawDirectoryMode ).intValue();
}
- public void setFileMode( String fileMode )
+ public void setFileMode( String rawFileMode )
{
- this.fileMode = fileMode;
+ this.fileMode = Integer.decode( rawFileMode ).intValue();
}
public void setExcludes( List excludes )
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java?view=diff&rev=524155&r1=524154&r2=524155
==============================================================================
---
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
(original)
+++
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
Fri Mar 30 09:24:12 2007
@@ -10,10 +10,8 @@
import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.plugin.assembly.model.UnpackOptions;
import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
import org.apache.maven.plugin.assembly.utils.FilterUtils;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
@@ -121,7 +119,7 @@
}
else
{
- AddArtifactTask task = new AddArtifactTask( depArtifact,
logger );
+ AddArtifactTask task = new AddArtifactTask( depArtifact );
task.setProject( depProject );
task.setOutputDirectory( dependencySet.getOutputDirectory(),
defaultOutputDirectory );
@@ -130,13 +128,6 @@
task.setFileMode( dependencySet.getFileMode() );
task.setUnpack( dependencySet.isUnpack() );
- UnpackOptions opts = dependencySet.getUnpackOptions();
- if ( dependencySet.isUnpack() && opts != null )
- {
- task.setIncludes( opts.getIncludes() );
- task.setExcludes( opts.getExcludes() );
- }
-
task.execute( archiver, configSource );
}
}
@@ -201,7 +192,7 @@
try
{
- archiver.addFile( source, target, TypeConversionUtils.modeToInt(
dependencySet.getFileMode(), logger ) );
+ archiver.addFile( source, target, Integer.decode(
dependencySet.getFileMode() ).intValue() );
}
catch ( ArchiverException e )
{
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java?view=diff&rev=524155&r1=524154&r2=524155
==============================================================================
---
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
(original)
+++
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
Fri Mar 30 09:24:12 2007
@@ -11,7 +11,6 @@
import org.apache.maven.plugin.assembly.format.FileSetFormatter;
import org.apache.maven.plugin.assembly.model.FileSet;
import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.logging.Logger;
@@ -118,8 +117,8 @@
AddDirectoryTask task = new AddDirectoryTask( fileSetDir );
- task.setDirectoryMode( TypeConversionUtils.modeToInt(
fileSet.getDirectoryMode(), logger ) );
- task.setFileMode( TypeConversionUtils.modeToInt(
fileSet.getFileMode(), logger ) );
+ task.setDirectoryMode( Integer.decode( fileSet.getDirectoryMode()
).intValue() );
+ task.setFileMode( Integer.decode( fileSet.getFileMode()
).intValue() );
task.setUseDefaultExcludes( fileSet.isUseDefaultExcludes() );
task.setExcludes( fileSet.getExcludes() );
task.setIncludes( fileSet.getIncludes() );
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java?view=diff&rev=524155&r1=524154&r2=524155
==============================================================================
---
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
(original)
+++
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
Fri Mar 30 09:24:12 2007
@@ -1,25 +1,10 @@
package org.apache.maven.plugin.assembly.utils;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.codehaus.plexus.logging.Logger;
-
import java.util.List;
public final class TypeConversionUtils
{
- private static final int U_R = 256;
- private static final int U_W = 128;
- private static final int U_X = 64;
-
- private static final int G_R = 32;
- private static final int G_W = 16;
- private static final int G_X = 8;
-
- private static final int W_R = 4;
- private static final int W_W = 2;
- private static final int W_X = 1;
-
private TypeConversionUtils()
{
}
@@ -35,101 +20,5 @@
return result;
}
-
- public static int modeToInt( String mode, Logger logger )
- throws AssemblyFormattingException
- {
- try
- {
- int value = Integer.parseInt( mode, 8 );
-
- // discard sanity assessment here; we're pushing ahead.
- verifyModeSanity( value, logger );
-
- return value;
- }
- catch( NumberFormatException e )
- {
- throw new AssemblyFormattingException( "Failed to parse mode as an
octal number: \'" + mode + "\'.", e );
- }
- }
- // the boolean return type is for people who want to make a decision based
on the sanity
- // assessment.
- public static boolean verifyModeSanity( int mode, Logger logger )
- {
- StringBuffer messages = new StringBuffer();
-
- messages.append( "The mode: " + Integer.toString( mode, 8 ) + "
contains nonsensical permissions:" );
-
- boolean warn = false;
-
- // read-access checks.
- if ( ( mode & U_R ) == 0 && ( mode & G_R ) == G_R )
- {
- messages.append( "\n- Group has read access, but user does not." );
- warn = true;
- }
-
- if ( ( mode & U_R ) == 0 && ( mode & W_R ) == W_R )
- {
- messages.append( "\n- World has read access, but user does not." );
- warn = true;
- }
-
- if ( ( mode & G_R ) == 0 && ( mode & W_R ) == W_R )
- {
- messages.append( "\n- World has read access, but group does not."
);
- warn = true;
- }
- // end read-access checks.
-
- // write-access checks.
- if ( ( mode & U_W ) == 0 && ( mode & G_W ) == G_W )
- {
- messages.append( "\n- Group has write access, but user does not."
);
- warn = true;
- }
-
- if ( ( mode & U_W ) == 0 && ( mode & W_W ) == W_W )
- {
- messages.append( "\n- World has write access, but user does not."
);
- warn = true;
- }
-
- if ( ( mode & G_W ) == 0 && ( mode & W_W ) == W_W )
- {
- messages.append( "\n- World has write access, but group does not."
);
- warn = true;
- }
- // end write-access checks.
-
- // execute-/list-access checks.
- if ( ( mode & U_X ) == 0 && ( mode & G_X ) == G_X )
- {
- messages.append( "\n- Group has execute/list access, but user does
not." );
- warn = true;
- }
-
- if ( ( mode & U_X ) == 0 && ( mode & W_X ) == W_X )
- {
- messages.append( "\n- World has execute/list access, but user does
not." );
- warn = true;
- }
-
- if ( ( mode & G_X ) == 0 && ( mode & W_X ) == W_X )
- {
- messages.append( "\n- World has execute/list access, but group
does not." );
- warn = true;
- }
- // end execute-/list-access checks.
-
- if ( warn )
- {
- logger.warn( messages.toString() );
- }
-
- return !warn;
- }
-
}
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/AllTests.java
URL:
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/AllTests.java?view=diff&rev=524155&r1=524154&r2=524155
==============================================================================
---
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/AllTests.java
(original)
+++
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/AllTests.java
Fri Mar 30 09:24:12 2007
@@ -22,7 +22,6 @@
import org.apache.maven.plugin.assembly.utils.ProjectUtilsTest;
import
org.apache.maven.plugin.assembly.utils.PropertiesInterpolationValueSourceTest;
import org.apache.maven.plugin.assembly.utils.PropertyUtilsTest;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtilsTest;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -56,7 +55,6 @@
suite.addTestSuite( PropertyUtilsTest.class );
suite.addTestSuite( AssemblyFormatUtilsTest.class );
suite.addTestSuite( DefaultAssemblyReaderTest.class );
- suite.addTestSuite( TypeConversionUtilsTest.class );
//$JUnit-END$
return suite;
}
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java?view=diff&rev=524155&r1=524154&r2=524155
==============================================================================
---
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
(original)
+++
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
Fri Mar 30 09:24:12 2007
@@ -38,7 +38,7 @@
ds.setOutputFileNameMapping( "artifact" );
ds.setUnpack( false );
ds.setScope( Artifact.SCOPE_COMPILE );
- ds.setFileMode( Integer.toString( 10, 8 ) );
+ ds.setFileMode( Integer.toString( 8, 8 ) );
Assembly assembly = new Assembly();
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java?view=diff&rev=524155&r1=524154&r2=524155
==============================================================================
---
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
(original)
+++
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
Fri Mar 30 09:24:12 2007
@@ -8,12 +8,10 @@
import org.apache.maven.plugin.assembly.model.FileItem;
import org.apache.maven.plugin.assembly.testutils.MockManager;
import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.easymock.MockControl;
import java.io.File;
@@ -91,7 +89,7 @@
fi.setLineEnding( "keep" );
fi.setFileMode( "777" );
- macArchiver.expectAddFile( file, "file.txt",
TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG,
"test" ) ) );
+ macArchiver.expectAddFile( file, "file.txt", Integer.decode( "777"
).intValue() );
assembly.addFile( fi );
@@ -136,7 +134,7 @@
fi.setLineEnding( "keep" );
fi.setFileMode( "777" );
- macArchiver.expectAddFile( file, "file.txt",
TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG,
"test" ) ) );
+ macArchiver.expectAddFile( file, "file.txt", Integer.decode( "777"
).intValue() );
assembly.addFile( fi );
@@ -199,9 +197,9 @@
configFileItem.setLineEnding( "keep" );
configFileItem.setFileMode( "777" );
- macArchiver.expectAddFile( readmeFile, "README.txt",
TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG,
"test" ) ) );
- macArchiver.expectAddFile( licenseFile, "LICENSE.txt",
TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG,
"test" ) ) );
- macArchiver.expectAddFile( configFile, "config/config.txt",
TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG,
"test" ) ) );
+ macArchiver.expectAddFile( readmeFile, "README.txt", Integer.decode(
"777" ).intValue() );
+ macArchiver.expectAddFile( licenseFile, "LICENSE.txt", Integer.decode(
"777" ).intValue() );
+ macArchiver.expectAddFile( configFile, "config/config.txt",
Integer.decode( "777" ).intValue() );
assembly.addFile( readmeFileItem );
assembly.addFile( licenseFileItem );
@@ -270,9 +268,9 @@
configFileItem.setLineEnding( "keep" );
configFileItem.setFileMode( "777" );
- macArchiver.expectAddFile( readmeFile, "README_renamed.txt",
TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG,
"test" ) ) );
- macArchiver.expectAddFile( licenseFile, "LICENSE_renamed.txt",
TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG,
"test" ) ) );
- macArchiver.expectAddFile( configFile, "config/config_renamed.txt",
TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG,
"test" ) ) );
+ macArchiver.expectAddFile( readmeFile, "README_renamed.txt",
Integer.decode( "777" ).intValue() );
+ macArchiver.expectAddFile( licenseFile, "LICENSE_renamed.txt",
Integer.decode( "777" ).intValue() );
+ macArchiver.expectAddFile( configFile, "config/config_renamed.txt",
Integer.decode( "777" ).intValue() );
assembly.addFile( readmeFileItem );
assembly.addFile( licenseFileItem );
@@ -339,9 +337,9 @@
configFileItem.setLineEnding( "keep" );
configFileItem.setFileMode( "777" );
- macArchiver.expectAddFile( readmeFile, "README_renamed.txt",
TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG,
"test" ) ) );
- macArchiver.expectAddFile( licenseFile, "LICENSE_renamed.txt",
TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG,
"test" ) ) );
- macArchiver.expectAddFile( configFile, "config/config_renamed.txt",
TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG,
"test" ) ) );
+ macArchiver.expectAddFile( readmeFile, "README_renamed.txt",
Integer.decode( "777" ).intValue() );
+ macArchiver.expectAddFile( licenseFile, "LICENSE_renamed.txt",
Integer.decode( "777" ).intValue() );
+ macArchiver.expectAddFile( configFile, "config/config_renamed.txt",
Integer.decode( "777" ).intValue() );
assembly.addFile( readmeFileItem );
assembly.addFile( licenseFileItem );
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?view=diff&rev=524155&r1=524154&r2=524155
==============================================================================
---
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
(original)
+++
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
Fri Mar 30 09:24:12 2007
@@ -17,7 +17,6 @@
import org.apache.maven.plugin.assembly.model.ModuleSources;
import org.apache.maven.plugin.assembly.testutils.MockManager;
import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.codehaus.plexus.logging.Logger;
@@ -247,7 +246,7 @@
macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
- int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger(
Logger.LEVEL_DEBUG, "test" ) );
+ int mode = Integer.decode( "777" ).intValue();
macTask.expectAddFile( "out/artifact", mode );
@@ -326,7 +325,7 @@
macTask.expectGetFinalName( "final-name" );
macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
- macTask.expectAddFile( "out/artifact", TypeConversionUtils.modeToInt(
"777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macTask.expectAddFile( "out/artifact", Integer.decode( "777"
).intValue() );
ModuleBinaries binaries = new ModuleBinaries();
@@ -403,7 +402,7 @@
macTask.expectGetFinalName( "final-name" );
macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
- macTask.expectAddFile( "out/artifact", TypeConversionUtils.modeToInt(
"777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macTask.expectAddFile( "out/artifact", Integer.decode( "777"
).intValue() );
ModuleBinaries binaries = new ModuleBinaries();
@@ -439,7 +438,7 @@
macTask.expectGetFinalName( "final-name" );
macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
- macTask.expectAddFile( "out/artifact", TypeConversionUtils.modeToInt(
"777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macTask.expectAddFile( "out/artifact", Integer.decode( "777"
).intValue() );
ModuleBinaries binaries = new ModuleBinaries();
@@ -469,7 +468,7 @@
macDepArtifact.expectGetFile( artifactFile );
- macTask.expectAddFile( artifactFile, "out/dep",
TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG,
"test" ) ) );
+ macTask.expectAddFile( artifactFile, "out/dep", Integer.decode( "777"
).intValue() );
MavenProject depProject = createProject( "group", "dep", "version",
null );
@@ -506,7 +505,7 @@
macTask.expectGetFinalName( "final-name" );
macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
- macTask.expectAddFile( "out/artifact", TypeConversionUtils.modeToInt(
"777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macTask.expectAddFile( "out/artifact", Integer.decode( "777"
).intValue() );
ModuleBinaries binaries = new ModuleBinaries();
@@ -530,7 +529,7 @@
macDepArtifact.expectGetFile( artifactFile );
- macTask.expectAddFile( artifactFile, "out/dep",
TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG,
"test" ) ) );
+ macTask.expectAddFile( artifactFile, "out/dep", Integer.decode( "777"
).intValue() );
MavenProject depProject = createProject( "group", "dep", "version",
null );
@@ -639,7 +638,7 @@
macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
- macTask.expectAddFile( "out/artifact", TypeConversionUtils.modeToInt(
"777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macTask.expectAddFile( "out/artifact", Integer.decode( "777"
).intValue() );
ModuleBinaries binaries = new ModuleBinaries();
binaries.setOutputDirectory( "out" );
@@ -699,7 +698,7 @@
macTask.expectGetArchiveBaseDirectory();
- int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger(
Logger.LEVEL_DEBUG, "test" ) );
+ int mode = Integer.decode( "777" ).intValue();
int[] modes = { -1, -1, mode, mode };
macTask.expectAdditionOfSingleFileSet( project, project.getBasedir(),
"final-name", false, modes, 1, true,
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java?view=diff&rev=524155&r1=524154&r2=524155
==============================================================================
---
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
(original)
+++
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
Fri Mar 30 09:24:12 2007
@@ -10,14 +10,12 @@
import org.apache.maven.plugin.assembly.model.Repository;
import org.apache.maven.plugin.assembly.testutils.MockManager;
import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.repository.RepositoryAssembler;
import org.apache.maven.shared.repository.RepositoryAssemblyException;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.codehaus.plexus.util.FileUtils;
import org.easymock.MockControl;
@@ -91,7 +89,7 @@
repo.setDirectoryMode( "777" );
repo.setFileMode( "777" );
- int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger(
Logger.LEVEL_DEBUG, "test" ) );
+ int mode = Integer.decode( "777" ).intValue();
File outDir = new File( tempRoot, "out" );
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java?view=diff&rev=524155&r1=524154&r2=524155
==============================================================================
---
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
(original)
+++
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
Fri Mar 30 09:24:12 2007
@@ -5,10 +5,7 @@
import
org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddArtifactTask;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.testutils.MockManager;
-import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
import java.io.IOException;
import java.util.Arrays;
@@ -52,7 +49,7 @@
private AddArtifactTask createTask( Artifact artifact )
{
- AddArtifactTask task = new AddArtifactTask( artifact, new
ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ AddArtifactTask task = new AddArtifactTask( artifact );
task.setFileNameMapping( "artifact" );
@@ -90,8 +87,8 @@
public void testShouldAddArchiveFileWithUnpackAndModes()
throws ArchiveCreationException, AssemblyFormattingException
{
- int directoryMode = TypeConversionUtils.modeToInt( "777", new
ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
- int fileMode = TypeConversionUtils.modeToInt( "777", new
ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ int directoryMode = Integer.decode( "777" ).intValue();
+ int fileMode = Integer.decode( "777" ).intValue();
mac.expectModeChange( -1, -1, directoryMode, fileMode, 2 );
mac.expectIsSnapshot( false );
Modified:
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java?view=diff&rev=524155&r1=524154&r2=524155
==============================================================================
---
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
(original)
+++
maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
Fri Mar 30 09:24:12 2007
@@ -78,8 +78,8 @@
ds.setUnpack( unpack );
ds.setScope( Artifact.SCOPE_COMPILE );
- ds.setDirectoryMode( Integer.toString( 10, 8 ) );
- ds.setFileMode( Integer.toString( 10, 8 ) );
+ ds.setDirectoryMode( Integer.toString( 8, 8 ) );
+ ds.setFileMode( Integer.toString( 8, 8 ) );
MockAndControlForAddDependencySetsTask macTask = new
MockAndControlForAddDependencySetsTask( mockManager );
