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 2009/05/27 02:51:05 UTC
svn commit: r778938 - in
/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4: ./
src/it/projects/file-sets/excludes-using-regex/
src/it/projects/file-sets/excludes-using-regex/child/
src/it/projects/file-sets/excludes-using-regex/child/src/ src/it...
Author: jdcasey
Date: Wed May 27 00:51:04 2009
New Revision: 778938
URL: http://svn.apache.org/viewvc?rev=778938&view=rev
Log:
Fix attribute/mode support for adding archived filesets to other archivers, when the set being added is a tarball or a zip file. This needs some tests still.
Added:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/pom.xml (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/src/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/src/main/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/src/main/resources/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/goals.txt (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/pom.xml (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/assemble/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/main/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/main/java/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/test/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/verify.bsh (with props)
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/pom.xml?rev=778938&r1=778937&r2=778938&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/pom.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/pom.xml Wed May 27 00:51:04 2009
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>1.0-alpha-11</version>
+ <version>1.0-alpha-12-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
- <version>1.0-alpha-3</version>
+ <version>1.0-alpha-4-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.8</version>
+ <version>1.5.10</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/pom.xml?rev=778938&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/pom.xml (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/pom.xml Wed May 27 00:51:04 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.test</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ </parent>
+ <name>Child</name>
+ <groupId>org.test</groupId>
+ <artifactId>child</artifactId>
+ <version>1.0</version>
+</project>
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/goals.txt?rev=778938&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/goals.txt (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/goals.txt Wed May 27 00:51:04 2009
@@ -0,0 +1 @@
+clean package
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/pom.xml?rev=778938&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/pom.xml (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/pom.xml Wed May 27 00:51:04 2009
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.test</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <name>Parent</name>
+ <modules>
+ <module>child</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptors>
+ <descriptor>src/assemble/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml?rev=778938&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml Wed May 27 00:51:04 2009
@@ -0,0 +1,17 @@
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>**/*.log</exclude>
+ <exclude>%regex[(?!.*src/).*target.*]</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/verify.bsh?rev=778938&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/verify.bsh (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/verify.bsh Wed May 27 00:51:04 2009
@@ -0,0 +1,39 @@
+import java.io.*;
+import java.net.*;
+import java.util.jar.*;
+
+boolean result = true;
+
+try
+{
+ File f = new File( basedir, "target/parent-1.0-src.jar" );
+ if ( !f.exists() )
+ {
+ System.out.println( "jar is missing" );
+ return false;
+ }
+
+ JarFile jf = new JarFile( f );
+ JarEntry je = jf.getEntry( "parent/src/main/java/org/test/target/file.properties" );
+
+ if ( je == null )
+ {
+ System.out.println( "sources for org.test.target package in parent project are missing from jar" );
+ return false;
+ }
+
+ je = jf.getEntry( "parent/child/src/main/resources/target/file.txt" );
+
+ if ( je == null )
+ {
+ System.out.println( "target/file.txt in child resources is missing from the jar." );
+ return false;
+ }
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=778938&r1=778937&r2=778938&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java Wed May 27 00:51:04 2009
@@ -802,13 +802,29 @@
int permissions )
throws ArchiverException
{
- delegate.addResource( resource, destFileName, permissions );
+ inPublicApi.set( Boolean.TRUE );
+ try
+ {
+ delegate.addResource( resource, destFileName, permissions );
+ }
+ finally
+ {
+ inPublicApi.set( null );
+ }
}
public void addResources( PlexusIoResourceCollection resources )
throws ArchiverException
{
- delegate.addResources( resources );
+ inPublicApi.set( Boolean.TRUE );
+ try
+ {
+ delegate.addResources( resources );
+ }
+ finally
+ {
+ inPublicApi.set( null );
+ }
}
public ResourceIterator getResources()
@@ -824,7 +840,61 @@
public void setDuplicateBehavior( String duplicate )
{
- delegate.setDuplicateBehavior( duplicate );
+ inPublicApi.set( Boolean.TRUE );
+ try
+ {
+ delegate.setDuplicateBehavior( duplicate );
+ }
+ finally
+ {
+ inPublicApi.set( null );
+ }
+ }
+
+ public int getDirectoryMode()
+ {
+ return delegate.getDirectoryMode();
+ }
+
+ public int getFileMode()
+ {
+ return delegate.getFileMode();
+ }
+
+ public int getOverrideDirectoryMode()
+ {
+ return delegate.getOverrideDirectoryMode();
+ }
+
+ public int getOverrideFileMode()
+ {
+ return delegate.getOverrideFileMode();
+ }
+
+ public void setDirectoryMode( int mode )
+ {
+ inPublicApi.set( Boolean.TRUE );
+ try
+ {
+ delegate.setDirectoryMode( mode );
+ }
+ finally
+ {
+ inPublicApi.set( null );
+ }
+ }
+
+ public void setFileMode( int mode )
+ {
+ inPublicApi.set( Boolean.TRUE );
+ try
+ {
+ delegate.setFileMode( mode );
+ }
+ finally
+ {
+ inPublicApi.set( null );
+ }
}
}
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java?rev=778938&r1=778937&r2=778938&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java Wed May 27 00:51:04 2009
@@ -121,21 +121,26 @@
}
String[] excludesArray = TypeConversionUtils.toStringArray( excludes );
- int oldDirMode = archiver.getDefaultDirectoryMode();
- int oldFileMode = archiver.getDefaultFileMode();
+ int oldDirMode = archiver.getOverrideDirectoryMode();
+ int oldFileMode = archiver.getOverrideFileMode();
logger.debug( "Unpacking artifact: " + artifact.getId() + " to assembly location: " + outputLocation + "." );
+ boolean fileModeSet = false;
+ boolean dirModeSet = false;
+
try
{
if ( fileMode != -1 )
{
- archiver.setDefaultFileMode( fileMode );
+ archiver.setFileMode( fileMode );
+ fileModeSet = true;
}
if ( directoryMode != -1 )
{
- archiver.setDefaultDirectoryMode( directoryMode );
+ archiver.setDirectoryMode( directoryMode );
+ dirModeSet = true;
}
File artifactFile = artifact.getFile();
@@ -163,8 +168,15 @@
}
finally
{
- archiver.setDefaultDirectoryMode( oldDirMode );
- archiver.setDefaultFileMode( oldFileMode );
+ if ( dirModeSet )
+ {
+ archiver.setDirectoryMode( oldDirMode );
+ }
+
+ if ( fileModeSet )
+ {
+ archiver.setFileMode( oldFileMode );
+ }
}
}
else
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java?rev=778938&r1=778937&r2=778938&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java Wed May 27 00:51:04 2009
@@ -68,19 +68,24 @@
+ outputDirectory + ". All paths must be within the archive root directory." );
}
- int oldDirMode = archiver.getDefaultDirectoryMode();
- int oldFileMode = archiver.getDefaultFileMode();
+ int oldDirMode = archiver.getOverrideDirectoryMode();
+ int oldFileMode = archiver.getOverrideFileMode();
+ boolean fileModeSet = false;
+ boolean dirModeSet = false;
+
try
{
if ( directoryMode != -1 )
{
- archiver.setDefaultDirectoryMode( directoryMode );
+ archiver.setDirectoryMode( directoryMode );
+ dirModeSet = true;
}
if ( fileMode != -1 )
{
- archiver.setDefaultFileMode( fileMode );
+ archiver.setFileMode( fileMode );
+ fileModeSet = true;
}
if ( directory.exists() )
@@ -123,8 +128,15 @@
}
finally
{
- archiver.setDefaultDirectoryMode( oldDirMode );
- archiver.setDefaultFileMode( oldFileMode );
+ if ( dirModeSet )
+ {
+ archiver.setDirectoryMode( oldDirMode );
+ }
+
+ if ( fileModeSet )
+ {
+ archiver.setFileMode( oldFileMode );
+ }
}
}
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java?rev=778938&r1=778937&r2=778938&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java Wed May 27 00:51:04 2009
@@ -118,8 +118,8 @@
if ( logger.isDebugEnabled() )
{
logger.debug( "FileSet[" + destDirectory + "]" + " dir perms: "
- + Integer.toString( archiver.getDefaultDirectoryMode(), 8 ) + " file perms: "
- + Integer.toString( archiver.getDefaultFileMode(), 8 )
+ + Integer.toString( archiver.getOverrideDirectoryMode(), 8 ) + " file perms: "
+ + Integer.toString( archiver.getOverrideFileMode(), 8 )
+ ( fileSet.getLineEnding() == null ? "" : " lineEndings: " + fileSet.getLineEnding() ) );
}
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java?rev=778938&r1=778937&r2=778938&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java Wed May 27 00:51:04 2009
@@ -61,7 +61,7 @@
public static int modeToInt( String mode, Logger logger )
throws AssemblyFormattingException
{
- if ( mode == null )
+ if ( mode == null || mode.trim().length() < 1 )
{
return -1;
}
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java?rev=778938&r1=778937&r2=778938&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java Wed May 27 00:51:04 2009
@@ -703,6 +703,9 @@
protected void execute()
throws ArchiverException, IOException
{
+ defaultDirMode = getOverrideDirectoryMode();
+ defaultFileMode = getOverrideFileMode();
+
archiveCreated = true;
super.createArchive();
}
@@ -719,18 +722,6 @@
super.setCompression( mode );
}
- public void setDefaultDirectoryMode( int mode )
- {
- defaultDirMode = mode;
- super.setDefaultDirectoryMode( mode );
- }
-
- public void setDefaultFileMode( int mode )
- {
- defaultFileMode = mode;
- super.setDefaultFileMode( mode );
- }
-
public void setLongfile( TarLongFileMode mode )
{
longFileMode = mode;
@@ -930,6 +921,34 @@
{
}
+ public int getDirectoryMode()
+ {
+ return 0;
+ }
+
+ public int getFileMode()
+ {
+ return 0;
+ }
+
+ public int getOverrideDirectoryMode()
+ {
+ return 0;
+ }
+
+ public int getOverrideFileMode()
+ {
+ return 0;
+ }
+
+ public void setDirectoryMode( int mode )
+ {
+ }
+
+ public void setFileMode( int mode )
+ {
+ }
+
}
}
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java?rev=778938&r1=778937&r2=778938&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java Wed May 27 00:51:04 2009
@@ -294,20 +294,20 @@
void expectModeChange( int defaultDirMode, int defaultFileMode, int dirMode, int fileMode, boolean expectTwoSets )
{
- archiver.getDefaultDirectoryMode();
+ archiver.getOverrideDirectoryMode();
control.setReturnValue( defaultDirMode );
- archiver.getDefaultFileMode();
+ archiver.getOverrideFileMode();
control.setReturnValue( defaultFileMode );
if ( expectTwoSets )
{
- archiver.setDefaultDirectoryMode( dirMode );
- archiver.setDefaultFileMode( fileMode );
+ archiver.setDirectoryMode( dirMode );
+ archiver.setFileMode( fileMode );
}
- archiver.setDefaultDirectoryMode( defaultDirMode );
- archiver.setDefaultFileMode( defaultFileMode );
+ archiver.setDirectoryMode( defaultDirMode );
+ archiver.setFileMode( defaultFileMode );
}
// public void expectAddFile( File file, String outputLocation, int fileMode )
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java?rev=778938&r1=778937&r2=778938&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java Wed May 27 00:51:04 2009
@@ -172,20 +172,34 @@
private void configureModeExpectations( int defaultDirMode, int defaultFileMode, int dirMode, int fileMode,
boolean expectTwoSets )
{
- archiver.getDefaultDirectoryMode();
+ archiver.getOverrideDirectoryMode();
archiverControl.setReturnValue( defaultDirMode );
- archiver.getDefaultFileMode();
+ archiver.getOverrideFileMode();
archiverControl.setReturnValue( defaultFileMode );
if ( expectTwoSets )
{
- archiver.setDefaultDirectoryMode( dirMode );
- archiver.setDefaultFileMode( fileMode );
+ if ( dirMode > -1 )
+ {
+ archiver.setDirectoryMode( dirMode );
+ }
+
+ if ( fileMode > -1 )
+ {
+ archiver.setFileMode( fileMode );
+ }
}
- archiver.setDefaultDirectoryMode( defaultDirMode );
- archiver.setDefaultFileMode( defaultFileMode );
+ if ( dirMode > -1 )
+ {
+ archiver.setDirectoryMode( defaultDirMode );
+ }
+
+ if ( fileMode > -1 )
+ {
+ archiver.setFileMode( defaultFileMode );
+ }
}
}
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java?rev=778938&r1=778937&r2=778938&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java Wed May 27 00:51:04 2009
@@ -207,9 +207,9 @@
macTask.expectGetProject( null );
- macTask.archiver.getDefaultDirectoryMode();
+ macTask.archiver.getOverrideDirectoryMode();
macTask.archiverCtl.setReturnValue( -1 );
- macTask.archiver.getDefaultFileMode();
+ macTask.archiver.getOverrideFileMode();
macTask.archiverCtl.setReturnValue( -1 );
MavenProject project = new MavenProject( new Model() );
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java?rev=778938&r1=778937&r2=778938&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java Wed May 27 00:51:04 2009
@@ -110,10 +110,10 @@
public void expectModeChange( int originalDirMode, int originalFileMode, int dirMode, int fileMode,
int numberOfChanges )
{
- archiver.getDefaultDirectoryMode();
+ archiver.getOverrideDirectoryMode();
archiverCtl.setReturnValue( originalDirMode );
- archiver.getDefaultFileMode();
+ archiver.getOverrideFileMode();
archiverCtl.setReturnValue( originalFileMode );
// one of the changes will occur below, when we restore the original mode.
@@ -121,13 +121,27 @@
{
for( int i = 1; i< numberOfChanges; i++ )
{
- archiver.setDefaultDirectoryMode( dirMode );
- archiver.setDefaultFileMode( fileMode );
+ if ( dirMode > -1 )
+ {
+ archiver.setDirectoryMode( dirMode );
+ }
+
+ if ( fileMode > -1 )
+ {
+ archiver.setFileMode( fileMode );
+ }
}
}
- archiver.setDefaultDirectoryMode( originalDirMode );
- archiver.setDefaultFileMode( originalFileMode );
+ if ( dirMode > -1 )
+ {
+ archiver.setDirectoryMode( originalDirMode );
+ }
+
+ if ( fileMode > -1 )
+ {
+ archiver.setFileMode( originalFileMode );
+ }
}
public void expectAddFile( File file, String outputLocation, int fileMode )
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java?rev=778938&r1=778937&r2=778938&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java Wed May 27 00:51:04 2009
@@ -121,10 +121,10 @@
public void expectModeChange( int originalDirMode, int originalFileMode, int dirMode, int fileMode,
int numberOfChanges )
{
- archiver.getDefaultDirectoryMode();
+ archiver.getOverrideDirectoryMode();
archiverCtl.setReturnValue( originalDirMode );
- archiver.getDefaultFileMode();
+ archiver.getOverrideFileMode();
archiverCtl.setReturnValue( originalFileMode );
// one of the changes will occur below, when we restore the original mode.
@@ -132,13 +132,13 @@
{
for( int i = 1; i< numberOfChanges; i++ )
{
- archiver.setDefaultDirectoryMode( dirMode );
- archiver.setDefaultFileMode( fileMode );
+ archiver.setDirectoryMode( dirMode );
+ archiver.setFileMode( fileMode );
}
}
- archiver.setDefaultDirectoryMode( originalDirMode );
- archiver.setDefaultFileMode( originalFileMode );
+ archiver.setDirectoryMode( originalDirMode );
+ archiver.setFileMode( originalFileMode );
}
public void expectAddFile( File file, String outputLocation )
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java?rev=778938&r1=778937&r2=778938&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java Wed May 27 00:51:04 2009
@@ -54,15 +54,15 @@
configSourceCtl = MockControl.createControl( AssemblerConfigurationSource.class );
mockManager.add( configSourceCtl );
- configSource = ( AssemblerConfigurationSource ) configSourceCtl.getMock();
+ configSource = (AssemblerConfigurationSource) configSourceCtl.getMock();
archiverCtl = MockControl.createControl( Archiver.class );
mockManager.add( archiverCtl );
- archiver = ( Archiver ) archiverCtl.getMock();
+ archiver = (Archiver) archiverCtl.getMock();
archiveBaseDir = fileManager.createTempDir();
-
+
configSource.getMavenSession();
configSourceCtl.setReturnValue( null, MockControl.ZERO_OR_MORE );
}
@@ -81,23 +81,37 @@
public void expectModeChanges( int[] modes, int modeChangeCount )
{
- archiver.getDefaultDirectoryMode();
+ archiver.getOverrideDirectoryMode();
archiverCtl.setReturnValue( modes[0] );
- archiver.getDefaultFileMode();
+ archiver.getOverrideFileMode();
archiverCtl.setReturnValue( modes[1] );
if ( modeChangeCount > 1 )
{
for ( int i = 1; i < modeChangeCount; i++ )
{
- archiver.setDefaultDirectoryMode( modes[2] );
- archiver.setDefaultFileMode( modes[3] );
+ if ( modes[2] > -1 )
+ {
+ archiver.setDirectoryMode( modes[2] );
+ }
+
+ if ( modes[3] > -1 )
+ {
+ archiver.setFileMode( modes[3] );
+ }
}
}
- archiver.setDefaultDirectoryMode( modes[0] );
- archiver.setDefaultFileMode( modes[1] );
+ if ( modes[2] > -1 )
+ {
+ archiver.setDirectoryMode( modes[0] );
+ }
+
+ if ( modes[3] > -1 )
+ {
+ archiver.setFileMode( modes[1] );
+ }
}
public void expectAdditionOfSingleFileSet( MavenProject project, File basedir, String finalName,
@@ -116,10 +130,10 @@
// the logger sends a debug message with this info inside the addFileSet(..) method..
if ( isDebugEnabled )
{
- archiver.getDefaultDirectoryMode();
+ archiver.getOverrideDirectoryMode();
archiverCtl.setReturnValue( modes[0] );
- archiver.getDefaultFileMode();
+ archiver.getOverrideFileMode();
archiverCtl.setReturnValue( modes[1] );
}
@@ -161,7 +175,7 @@
configSource.getMavenSession();
configSourceCtl.setReturnValue( session, MockControl.ONE_OR_MORE );
}
-
+
public void expectGetFinalName( String finalName )
{
configSource.getFinalName();
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java?rev=778938&r1=778937&r2=778938&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java Wed May 27 00:51:04 2009
@@ -573,6 +573,36 @@
public void setDuplicateBehavior( String duplicate )
{
}
+
+ public int getDirectoryMode()
+ {
+ throw new UnsupportedOperationException( "not supported" );
+ }
+
+ public int getFileMode()
+ {
+ throw new UnsupportedOperationException( "not supported" );
+ }
+
+ public int getOverrideDirectoryMode()
+ {
+ throw new UnsupportedOperationException( "not supported" );
+ }
+
+ public int getOverrideFileMode()
+ {
+ throw new UnsupportedOperationException( "not supported" );
+ }
+
+ public void setDirectoryMode( int mode )
+ {
+ throw new UnsupportedOperationException( "not supported" );
+ }
+
+ public void setFileMode( int mode )
+ {
+ throw new UnsupportedOperationException( "not supported" );
+ }
}
}