maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject svn commit: r556171 - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/main/java/org/apache/maven/plugin/assembly/archive/archiver/ src/test/java/org/apache/maven/plugin/assembly/filter/
Date Fri, 13 Jul 2007 22:57:24 GMT
Author: jdcasey
Date: Fri Jul 13 15:57:23 2007
New Revision: 556171

URL: http://svn.apache.org/viewvc?view=rev&rev=556171
Log:
Bumping plexus-archiver version for [MASSEMBLY-213] testing.

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/PrefixingProxyArchiver.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?view=diff&rev=556171&r1=556170&r2=556171
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Fri Jul 13 15:57:23 2007
@@ -287,7 +287,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>1.0-alpha-8</version>
+      <version>1.0-alpha-9-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/PrefixingProxyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiver.java?view=diff&rev=556171&r1=556170&r2=556171
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiver.java
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiver.java
Fri Jul 13 15:57:23 2007
@@ -1,7 +1,9 @@
 package org.apache.maven.plugin.assembly.archive.archiver;
 
+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 java.io.File;
 import java.io.IOException;
@@ -10,15 +12,15 @@
 public class PrefixingProxyArchiver
     implements Archiver
 {
-    
+
     private Archiver delegate;
     private String rootPrefix;
-    
+
     public PrefixingProxyArchiver( String rootPrefix, Archiver delegate )
     {
         this.rootPrefix = rootPrefix;
         this.delegate = delegate;
-        
+
         if ( !rootPrefix.endsWith( "/" ) )
         {
             this.rootPrefix += "/";
@@ -154,6 +156,18 @@
     public void setDotFileDirectory( File dotFileDirectory )
     {
         throw new UnsupportedOperationException( "Undocumented feature of plexus-archiver;
this is not yet supported." );
+    }
+
+    public void addArchivedFileSet( ArchivedFileSet fileSet )
+        throws ArchiverException
+    {
+        delegate.addArchivedFileSet( new PrefixedArchivedFileSet( fileSet, rootPrefix ) );
+    }
+
+    public void addFileSet( FileSet fileSet )
+        throws ArchiverException
+    {
+        delegate.addFileSet( fileSet );
     }
 
 }

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?view=diff&rev=556171&r1=556170&r2=556171
==============================================================================
--- 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 Jul 13 15:57:23 2007
@@ -18,8 +18,10 @@
 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;
@@ -491,6 +493,18 @@
 
         public void setDotFileDirectory( File dotFileDirectory )
         {
+        }
+
+        public void addArchivedFileSet( ArchivedFileSet fileSet )
+            throws ArchiverException
+        {
+            throw new UnsupportedOperationException( "not supported" );
+        }
+
+        public void addFileSet( FileSet fileSet )
+            throws ArchiverException
+        {
+            throw new UnsupportedOperationException( "not supported" );
         }
     }
 



Mime
View raw message