Author: jdcasey
Date: Fri Feb 1 17:11:22 2008
New Revision: 617732
URL: http://svn.apache.org/viewvc?rev=617732&view=rev
Log:
Fixing ITs, bumping plexus-archiver to 1.0-alpha-10 so I could fix a problem
exposed by the ITs that was in the chmod command in p-a, and removing default
file modes in the .mdo files, so files are only altered if the file mode is
provided (at least that's the theory, though I think p-a brute-forces this atm).
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
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/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/utils/TypeConversionUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml
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
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=617732&r1=617731&r2=617732&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Fri Feb 1 17:11:22 2008
@@ -298,12 +298,12 @@
<debug>true</debug>
<!-- Useful config for debugging one IT -->
- <!--
+ <!--
<pomIncludes>
-
<pomInclude>**/container-descriptors/**/pom.xml</pomInclude>
+
<pomInclude>**/dependency-sets/including*/pom.xml</pomInclude>
</pomIncludes>
<streamLogs>true</streamLogs>
- -->
+ -->
<!-- END single-IT debugging block. -->
<pomIncludes>
@@ -366,7 +366,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>1.0-alpha-9</version>
+ <version>1.0-alpha-10-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -398,7 +398,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
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=617732&r1=617731&r2=617732&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
Fri Feb 1 17:11:22 2008
@@ -26,10 +26,13 @@
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.FileSet;
import org.codehaus.plexus.archiver.FinalizerEnabled;
+import org.codehaus.plexus.archiver.ResourceIterator;
import org.codehaus.plexus.archiver.util.DefaultArchivedFileSet;
import org.codehaus.plexus.archiver.util.DefaultFileSet;
import org.codehaus.plexus.components.io.fileselectors.FileInfo;
import org.codehaus.plexus.components.io.fileselectors.FileSelector;
+import org.codehaus.plexus.components.io.resources.PlexusIoResource;
+import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
import org.codehaus.plexus.logging.Logger;
import java.io.File;
@@ -792,6 +795,26 @@
return inputFile.isFile();
}
+ }
+
+ public void addResource( PlexusIoResource resource,
+ String destFileName,
+ int permissions )
+ throws ArchiverException
+ {
+ delegate.addResource( resource, destFileName, permissions );
+ }
+
+ public void addResources( PlexusIoResourceCollection resources )
+ throws ArchiverException
+ {
+ delegate.addResources( resources );
+ }
+
+ public ResourceIterator getResources()
+ throws ArchiverException
+ {
+ return delegate.getResources();
}
}
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?rev=617732&r1=617731&r2=617732&view=diff
==============================================================================
---
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 Feb 1 17:11:22 2008
@@ -29,6 +29,7 @@
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.util.List;
@@ -40,6 +41,8 @@
implements ArchiverTask
{
+ public static final String[] DEFAULT_INCLUDES_ARRAY = { "**/*" };
+
private String directoryMode;
private String fileMode;
@@ -85,6 +88,10 @@
}
String[] includesArray = TypeConversionUtils.toStringArray(
includes );
+ if ( includesArray == null )
+ {
+ includesArray = DEFAULT_INCLUDES_ARRAY;
+ }
String[] excludesArray = TypeConversionUtils.toStringArray(
excludes );
int oldDirMode = archiver.getDefaultDirectoryMode();
@@ -117,6 +124,8 @@
else
{
logger.debug( "Unpacking artifact contents for: " +
artifact + " to: " + outputLocation );
+ logger.debug( "includes:\n" + StringUtils.join(
includesArray, "\n" ) + "\n" );
+ logger.debug( "excludes:\n" + (excludesArray == null ?
"none" : StringUtils.join( excludesArray, "\n" ) ) + "\n" );
archiver.addArchivedFileSet( artifactFile, outputLocation,
includesArray, excludesArray );
}
}
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?rev=617732&r1=617731&r2=617732&view=diff
==============================================================================
---
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 Feb 1 17:11:22 2008
@@ -290,7 +290,15 @@
try
{
- archiver.addFile( source, target, TypeConversionUtils.modeToInt(
dependencySet.getFileMode(), logger ) );
+ int mode = TypeConversionUtils.modeToInt(
dependencySet.getFileMode(), logger );
+ if ( mode > -1 )
+ {
+ archiver.addFile( source, target, mode );
+ }
+ else
+ {
+ archiver.addFile( source, target );
+ }
}
catch ( ArchiverException e )
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java?rev=617732&r1=617731&r2=617732&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
Fri Feb 1 17:11:22 2008
@@ -50,7 +50,7 @@
{
String[] result = null;
- if ( list != null && !list.isEmpty() )
+ if ( ( list != null ) && !list.isEmpty() )
{
result = (String[]) list.toArray( new String[0] );
}
@@ -61,6 +61,11 @@
public static int modeToInt( String mode, Logger logger )
throws AssemblyFormattingException
{
+ if ( mode == null )
+ {
+ return -1;
+ }
+
try
{
int value = Integer.parseInt( mode, 8 );
@@ -87,19 +92,19 @@
boolean warn = false;
// read-access checks.
- if ( ( mode & U_R ) == 0 && ( mode & G_R ) == G_R )
+ 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 )
+ 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 )
+ if ( ( ( mode & G_R ) == 0 ) && ( ( mode & W_R ) == W_R ) )
{
messages.append( "\n- World has read access, but group does not."
);
warn = true;
@@ -107,19 +112,19 @@
// end read-access checks.
// write-access checks.
- if ( ( mode & U_W ) == 0 && ( mode & G_W ) == G_W )
+ 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 )
+ 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 )
+ if ( ( ( mode & G_W ) == 0 ) && ( ( mode & W_W ) == W_W ) )
{
messages.append( "\n- World has write access, but group does not."
);
warn = true;
@@ -127,19 +132,19 @@
// end write-access checks.
// execute-/list-access checks.
- if ( ( mode & U_X ) == 0 && ( mode & G_X ) == G_X )
+ 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 )
+ 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 )
+ if ( ( ( mode & G_X ) == 0 ) && ( ( mode & W_X ) == W_X ) )
{
messages.append( "\n- World has execute/list access, but group
does not." );
warn = true;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo?rev=617732&r1=617731&r2=617732&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo Fri
Feb 1 17:11:22 2008
@@ -200,12 +200,14 @@
<name>fileMode</name>
<version>1.0.0+</version>
<type>String</type>
+ <!--
<defaultValue>0644</defaultValue>
+ -->
<description>
<![CDATA[
Similar to a UNIX permission, sets the file mode of the files
included.
Format: (User)(Group)(Other) where each component is a sum of Read
= 4,
- Write = 2, and Execute = 1. For example, the default value of 0644
+ Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
]]>
@@ -215,13 +217,15 @@
<name>directoryMode</name>
<version>1.0.0+</version>
<type>String</type>
+ <!--
<defaultValue>0755</defaultValue>
+ -->
<description>
<![CDATA[
Similar to a UNIX permission, sets the directory mode of the
directories
included. Format: (User)(Group)(Other) where each component is a
sum of
- Read = 4, Write = 2, and Execute = 1. For example, the default
value of
- 0644 translates to User read-write, Group and Other read-only.
+ Read = 4, Write = 2, and Execute = 1. For example, the value
+ 0755 translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
]]>
</description>
@@ -319,12 +323,14 @@
<name>fileMode</name>
<version>1.0.0+</version>
<type>String</type>
+ <!--
<defaultValue>0644</defaultValue>
+ -->
<description>
<![CDATA[
Similar to a UNIX permission, sets the file mode of the files
included.
Format: (User)(Group)(Other) where each component is a sum of Read
= 4,
- Write = 2, and Execute = 1. For example, the default value of 0644
+ Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
]]>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo?rev=617732&r1=617731&r2=617732&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo Fri
Feb 1 17:11:22 2008
@@ -319,12 +319,14 @@
<name>fileMode</name>
<version>1.0.0+</version>
<type>String</type>
+ <!--
<defaultValue>0644</defaultValue>
+ -->
<description>
<![CDATA[
Similar to a UNIX permission, sets the file mode of the files
included.
Format: (User)(Group)(Other) where each component is a sum of Read
= 4,
- Write = 2, and Execute = 1. For example, the default value of 0644
+ Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
]]>
@@ -334,12 +336,14 @@
<name>directoryMode</name>
<version>1.0.0+</version>
<type>String</type>
+ <!--
<defaultValue>0755</defaultValue>
+ -->
<description>
<![CDATA[
Similar to a UNIX permission, sets the directory mode of the
directories
included. Format: (User)(Group)(Other) where each component is a
sum of
- Read = 4, Write = 2, and Execute = 1. For example, the default
value of
+ Read = 4, Write = 2, and Execute = 1. For example, the value
0755 translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
]]>
@@ -438,12 +442,14 @@
<name>fileMode</name>
<version>1.0.0+</version>
<type>String</type>
+ <!--
<defaultValue>0644</defaultValue>
+ -->
<description>
<![CDATA[
Similar to a UNIX permission, sets the file mode of the files
included.
Format: (User)(Group)(Other) where each component is a sum of Read
= 4,
- Write = 2, and Execute = 1. For example, the default value of 0644
+ Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
]]>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml?rev=617732&r1=617731&r2=617732&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml
Fri Feb 1 17:11:22 2008
@@ -27,6 +27,12 @@
<implementation>org.codehaus.plexus.archiver.zip.ZipUnArchiver</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
</component>
+ <component>
+
<role>org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection</role>
+ <role-hint>sar</role-hint>
+
<implementation>org.codehaus.plexus.components.io.resources.PlexusIoZipFileResourceCollection</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
+ </component>
<component>
<role>org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler</role>
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?rev=617732&r1=617731&r2=617732&view=diff
==============================================================================
---
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 Feb 1 17:11:22 2008
@@ -138,7 +138,7 @@
try
{
- mac.archiver.addArchivedFileSet( artifactFile, outputLocation,
null, null );
+ mac.archiver.addArchivedFileSet( artifactFile, outputLocation,
AddArtifactTask.DEFAULT_INCLUDES_ARRAY, null );
}
catch ( ArchiverException e )
{
@@ -172,7 +172,7 @@
try
{
- mac.archiver.addArchivedFileSet( artifactFile, outputLocation,
null, null );
+ mac.archiver.addArchivedFileSet( artifactFile, outputLocation,
AddArtifactTask.DEFAULT_INCLUDES_ARRAY, null );
}
catch ( ArchiverException e )
{
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?rev=617732&r1=617731&r2=617732&view=diff
==============================================================================
---
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 Feb 1 17:11:22 2008
@@ -172,7 +172,7 @@
if ( unpack )
{
- macTask.expectAddArchivedFileSet( artifactFile, outputLocation +
"/", null, null );
+ macTask.expectAddArchivedFileSet( artifactFile, outputLocation +
"/", AddArtifactTask.DEFAULT_INCLUDES_ARRAY, null );
macTask.expectModeChange( -1, -1, 10, 10, 2 );
}
else
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java?rev=617732&r1=617731&r2=617732&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
Fri Feb 1 17:11:22 2008
@@ -137,9 +137,9 @@
File srcDir = new File( macTask.archiveBaseDir, dirname );
srcDir.mkdirs();
- int[] modes = { -1, -1, Integer.parseInt( fs.getDirectoryMode(), 8 ),
Integer.parseInt( fs.getFileMode(), 8 ) };
+ int[] modes = { -1, -1, -1, -1 };
- macTask.expectAdditionOfSingleFileSet( null, null, null, true, modes,
2, true, false );
+ macTask.expectAdditionOfSingleFileSet( null, null, null, true, modes,
1, true, false );
macTask.expectGetProject( null );
@@ -172,9 +172,9 @@
File srcDir = new File( archiveBaseDir, dirname );
srcDir.mkdirs();
- int[] modes = { -1, -1, Integer.parseInt( fs.getDirectoryMode(), 8 ),
Integer.parseInt( fs.getFileMode(), 8 ) };
+ int[] modes = { -1, -1, -1, -1 };
- macTask.expectAdditionOfSingleFileSet( null, null, null, true, modes,
2, true, false );
+ macTask.expectAdditionOfSingleFileSet( null, null, null, true, modes,
1, true, false );
macTask.expectGetProject( null );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java?rev=617732&r1=617731&r2=617732&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
Fri Feb 1 17:11:22 2008
@@ -19,6 +19,25 @@
* under the License.
*/
+import org.apache.maven.plugin.assembly.testutils.TestFileManager;
+import org.codehaus.plexus.archiver.ArchivedFileSet;
+import org.codehaus.plexus.archiver.Archiver;
+import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.FileSet;
+import org.codehaus.plexus.archiver.ResourceIterator;
+import org.codehaus.plexus.archiver.zip.ZipArchiver;
+import org.codehaus.plexus.components.io.resources.PlexusIoResource;
+import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.jdom.Document;
+import org.jdom.JDOMException;
+import org.jdom.Text;
+import org.jdom.input.SAXBuilder;
+import org.jdom.xpath.XPath;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -36,22 +55,6 @@
import junit.framework.TestCase;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
-import org.codehaus.plexus.archiver.ArchivedFileSet;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.FileSet;
-import org.codehaus.plexus.archiver.zip.ZipArchiver;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.jdom.Document;
-import org.jdom.JDOMException;
-import org.jdom.Text;
-import org.jdom.input.SAXBuilder;
-import org.jdom.xpath.XPath;
-
public class ComponentsXmlArchiverFileFilterTest
extends TestCase
{
@@ -521,6 +524,26 @@
}
public void addFileSet( FileSet fileSet )
+ throws ArchiverException
+ {
+ throw new UnsupportedOperationException( "not supported" );
+ }
+
+ public void addResource( PlexusIoResource resource,
+ String destFileName,
+ int permissions )
+ throws ArchiverException
+ {
+ throw new UnsupportedOperationException( "not supported" );
+ }
+
+ public void addResources( PlexusIoResourceCollection resources )
+ throws ArchiverException
+ {
+ throw new UnsupportedOperationException( "not supported" );
+ }
+
+ public ResourceIterator getResources()
throws ArchiverException
{
throw new UnsupportedOperationException( "not supported" );
