Fixed resource name for failing assembly it

Author: krosenvold

src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java

@@ -350,7 +350,7 @@ public void addSymlink( String symlinkName, String symlinkDestination )
     public void addSymlink( String symlinkName, int permissions, String symlinkDestination )
         throws ArchiverException
     {
-        resources.add( ArchiveEntry.createSymlinkEntry( symlinkName, permissions, symlinkDestination,
+        doAddResource( ArchiveEntry.createSymlinkEntry( symlinkName, permissions, symlinkDestination,
                                                         getDirectoryMode() ) );
     }
 
@@ -397,7 +397,7 @@ protected ArchiveEntry asArchiveEntry( final PlexusIoResourceCollection collecti
     public void addResource( final PlexusIoResource resource, final String destFileName, final int permissions )
         throws ArchiverException
     {
-        resources.add( asArchiveEntry( resource, destFileName, permissions, null ) );
+        doAddResource( asArchiveEntry( resource, destFileName, permissions, null ) );
     }
 
     public void addFile( @Nonnull final File inputFile, @Nonnull String destFileName, int permissions )
@@ -429,14 +429,14 @@ public void addFile( @Nonnull final File inputFile, @Nonnull String destFileName
 
                 if ( include( in, destFileName ) )
                 {
-                    resources.add( ArchiveEntry.createFileEntry( destFileName, inputFile, permissions,
-                                                                 getDirectoryMode() ) );
+                    doAddResource(
+                        ArchiveEntry.createFileEntry( destFileName, inputFile, permissions, getDirectoryMode() ) );
                 }
             }
             else
             {
-                resources.add( ArchiveEntry.createFileEntry( destFileName, inputFile, permissions,
-                                                             getDirectoryMode() ) );
+                doAddResource(
+                    ArchiveEntry.createFileEntry( destFileName, inputFile, permissions, getDirectoryMode() ) );
             }
         }
         catch ( final IOException e )
@@ -721,7 +721,11 @@ protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet
     public void addResources( final PlexusIoResourceCollection collection )
         throws ArchiverException
     {
-        resources.add( collection );
+        doAddResource( collection );
+    }
+
+    private void doAddResource(Object item){
+        resources.add( item);
     }
 
     public void addArchivedFileSet( final ArchivedFileSet fileSet )

src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java

@@ -174,25 +174,16 @@ public static ArchiveEntry createFileEntry( String target, File file, int permis
             throw new ArchiverException( "Not a file: " + file );
         }
 
-        PlexusIoResourceAttributes attrs;
-        try
-        {
-            attrs = PlexusIoResourceAttributeUtils.getFileAttributes( file );
-        }
-        catch ( IOException e )
-        {
-            throw new ArchiverException( "Failed to read filesystem attributes for: " + file, e );
-        }
+        final PlexusIoResource res =  ResourceFactory.createResource( file );
 
         final int type;
-        if (attrs.isSymbolicLink()){
+        if (res.isSymbolicLink()){
             type = SYMLINK;
             permissions =  permissions & ~(UnixStat.FILE_FLAG); // remove file flag again .doh.
         } else {
             type = FILE; // File flag was there already. This is a bit of a mess !
         }
 
-        final PlexusIoFileResource res =  PlexusIoFileResource.justAFile( file, attrs );
         return new ArchiveEntry( target, res, type, permissions, null, defaultDirectoryPermissions );
     }
 
@@ -223,7 +214,7 @@ public static ArchiveEntry createDirectoryEntry( String target, final File file,
             throw new ArchiverException( "Not a directory: " + file );
         }
 
-        final PlexusIoResource res = createResource( file, file.getName() );
+        final PlexusIoResource res = createResource( file);
         return new ArchiveEntry( target, res, DIRECTORY, permissions, null, defaultDirMode1 );
     }
 

src/main/java/org/codehaus/plexus/archiver/util/Compressor.java

@@ -26,7 +26,6 @@
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-import org.codehaus.plexus.components.io.resources.ResourceFactory;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.IOUtil;
 
@@ -78,7 +77,7 @@ public PlexusIoResource getSource()
      * @deprecated Use {@link #getSource()}.
      */
     public void setSourceFile( File srcFile ) throws IOException {
-        setSource( createResource( srcFile, srcFile.getName() ) );
+        setSource( createResource( srcFile) );
     }
 
     /**