Author: jdcasey
Date: Fri Mar 16 22:57:39 2007
New Revision: 519245
URL: http://svn.apache.org/viewvc?view=rev&rev=519245
Log:
[MASSEMBLY-173] Fixing file and directory modes, using
Integer.decode(..).intValue() instead of Integer.parseInt(..).
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.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/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java?view=diff&rev=519245&r1=519244&r2=519245
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
Fri Mar 16 22:57:39 2007
@@ -80,7 +80,7 @@
try
{
- archiver.addFile( source, target, Integer.parseInt(
fileItem.getFileMode(), 8 ) );
+ archiver.addFile( source, target, Integer.decode(
fileItem.getFileMode() ).intValue() );
}
catch ( ArchiverException e )
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java?view=diff&rev=519245&r1=519244&r2=519245
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
Fri Mar 16 22:57:39 2007
@@ -1,6 +1,5 @@
package org.apache.maven.plugin.assembly.archive.phase;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
import
org.apache.maven.plugin.assembly.archive.phase.wrappers.RepoBuilderConfigSourceWrapper;
@@ -8,10 +7,8 @@
import org.apache.maven.plugin.assembly.archive.task.AddDirectoryTask;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.GroupVersionAlignment;
import org.apache.maven.plugin.assembly.model.Repository;
import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.repository.RepositoryAssembler;
import org.apache.maven.shared.repository.RepositoryAssemblyException;
import org.apache.maven.shared.repository.RepositoryBuilderConfigSource;
@@ -20,7 +17,6 @@
import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.io.File;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -82,8 +78,8 @@
AddDirectoryTask task = new AddDirectoryTask( repositoryDirectory
);
- task.setDirectoryMode( Integer.parseInt(
repository.getDirectoryMode(), 8 ) );
- task.setFileMode( Integer.parseInt( repository.getFileMode(), 8 )
);
+ task.setDirectoryMode( Integer.decode(
repository.getDirectoryMode() ).intValue() );
+ task.setFileMode( Integer.decode( repository.getFileMode()
).intValue() );
task.setUseDefaultExcludes( repository.isUseDefaultExcludes() );
task.setOutputDirectory( outputDirectory );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java?view=diff&rev=519245&r1=519244&r2=519245
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
Fri Mar 16 22:57:39 2007
@@ -114,12 +114,12 @@
public void setDirectoryMode( String rawDirectoryMode )
{
- this.directoryMode = Integer.parseInt( rawDirectoryMode, 8 );
+ this.directoryMode = Integer.decode( rawDirectoryMode ).intValue();
}
public void setFileMode( String rawFileMode )
{
- this.fileMode = Integer.parseInt( rawFileMode, 8 );
+ this.fileMode = Integer.decode( rawFileMode ).intValue();
}
public void setExcludes( List excludes )
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java?view=diff&rev=519245&r1=519244&r2=519245
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
Fri Mar 16 22:57:39 2007
@@ -192,7 +192,7 @@
try
{
- archiver.addFile( source, target, Integer.parseInt(
dependencySet.getFileMode(), 8 ) );
+ archiver.addFile( source, target, Integer.decode(
dependencySet.getFileMode() ).intValue() );
}
catch ( ArchiverException e )
{
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?view=diff&rev=519245&r1=519244&r2=519245
==============================================================================
---
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
Fri Mar 16 22:57:39 2007
@@ -117,8 +117,8 @@
AddDirectoryTask task = new AddDirectoryTask( fileSetDir );
- task.setDirectoryMode( Integer.parseInt(
fileSet.getDirectoryMode(), 8 ) );
- task.setFileMode( Integer.parseInt( fileSet.getFileMode(), 8 ) );
+ 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/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java?view=diff&rev=519245&r1=519244&r2=519245
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
Fri Mar 16 22:57:39 2007
@@ -56,7 +56,7 @@
macTask.expectCSGetRepositories( null, null );
macTask.expectResolveDependencies( Collections.singleton(
macTask.artifact ) );
- macTask.expectAddFile( "out/artifact", 8 );
+ macTask.expectAddFile( "out/artifact", 10 );
project.setArtifacts( Collections.singleton( macTask.artifact ) );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java?view=diff&rev=519245&r1=519244&r2=519245
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
Fri Mar 16 22:57:39 2007
@@ -89,7 +89,7 @@
fi.setLineEnding( "keep" );
fi.setFileMode( "777" );
- macArchiver.expectAddFile( file, "file.txt", Integer.parseInt( "777",
8 ) );
+ macArchiver.expectAddFile( file, "file.txt", Integer.decode( "777"
).intValue() );
assembly.addFile( fi );
@@ -134,7 +134,7 @@
fi.setLineEnding( "keep" );
fi.setFileMode( "777" );
- macArchiver.expectAddFile( file, "file.txt", Integer.parseInt( "777",
8 ) );
+ macArchiver.expectAddFile( file, "file.txt", Integer.decode( "777"
).intValue() );
assembly.addFile( fi );
@@ -197,9 +197,9 @@
configFileItem.setLineEnding( "keep" );
configFileItem.setFileMode( "777" );
- macArchiver.expectAddFile( readmeFile, "README.txt", Integer.parseInt(
"777", 8 ) );
- macArchiver.expectAddFile( licenseFile, "LICENSE.txt",
Integer.parseInt( "777", 8 ) );
- macArchiver.expectAddFile( configFile, "config/config.txt",
Integer.parseInt( "777", 8 ) );
+ 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 );
@@ -268,9 +268,9 @@
configFileItem.setLineEnding( "keep" );
configFileItem.setFileMode( "777" );
- macArchiver.expectAddFile( readmeFile, "README_renamed.txt",
Integer.parseInt( "777", 8 ) );
- macArchiver.expectAddFile( licenseFile, "LICENSE_renamed.txt",
Integer.parseInt( "777", 8 ) );
- macArchiver.expectAddFile( configFile, "config/config_renamed.txt",
Integer.parseInt( "777", 8 ) );
+ 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 );
@@ -337,9 +337,9 @@
configFileItem.setLineEnding( "keep" );
configFileItem.setFileMode( "777" );
- macArchiver.expectAddFile( readmeFile, "README_renamed.txt",
Integer.parseInt( "777", 8 ) );
- macArchiver.expectAddFile( licenseFile, "LICENSE_renamed.txt",
Integer.parseInt( "777", 8 ) );
- macArchiver.expectAddFile( configFile, "config/config_renamed.txt",
Integer.parseInt( "777", 8 ) );
+ 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/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?view=diff&rev=519245&r1=519244&r2=519245
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
Fri Mar 16 22:57:39 2007
@@ -246,7 +246,7 @@
macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
- int mode = Integer.parseInt( "777", 8 );
+ int mode = Integer.decode( "777" ).intValue();
macTask.expectAddFile( "out/artifact", mode );
@@ -325,7 +325,7 @@
macTask.expectGetFinalName( "final-name" );
macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
- macTask.expectAddFile( "out/artifact", Integer.parseInt( "777", 8 ) );
+ macTask.expectAddFile( "out/artifact", Integer.decode( "777"
).intValue() );
ModuleBinaries binaries = new ModuleBinaries();
@@ -402,7 +402,7 @@
macTask.expectGetFinalName( "final-name" );
macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
- macTask.expectAddFile( "out/artifact", Integer.parseInt( "777", 8 ) );
+ macTask.expectAddFile( "out/artifact", Integer.decode( "777"
).intValue() );
ModuleBinaries binaries = new ModuleBinaries();
@@ -438,7 +438,7 @@
macTask.expectGetFinalName( "final-name" );
macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
- macTask.expectAddFile( "out/artifact", Integer.parseInt( "777", 8 ) );
+ macTask.expectAddFile( "out/artifact", Integer.decode( "777"
).intValue() );
ModuleBinaries binaries = new ModuleBinaries();
@@ -468,7 +468,7 @@
macDepArtifact.expectGetFile( artifactFile );
- macTask.expectAddFile( artifactFile, "out/dep", Integer.parseInt(
"777", 8 ) );
+ macTask.expectAddFile( artifactFile, "out/dep", Integer.decode( "777"
).intValue() );
MavenProject depProject = createProject( "group", "dep", "version",
null );
@@ -505,7 +505,7 @@
macTask.expectGetFinalName( "final-name" );
macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
- macTask.expectAddFile( "out/artifact", Integer.parseInt( "777", 8 ) );
+ macTask.expectAddFile( "out/artifact", Integer.decode( "777"
).intValue() );
ModuleBinaries binaries = new ModuleBinaries();
@@ -529,7 +529,7 @@
macDepArtifact.expectGetFile( artifactFile );
- macTask.expectAddFile( artifactFile, "out/dep", Integer.parseInt(
"777", 8 ) );
+ macTask.expectAddFile( artifactFile, "out/dep", Integer.decode( "777"
).intValue() );
MavenProject depProject = createProject( "group", "dep", "version",
null );
@@ -638,7 +638,7 @@
macTask.expectIsSnapshot( false );
macTask.expectGetArtifactHandler();
- macTask.expectAddFile( "out/artifact", Integer.parseInt( "777", 8 ) );
+ macTask.expectAddFile( "out/artifact", Integer.decode( "777"
).intValue() );
ModuleBinaries binaries = new ModuleBinaries();
binaries.setOutputDirectory( "out" );
@@ -698,7 +698,7 @@
macTask.expectGetArchiveBaseDirectory();
- int mode = Integer.parseInt( "777", 8 );
+ 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/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java?view=diff&rev=519245&r1=519244&r2=519245
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
Fri Mar 16 22:57:39 2007
@@ -89,7 +89,7 @@
repo.setDirectoryMode( "777" );
repo.setFileMode( "777" );
- int mode = Integer.parseInt( "777", 8 );
+ int mode = Integer.decode( "777" ).intValue();
File outDir = new File( tempRoot, "out" );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java?view=diff&rev=519245&r1=519244&r2=519245
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
Fri Mar 16 22:57:39 2007
@@ -87,8 +87,8 @@
public void testShouldAddArchiveFileWithUnpackAndModes()
throws ArchiveCreationException, AssemblyFormattingException
{
- int directoryMode = Integer.parseInt( "777", 8 );
- int fileMode = Integer.parseInt( "777", 8 );
+ 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/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java?view=diff&rev=519245&r1=519244&r2=519245
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
Fri Mar 16 22:57:39 2007
@@ -94,11 +94,11 @@
if ( unpack )
{
macTask.expectAddArchivedFileSet( outputLocation + "/artifact/",
null, null );
- macTask.expectModeChange( -1, -1, 8, 8, 2 );
+ macTask.expectModeChange( -1, -1, 10, 10, 2 );
}
else
{
- macTask.expectAddFile( outputLocation + "/artifact", 8 );
+ macTask.expectAddFile( outputLocation + "/artifact", 10 );
}
macTask.expectCSGetFinalName( "final-name" );
