Adapted to p-io 2.4

krosenvold · krosenvold · commit ad4fad2d7ad1 · 2014-11-26T21:43:43.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -51,12 +51,12 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
+      <version>3.0.21</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-io</artifactId>
-      <version>2.3.5</version>
+      <version>2.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
@@ -42,12 +42,12 @@
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.components.io.attributes.Java7Reflector;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
+import org.codehaus.plexus.components.io.functions.ResourceAttributeSupplier;
 import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResourceCollection;
 import org.codehaus.plexus.components.io.resources.PlexusIoArchivedResourceCollection;
 import org.codehaus.plexus.components.io.resources.PlexusIoFileResourceCollection;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
-import org.codehaus.plexus.components.io.resources.PlexusIoResourceWithAttributes;
 import org.codehaus.plexus.components.io.resources.proxy.PlexusIoProxyResourceCollection;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
@@ -381,9 +381,9 @@ protected ArchiveEntry asArchiveEntry( final PlexusIoResourceCollection collecti
         final String destFileName = collection.getName( resource );
 
         int permissions = -1;
-        if ( resource instanceof PlexusIoResourceWithAttributes )
+        if ( resource instanceof ResourceAttributeSupplier)
         {
-            final PlexusIoResourceAttributes attrs = ( (PlexusIoResourceWithAttributes) resource ).getAttributes();
+            final PlexusIoResourceAttributes attrs = ( (ResourceAttributeSupplier) resource ).getAttributes();
 
             if ( attrs != null )
             {
@@ -521,7 +521,7 @@ else if ( o instanceof PlexusIoResourceCollection )
                         }
                     }
 
-                    if ( nextEntry != null && seenEntries.contains( normalizedForDuplicateCheck(nextEntry ) ))
+                    if ( nextEntry != null && seenEntries.contains( normalizedForDuplicateCheck(nextEntry) ))
                     {
                         final String path = nextEntry.getName();
 
diff --git a/src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java b/src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java
@@ -27,10 +27,10 @@
 
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
+import org.codehaus.plexus.components.io.functions.ResourceAttributeSupplier;
 import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
-import org.codehaus.plexus.components.io.resources.PlexusIoResourceWithAttributes;
 
 /**
  * @version $Revision: 1502 $ $Date$
@@ -80,8 +80,8 @@ private ArchiveEntry( String name, @Nonnull PlexusIoResource resource, int type,
         } catch (IOException e) {
             throw new   ArchiverException("Error resolving resource " + resource.getName(), e);
         }
-        this.attributes = ( resource instanceof PlexusIoResourceWithAttributes )
-            ? ( (PlexusIoResourceWithAttributes) resource ).getAttributes() : null;
+        this.attributes = ( resource instanceof ResourceAttributeSupplier)
+            ? ( (ResourceAttributeSupplier) resource ).getAttributes() : null;
         this.type = type;
         int permissions = mode;
 
diff --git a/src/main/java/org/codehaus/plexus/archiver/resources/PlexusIoVirtualFileResource.java b/src/main/java/org/codehaus/plexus/archiver/resources/PlexusIoVirtualFileResource.java
@@ -17,23 +17,22 @@
  */
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 
 import org.codehaus.plexus.components.io.attributes.Java7AttributeUtils;
 import org.codehaus.plexus.components.io.attributes.Java7Reflector;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
+import org.codehaus.plexus.components.io.functions.ResourceAttributeSupplier;
 import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResource;
-import org.codehaus.plexus.components.io.resources.PlexusIoResourceWithAttributes;
 
 /**
  * A file resource that does not necessarily exist (anywhere).
  */
 public class PlexusIoVirtualFileResource
     extends AbstractPlexusIoResource
-    implements PlexusIoResourceWithAttributes
+    implements ResourceAttributeSupplier
 {
     private final File file;
 
diff --git a/src/main/java/org/codehaus/plexus/archiver/resources/PlexusIoVirtualSymlinkResource.java b/src/main/java/org/codehaus/plexus/archiver/resources/PlexusIoVirtualSymlinkResource.java
@@ -20,14 +20,14 @@
 import java.io.IOException;
 
 import org.codehaus.plexus.components.io.attributes.SymlinkUtils;
-import org.codehaus.plexus.components.io.resources.PlexusIoSymlink;
+import org.codehaus.plexus.components.io.functions.SymlinkDestinationSupplier;
 
 /**
  * A symlink that does not necessarily exist (anywhere).
  */
 
 public class PlexusIoVirtualSymlinkResource extends PlexusIoVirtualFileResource
-	implements PlexusIoSymlink {
+	implements SymlinkDestinationSupplier {
 		private final String symnlinkDestination;
 
 		public PlexusIoVirtualSymlinkResource(File symlinkFile, String symnlinkDestination)
diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
@@ -27,8 +27,8 @@
 import org.codehaus.plexus.archiver.util.ResourceUtils;
 import org.codehaus.plexus.archiver.util.Streams;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
+import org.codehaus.plexus.components.io.functions.SymlinkDestinationSupplier;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-import org.codehaus.plexus.components.io.resources.PlexusIoSymlink;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -281,7 +281,7 @@ else if ( longFileMode.isFailMode() )
 
             if ( entry.getType() == ArchiveEntry.SYMLINK )
             {
-                final PlexusIoSymlink plexusIoSymlinkResource = (PlexusIoSymlink) entry.getResource();
+                final SymlinkDestinationSupplier plexusIoSymlinkResource = (SymlinkDestinationSupplier) entry.getResource();
                 te = new TarArchiveEntry( vPath, TarArchiveEntry.LF_SYMLINK);
                 te.setLinkName( plexusIoSymlinkResource.getSymlinkDestination() );
             }
diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarResource.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarResource.java
@@ -7,13 +7,13 @@
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
 import org.codehaus.plexus.components.io.attributes.SimpleResourceAttributes;
+import org.codehaus.plexus.components.io.functions.ResourceAttributeSupplier;
 import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-import org.codehaus.plexus.components.io.resources.PlexusIoResourceWithAttributes;
 
 public class TarResource
     extends AbstractPlexusIoResource
-    implements PlexusIoResourceWithAttributes
+    implements ResourceAttributeSupplier
 {
 
     private final TarFile tarFile;
diff --git a/src/main/java/org/codehaus/plexus/archiver/util/ResourceUtils.java b/src/main/java/org/codehaus/plexus/archiver/util/ResourceUtils.java
@@ -6,6 +6,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.codehaus.plexus.components.io.functions.FileSupplier;
 import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 import org.codehaus.plexus.util.IOUtil;
@@ -116,9 +117,9 @@ public static void copyFile( InputStream input, File outFile )
      */
     public static boolean isSame( PlexusIoResource resource, File file )
     {
-        if ( resource instanceof PlexusIoFileResource )
+        if ( resource instanceof FileSupplier )
         {
-            File resourceFile = ((PlexusIoFileResource) resource).getFile();
+            File resourceFile = ((FileSupplier) resource).getFile();
             return file.equals( resourceFile );
         }
         return false;
@@ -132,9 +133,9 @@ public static boolean isSame( PlexusIoResource resource, File file )
     public static boolean isCanonicalizedSame( PlexusIoResource resource, File file )
         throws IOException
     {
-        if ( resource instanceof PlexusIoFileResource )
+        if ( resource instanceof FileSupplier)
         {
-            File resourceFile = ((PlexusIoFileResource) resource).getFile();
+            File resourceFile = ((FileSupplier) resource).getFile();
             return file.getCanonicalFile().equals( resourceFile.getCanonicalFile() );
         }
         return false;
diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java b/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java
@@ -32,12 +32,10 @@
 import org.codehaus.plexus.archiver.ResourceIterator;
 import org.codehaus.plexus.archiver.UnixStat;
 import org.codehaus.plexus.archiver.util.ResourceUtils;
-import org.codehaus.plexus.archiver.util.Streams;
+import org.codehaus.plexus.components.io.functions.SymlinkDestinationSupplier;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-import org.codehaus.plexus.components.io.resources.PlexusIoSymlink;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
 
 import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
 import static org.codehaus.plexus.archiver.util.Streams.fileOutputStream;
@@ -594,8 +592,8 @@ protected void zipFile( ArchiveEntry entry, ZipArchiveOutputStream zOut, String
             throw new ArchiverException( "A zip file cannot include itself" );
         }
 
-        final boolean b = entry.getResource() instanceof PlexusIoSymlink;
-        String symlinkTarget = b ? ((PlexusIoSymlink)entry.getResource()).getSymlinkDestination() : null;
+        final boolean b = entry.getResource() instanceof SymlinkDestinationSupplier;
+        String symlinkTarget = b ? ((SymlinkDestinationSupplier)entry.getResource()).getSymlinkDestination() : null;
         InputStream in = entry.getInputStream();
         try
         {
@@ -643,7 +641,7 @@ protected void zipDir( PlexusIoResource dir, ZipArchiveOutputStream zOut, String
 
         if ( !skipWriting )
         {
-            final boolean isSymlink = dir instanceof PlexusIoSymlink;
+            final boolean isSymlink = dir instanceof SymlinkDestinationSupplier;
 
             if (isSymlink && vPath.endsWith(File.separator))
             {
@@ -685,7 +683,7 @@ protected void zipDir( PlexusIoResource dir, ZipArchiveOutputStream zOut, String
 
             if ( isSymlink )
             {
-                String symlinkDestination = ( (PlexusIoSymlink) dir ).getSymlinkDestination();
+                String symlinkDestination = ( (SymlinkDestinationSupplier) dir ).getSymlinkDestination();
                 ZipEncoding enc = ZipEncodingHelper.getZipEncoding( zOut.getEncoding() );
                 final byte[] bytes = enc.encode( symlinkDestination ).array();
                 zOut.write( bytes, 0, bytes.length );
diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/ZipResource.java b/src/main/java/org/codehaus/plexus/archiver/zip/ZipResource.java
@@ -10,13 +10,13 @@
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
 import org.codehaus.plexus.components.io.attributes.SimpleResourceAttributes;
 import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
+import org.codehaus.plexus.components.io.functions.ResourceAttributeSupplier;
 import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResource;
 import org.codehaus.plexus.components.io.resources.ClosingInputStream;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-import org.codehaus.plexus.components.io.resources.PlexusIoResourceWithAttributes;
 
 public class ZipResource extends AbstractPlexusIoResource
-    implements PlexusIoResourceWithAttributes
+    implements ResourceAttributeSupplier
 {
 
     private final org.apache.commons.compress.archivers.zip.ZipFile zipFile;

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,12 @@`
`42`	`42`	`import org.codehaus.plexus.component.repository.exception.ComponentLookupException;`
`43`	`43`	`import org.codehaus.plexus.components.io.attributes.Java7Reflector;`
`44`	`44`	`import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;`
	`45`	`+import org.codehaus.plexus.components.io.functions.ResourceAttributeSupplier;`
`45`	`46`	`import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResourceCollection;`
`46`	`47`	`import org.codehaus.plexus.components.io.resources.PlexusIoArchivedResourceCollection;`
`47`	`48`	`import org.codehaus.plexus.components.io.resources.PlexusIoFileResourceCollection;`
`48`	`49`	`import org.codehaus.plexus.components.io.resources.PlexusIoResource;`
`49`	`50`	`import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;`
`50`		`-import org.codehaus.plexus.components.io.resources.PlexusIoResourceWithAttributes;`
`51`	`51`	`import org.codehaus.plexus.components.io.resources.proxy.PlexusIoProxyResourceCollection;`
`52`	`52`	`import org.codehaus.plexus.context.Context;`
`53`	`53`	`import org.codehaus.plexus.context.ContextException;`
`@@ -381,9 +381,9 @@ protected ArchiveEntry asArchiveEntry( final PlexusIoResourceCollection collecti`
`381`	`381`	`final String destFileName = collection.getName( resource );`
`382`	`382`
`383`	`383`	`int permissions = -1;`
`384`		`- if ( resource instanceof PlexusIoResourceWithAttributes )`
	`384`	`+ if ( resource instanceof ResourceAttributeSupplier)`
`385`	`385`	`{`
`386`		`- final PlexusIoResourceAttributes attrs = ( (PlexusIoResourceWithAttributes) resource ).getAttributes();`
	`386`	`+ final PlexusIoResourceAttributes attrs = ( (ResourceAttributeSupplier) resource ).getAttributes();`
`387`	`387`
`388`	`388`	`if ( attrs != null )`
`389`	`389`	`{`
`@@ -521,7 +521,7 @@ else if ( o instanceof PlexusIoResourceCollection )`
`521`	`521`	`}`
`522`	`522`	`}`
`523`	`523`
`524`		`- if ( nextEntry != null && seenEntries.contains( normalizedForDuplicateCheck(nextEntry ) ))`
	`524`	`+ if ( nextEntry != null && seenEntries.contains( normalizedForDuplicateCheck(nextEntry) ))`
`525`	`525`	`{`
`526`	`526`	`final String path = nextEntry.getName();`
`527`	`527`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import java.io.InputStream;`
`7`	`7`	`import java.io.OutputStream;`
`8`	`8`
	`9`	`+import org.codehaus.plexus.components.io.functions.FileSupplier;`
`9`	`10`	`import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;`
`10`	`11`	`import org.codehaus.plexus.components.io.resources.PlexusIoResource;`
`11`	`12`	`import org.codehaus.plexus.util.IOUtil;`
`@@ -116,9 +117,9 @@ public static void copyFile( InputStream input, File outFile )`
`116`	`117`	`*/`
`117`	`118`	`public static boolean isSame( PlexusIoResource resource, File file )`
`118`	`119`	`{`
`119`		`- if ( resource instanceof PlexusIoFileResource )`
	`120`	`+ if ( resource instanceof FileSupplier )`
`120`	`121`	`{`
`121`		`- File resourceFile = ((PlexusIoFileResource) resource).getFile();`
	`122`	`+ File resourceFile = ((FileSupplier) resource).getFile();`
`122`	`123`	`return file.equals( resourceFile );`
`123`	`124`	`}`
`124`	`125`	`return false;`
`@@ -132,9 +133,9 @@ public static boolean isSame( PlexusIoResource resource, File file )`
`132`	`133`	`public static boolean isCanonicalizedSame( PlexusIoResource resource, File file )`
`133`	`134`	`throws IOException`
`134`	`135`	`{`
`135`		`- if ( resource instanceof PlexusIoFileResource )`
	`136`	`+ if ( resource instanceof FileSupplier)`
`136`	`137`	`{`
`137`		`- File resourceFile = ((PlexusIoFileResource) resource).getFile();`
	`138`	`+ File resourceFile = ((FileSupplier) resource).getFile();`
`138`	`139`	`return file.getCanonicalFile().equals( resourceFile.getCanonicalFile() );`
`139`	`140`	`}`
`140`	`141`	`return false;`