From c5dbf6a929689a620c8f6a6b4b97825c038ce636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trygve=20Laugst=C3=B8l?= <trygvis@inamo.no>
Date: Fri, 15 Feb 2013 17:20:04 +0100
Subject: [PATCH] o Implementing filtering for rpm and pkg. The pkg part is not
 very well tested yet. Should fix issue #1.

---
 TODO.txt                                      |  4 +
 pom.xml                                       |  7 +-
 .../org/codehaus/mojo/unix/UnixFileMode.java  |  3 +-
 .../org/codehaus/mojo/unix/UnixPackage.java   | 10 +-
 .../mojo/unix/core/FilterFilesOperation.java  |  4 +-
 .../mojo/unix/core/FsFileCollector.java       | 35 ++++---
 unix-maven-plugin/pom.xml                     | 17 ++++
 .../src/it/test-deb-1/pom4test.xml            |  0
 .../src/it/test-rpm-1/pom4test.xml            |  5 +
 .../src/it/test-rpm-1/postbuild.groovy        |  2 +
 .../files/opt/hudson/etc}/config.properties   |  0
 .../src/it/test-sysvpkg-1/postbuild.groovy    |  4 +-
 .../src/it/test-sysvpkg-2/postbuild.groovy    |  4 +-
 .../src/it/test-sysvpkg-3/postbuild.groovy    |  6 +-
 .../it/test-sysvpkg-classes/postbuild.groovy  |  5 +-
 .../codehaus/mojo/unix/maven/MojoHelper.java  | 25 ++---
 .../unix/maven/deb/DebPackagingFormat.java    |  2 +-
 .../mojo/unix/maven/deb/DebUnixPackage.java   | 53 +++++-----
 .../plugin/AbstractPackageAttachedMojo.java   |  2 +-
 .../maven/plugin/AbstractPackageMojo.java     |  2 +-
 .../mojo/unix/maven/plugin/FilterFiles.java   |  1 -
 .../maven/plugin/PackageDebAttachedMojo.java  |  3 +-
 .../unix/maven/plugin/PackageDebMojo.java     |  4 +-
 .../maven/plugin/PackageRpmAttachedMojo.java  |  2 +-
 .../unix/maven/plugin/PackageRpmMojo.java     |  2 +-
 .../plugin/PackageSysvPkgAttachedMojo.java    |  4 +-
 .../unix/maven/plugin/PackageSysvPkgMojo.java |  1 -
 .../unix/maven/plugin/PackageZipMojo.java     |  2 +-
 .../unix/maven/rpm/RpmPackagingFormat.java    |  7 +-
 .../mojo/unix/maven/rpm/RpmUnixPackage.java   | 55 ++++++-----
 .../unix/maven/sysvpkg/PkgUnixPackage.java    | 99 ++++++++++---------
 .../maven/sysvpkg/SysvPkgPackagingFormat.java | 10 +-
 .../unix/maven/zip/ZipPackagingFormat.java    | 15 +--
 .../mojo/unix/maven/zip/ZipUnixPackage.java   | 48 +++++----
 .../mojo/unix/maven/UnixPackageTestUtil.java  | 83 ++++++++++++++++
 .../unix/maven/deb/DebUnixPackageTest.java    | 56 ++++-------
 .../unix/maven/pkg/PkgUnixPackageTest.java    | 21 ++++
 .../mojo/unix/maven/plugin/ShittyUtil.java    |  8 +-
 .../unix/maven/rpm/RpmUnixPackageTest.java    | 27 ++++-
 .../mojo/unix/maven/zip/ZipPackageTest.java   |  7 +-
 .../test-filtering/config.properties          |  1 +
 .../{PkginfoFile.java => Pkginfo.java}        | 44 ++++-----
 .../mojo/unix/sysvpkg/PkginfoUtil.java        | 10 +-
 ...{PkginfoFileTest.java => PkginfoTest.java} | 18 ++--
 44 files changed, 431 insertions(+), 287 deletions(-)
 mode change 100644 => 100755 TODO.txt
 mode change 100644 => 100755 pom.xml
 mode change 100644 => 100755 unix-common/src/main/java/org/codehaus/mojo/unix/UnixFileMode.java
 mode change 100644 => 100755 unix-common/src/main/java/org/codehaus/mojo/unix/UnixPackage.java
 mode change 100644 => 100755 unix-core/src/main/java/org/codehaus/mojo/unix/core/FilterFilesOperation.java
 mode change 100644 => 100755 unix-core/src/main/java/org/codehaus/mojo/unix/core/FsFileCollector.java
 mode change 100644 => 100755 unix-maven-plugin/pom.xml
 mode change 100644 => 100755 unix-maven-plugin/src/it/test-deb-1/pom4test.xml
 mode change 100644 => 100755 unix-maven-plugin/src/it/test-rpm-1/pom4test.xml
 mode change 100644 => 100755 unix-maven-plugin/src/it/test-rpm-1/postbuild.groovy
 rename unix-maven-plugin/src/{test/resources/deb => it/test-rpm-1/src/main/unix/files/opt/hudson/etc}/config.properties (100%)
 mode change 100644 => 100755
 mode change 100644 => 100755 unix-maven-plugin/src/it/test-sysvpkg-1/postbuild.groovy
 mode change 100644 => 100755 unix-maven-plugin/src/it/test-sysvpkg-2/postbuild.groovy
 mode change 100644 => 100755 unix-maven-plugin/src/it/test-sysvpkg-3/postbuild.groovy
 mode change 100644 => 100755 unix-maven-plugin/src/it/test-sysvpkg-classes/postbuild.groovy
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/MojoHelper.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/deb/DebPackagingFormat.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/deb/DebUnixPackage.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/AbstractPackageAttachedMojo.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/AbstractPackageMojo.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/FilterFiles.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageDebAttachedMojo.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageDebMojo.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageRpmAttachedMojo.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageRpmMojo.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageSysvPkgAttachedMojo.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageSysvPkgMojo.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageZipMojo.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmPackagingFormat.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackage.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/sysvpkg/PkgUnixPackage.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/sysvpkg/SysvPkgPackagingFormat.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/zip/ZipPackagingFormat.java
 mode change 100644 => 100755 unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/zip/ZipUnixPackage.java
 create mode 100755 unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/UnixPackageTestUtil.java
 mode change 100644 => 100755 unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/deb/DebUnixPackageTest.java
 create mode 100755 unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/pkg/PkgUnixPackageTest.java
 mode change 100644 => 100755 unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/plugin/ShittyUtil.java
 mode change 100644 => 100755 unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackageTest.java
 mode change 100644 => 100755 unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/zip/ZipPackageTest.java
 create mode 100644 unix-maven-plugin/src/test/resources/test-filtering/config.properties
 rename unix-sysv-pkg/src/main/java/org/codehaus/mojo/unix/sysvpkg/{PkginfoFile.java => Pkginfo.java} (76%)
 mode change 100644 => 100755
 mode change 100644 => 100755 unix-sysv-pkg/src/main/java/org/codehaus/mojo/unix/sysvpkg/PkginfoUtil.java
 rename unix-sysv-pkg/src/test/java/org/codehaus/mojo/unix/sysvpkg/{PkginfoFileTest.java => PkginfoTest.java} (86%)
 mode change 100644 => 100755

diff --git a/TODO.txt b/TODO.txt
old mode 100644
new mode 100755
index 7eb9402d..747a005f
--- a/TODO.txt
+++ b/TODO.txt
@@ -73,6 +73,10 @@ o Make sure the result of setLastModified is asserted
 
 o Make sure that timestamps are preserved for all assembly operations
 
+o Perform all io operations (IOEffect's) in a thread pool for faster execution.
+  This might not be so easy for ZIP, but will be very useful for the other kinds that require copying of files to an
+  assembly area.
+
 == Refactorings ==
 
 == Functional Java ==
diff --git a/pom.xml b/pom.xml
old mode 100644
new mode 100755
index 9372b63b..1fa457e7
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@
   <properties>
     <version.functionaljava>3.0</version.functionaljava>
     <version.maven-apis>3.0</version.maven-apis>
+    <version.maven-clean-plugin>2.5</version.maven-clean-plugin>
     <version.maven-compiler-plugin>2.3.1</version.maven-compiler-plugin>
     <version.maven-dependency-plugin>2.5</version.maven-dependency-plugin>
     <version.maven-deploy-plugin>2.5</version.maven-deploy-plugin>
@@ -127,6 +128,10 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${version.maven-clean-plugin}</version>
+        </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>${version.maven-compiler-plugin}</version>
@@ -169,8 +174,6 @@
         <artifactId>maven-resources-plugin</artifactId>
         <configuration>
           <encoding>utf-8</encoding>
-          <source>1.5</source>
-          <target>1.5</target>
         </configuration>
       </plugin>
       <!--
diff --git a/unix-common/src/main/java/org/codehaus/mojo/unix/UnixFileMode.java b/unix-common/src/main/java/org/codehaus/mojo/unix/UnixFileMode.java
old mode 100644
new mode 100755
index 4852172a..381d2c45
--- a/unix-common/src/main/java/org/codehaus/mojo/unix/UnixFileMode.java
+++ b/unix-common/src/main/java/org/codehaus/mojo/unix/UnixFileMode.java
@@ -86,7 +86,6 @@ public int toInt()
         return mode;
     }
 
-    @Override
     public boolean equals( Object o )
     {
         if ( this == o )
@@ -105,7 +104,7 @@ public boolean equals( Object o )
 
     public String toString()
     {
-        StringBuffer buffer = new StringBuffer( "         " );
+        StringBuilder buffer = new StringBuilder( "         " );
         buffer.setCharAt( 0, (mode & 0x100) > 0 ? 'r' : '-' );
         buffer.setCharAt( 1, (mode & 0x080) > 0 ? 'w' : '-' );
         buffer.setCharAt( 2, (mode & 0x040) > 0 ? 'x' : '-' );
diff --git a/unix-common/src/main/java/org/codehaus/mojo/unix/UnixPackage.java b/unix-common/src/main/java/org/codehaus/mojo/unix/UnixPackage.java
old mode 100644
new mode 100755
index d7c04ec2..27609817
--- a/unix-common/src/main/java/org/codehaus/mojo/unix/UnixPackage.java
+++ b/unix-common/src/main/java/org/codehaus/mojo/unix/UnixPackage.java
@@ -37,7 +37,7 @@
  *
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
-public abstract class UnixPackage<UP extends UnixPackage<UP>>
+public abstract class UnixPackage<UP extends UnixPackage<UP, PP>, PP extends UnixPackage.PreparedPackage>
     implements FileCollector
 {
     private final String packageFileExtension;
@@ -93,7 +93,7 @@ public UP setVersion( PackageVersion version )
     public abstract void beforeAssembly( FileAttributes defaultDirectoryAttributes, LocalDateTime timestamp )
         throws IOException;
 
-    public abstract void packageToFile( File packageFile, ScriptUtil.Strategy strategy )
+    public abstract PP prepare( ScriptUtil.Strategy strategy )
         throws Exception;
 
     public final PackageVersion getVersion()
@@ -105,4 +105,10 @@ public String getPackageFileExtension()
     {
         return packageFileExtension;
     }
+
+    public abstract class PreparedPackage
+    {
+        public abstract void packageToFile( File packageFile )
+            throws Exception;
+    }
 }
diff --git a/unix-core/src/main/java/org/codehaus/mojo/unix/core/FilterFilesOperation.java b/unix-core/src/main/java/org/codehaus/mojo/unix/core/FilterFilesOperation.java
old mode 100644
new mode 100755
index 8cad4454..7c17853f
--- a/unix-core/src/main/java/org/codehaus/mojo/unix/core/FilterFilesOperation.java
+++ b/unix-core/src/main/java/org/codehaus/mojo/unix/core/FilterFilesOperation.java
@@ -65,10 +65,10 @@ public void streamTo( LineStreamWriter streamWriter )
     {
         streamWriter.add( "Filter Files:" );
         streamIncludesAndExcludes( streamWriter, includes, excludes );
-        streamWriter.add( "Replacers:" );
+        streamWriter.add( " Replacers:" );
         for ( Replacer replacer : replacers )
         {
-            streamWriter.add( " " + replacer.toString() );
+            streamWriter.add( "  " + replacer.toString() );
         }
     }
 }
diff --git a/unix-core/src/main/java/org/codehaus/mojo/unix/core/FsFileCollector.java b/unix-core/src/main/java/org/codehaus/mojo/unix/core/FsFileCollector.java
old mode 100644
new mode 100755
index 1b90e08f..04f63ae7
--- a/unix-core/src/main/java/org/codehaus/mojo/unix/core/FsFileCollector.java
+++ b/unix-core/src/main/java/org/codehaus/mojo/unix/core/FsFileCollector.java
@@ -47,11 +47,13 @@ public class FsFileCollector
 {
     private final List<IoEffect> operations = new ArrayList<IoEffect>();
 
+    private final List<F<UnixFsObject, Option<UnixFsObject>>> applications = new ArrayList<F<UnixFsObject, Option<UnixFsObject>>>();
+
     public final LocalFs root;
 
     public FsFileCollector( LocalFs root) throws IOException {
         this.root = root;
-        mkdirs(root.file);
+        root.mkdir();
     }
 
     public void addDirectory( UnixFsObject.Directory directory )
@@ -72,11 +74,11 @@ public void addSymlink( UnixFsObject.Symlink symlink )
 
     public void apply( F<UnixFsObject, Option<UnixFsObject>> f )
     {
-        // Not implemented
+        applications.add( f );
     }
 
     public void collect()
-        throws IOException
+        throws Exception
     {
         for ( IoEffect operation : operations )
         {
@@ -143,10 +145,17 @@ public CopyFileIoEffect( Fs from, UnixFsObject.RegularFile to )
         public void run()
             throws IOException
         {
+            UnixFsObject adjustedTo = to;
+
+            for ( F<UnixFsObject, Option<UnixFsObject>> f : applications )
+            {
+                adjustedTo = f.f( adjustedTo ).orSome( adjustedTo );
+            }
+
             P2<InputStream, Option<Long>> p2 =
-                filtersAndLineEndingHandingInputStream( to, from.inputStream() );
+                filtersAndLineEndingHandingInputStream( adjustedTo, from.inputStream() );
 
-            root.resolve( to.path ).copyFrom( from, p2._1() );
+            root.resolve( adjustedTo.path ).copyFrom( from, p2._1() );
         }
     }
 
@@ -161,7 +170,7 @@ public static P2<InputStream, Option<Long>> filtersAndLineEndingHandingInputStre
         throws IOException
     {
         // With no filters *and* keeping the line endings we can stream the file directly. Like a BOSS!
-        if ( file.filters.isEmpty() && file.lineEnding.isKeep() )
+        if ( !needsFiltering( file ) )
         {
             return p( inputStream, Option.<Long>none() );
         }
@@ -198,14 +207,11 @@ public static P2<InputStream, Option<Long>> filtersAndLineEndingHandingInputStre
 
         while ( line != null )
         {
-            fj.data.List<Replacer> filters = file.filters;
+            Iterable<Replacer> filters = file.filters;
 
-            if ( filters.isNotEmpty() )
+            for ( Replacer filter : filters )
             {
-                for ( Replacer filter : filters )
-                {
-                    line = filter.replace( line );
-                }
+                line = filter.replace( line );
             }
 
             output.write( line.getBytes() );
@@ -220,4 +226,9 @@ public static P2<InputStream, Option<Long>> filtersAndLineEndingHandingInputStre
 
         return p( inputStream, some( size ) );
     }
+
+    public static boolean needsFiltering( UnixFsObject file )
+    {
+        return file.filters.isNotEmpty() || !file.lineEnding.isKeep();
+    }
 }
diff --git a/unix-maven-plugin/pom.xml b/unix-maven-plugin/pom.xml
old mode 100644
new mode 100755
index 566888a3..75bbfb99
--- a/unix-maven-plugin/pom.xml
+++ b/unix-maven-plugin/pom.xml
@@ -133,6 +133,23 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>src/it</directory>
+              <includes>
+                <include>*/target/**</include>
+              </includes>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <profiles>
     <profile>
       <id>integration-tests</id>
diff --git a/unix-maven-plugin/src/it/test-deb-1/pom4test.xml b/unix-maven-plugin/src/it/test-deb-1/pom4test.xml
old mode 100644
new mode 100755
diff --git a/unix-maven-plugin/src/it/test-rpm-1/pom4test.xml b/unix-maven-plugin/src/it/test-rpm-1/pom4test.xml
old mode 100644
new mode 100755
index ccbb6d01..11168619
--- a/unix-maven-plugin/src/it/test-rpm-1/pom4test.xml
+++ b/unix-maven-plugin/src/it/test-rpm-1/pom4test.xml
@@ -87,6 +87,11 @@
               <path>/var/log/hudson</path>
               <value>/var/opt/hudson/log</value>
             </symlink>
+            <filterFiles>
+              <includes>
+                <include>/opt/hudson/etc/*</include>
+              </includes>
+            </filterFiles>
           </assembly>
         </configuration>
       </plugin>
diff --git a/unix-maven-plugin/src/it/test-rpm-1/postbuild.groovy b/unix-maven-plugin/src/it/test-rpm-1/postbuild.groovy
old mode 100644
new mode 100755
index 5ca52ecd..6987a6a3
--- a/unix-maven-plugin/src/it/test-rpm-1/postbuild.groovy
+++ b/unix-maven-plugin/src/it/test-rpm-1/postbuild.groovy
@@ -14,6 +14,8 @@ success &= assertRpmEntries(rpm, [
         new RpmUtil.FileInfo("/opt", "root", "root", "drwxr-xr-x", 0, null),
         new RpmUtil.FileInfo("/opt/hudson", "root", "root", "drwxr-xr-x", 0, null),
         new RpmUtil.FileInfo("/opt/hudson/hudson.war", "hudson", "hudson", "-rw-r--r--", 20623413, null),
+        new RpmUtil.FileInfo("/opt/hudson/etc", "root", "root", "drwxr-xr-x", 0, null),
+        new RpmUtil.FileInfo("/opt/hudson/etc/config.properties", "root", "root", "-rw-r--r--", 14, null),
         new RpmUtil.FileInfo("/usr", "root", "root", "drwxr-xr-x", 0, null),
         new RpmUtil.FileInfo("/usr/share", "root", "root", "drwxr-xr-x", 0, null),
         new RpmUtil.FileInfo("/usr/share/hudson", "root", "root", "drwxr-xr-x", 0, null),
diff --git a/unix-maven-plugin/src/test/resources/deb/config.properties b/unix-maven-plugin/src/it/test-rpm-1/src/main/unix/files/opt/hudson/etc/config.properties
old mode 100644
new mode 100755
similarity index 100%
rename from unix-maven-plugin/src/test/resources/deb/config.properties
rename to unix-maven-plugin/src/it/test-rpm-1/src/main/unix/files/opt/hudson/etc/config.properties
diff --git a/unix-maven-plugin/src/it/test-sysvpkg-1/postbuild.groovy b/unix-maven-plugin/src/it/test-sysvpkg-1/postbuild.groovy
old mode 100644
new mode 100755
index 37dda96f..48e97f73
--- a/unix-maven-plugin/src/it/test-sysvpkg-1/postbuild.groovy
+++ b/unix-maven-plugin/src/it/test-sysvpkg-1/postbuild.groovy
@@ -1,6 +1,6 @@
 import static org.codehaus.mojo.unix.maven.plugin.ShittyUtil.*
 import static org.codehaus.mojo.unix.sysvpkg.PkgchkUtil.*
-import org.codehaus.mojo.unix.sysvpkg.PkginfoFile
+import org.codehaus.mojo.unix.sysvpkg.Pkginfo
 import org.codehaus.mojo.unix.sysvpkg.PkginfoUtil
 import static fj.data.Option.*
 import fj.data.Option
@@ -12,7 +12,7 @@ boolean success = true
 
 File pkg = new File((File) basedir, "target/project-sysvpkg-1-1.1-2.pkg")
 
-pkginfo = new PkginfoFile("all", "application", "Hudson", "project-sysvpkg-1", "1.1-2").
+pkginfo = new Pkginfo("all", "application", "Hudson", "project-sysvpkg-1", "1.1-2").
         email(some("trygvis@inamo.no"))
 
 success &= assertRelaxed(pkginfo, PkginfoUtil.getPackageInfoForDevice(pkg).some(), packageInfoEqual);
diff --git a/unix-maven-plugin/src/it/test-sysvpkg-2/postbuild.groovy b/unix-maven-plugin/src/it/test-sysvpkg-2/postbuild.groovy
old mode 100644
new mode 100755
index 30d14c91..a0ae5126
--- a/unix-maven-plugin/src/it/test-sysvpkg-2/postbuild.groovy
+++ b/unix-maven-plugin/src/it/test-sysvpkg-2/postbuild.groovy
@@ -1,6 +1,6 @@
 import static org.codehaus.mojo.unix.maven.plugin.ShittyUtil.*
 import static org.codehaus.mojo.unix.sysvpkg.PkgchkUtil.*
-import org.codehaus.mojo.unix.sysvpkg.PkginfoFile
+import org.codehaus.mojo.unix.sysvpkg.Pkginfo
 import org.codehaus.mojo.unix.sysvpkg.PkginfoUtil
 import fj.data.Option
 import org.joda.time.LocalDateTime
@@ -12,7 +12,7 @@ boolean success = true
 File pkg = new File((File) basedir, "target/project-sysvpkg-2-1.1-2.pkg")
 
 success &= assertRelaxed(
-        new PkginfoFile( "all", "application", "Hudson Slave", "project-sysvpkg-2", "1.1-2"),
+        new Pkginfo( "all", "application", "Hudson Slave", "project-sysvpkg-2", "1.1-2"),
         PkginfoUtil.getPackageInfoForDevice(pkg).some(), packageInfoEqual);
 
 success &= assertSysvPkgEntries(pkg, [
diff --git a/unix-maven-plugin/src/it/test-sysvpkg-3/postbuild.groovy b/unix-maven-plugin/src/it/test-sysvpkg-3/postbuild.groovy
old mode 100644
new mode 100755
index 26a85fff..0dc3ba49
--- a/unix-maven-plugin/src/it/test-sysvpkg-3/postbuild.groovy
+++ b/unix-maven-plugin/src/it/test-sysvpkg-3/postbuild.groovy
@@ -1,6 +1,6 @@
 import static org.codehaus.mojo.unix.maven.plugin.ShittyUtil.*
 import static org.codehaus.mojo.unix.sysvpkg.PkgchkUtil.*
-import org.codehaus.mojo.unix.sysvpkg.PkginfoFile
+import org.codehaus.mojo.unix.sysvpkg.Pkginfo
 import org.codehaus.mojo.unix.sysvpkg.PkginfoUtil
 import static fj.data.Option.*
 import fj.data.Option
@@ -19,7 +19,7 @@ println "Hudson Master"
 // No <description> inside <project>, no <description> inside <package> => null
 
 success &= assertRelaxed(
-        new PkginfoFile( "all", "application", "Hudson Master", "project-sysvpkg-3", "1.1-2"),
+        new Pkginfo( "all", "application", "Hudson Master", "project-sysvpkg-3", "1.1-2"),
         PkginfoUtil.getPackageInfoForDevice(main).some(), packageInfoEqual);
 
 success &= assertSysvPkgEntries(main, [
@@ -45,7 +45,7 @@ println "Hudson Slave"
 // This has the <description> set on <package> too
 File slave = new File((File) basedir, "target/project-sysvpkg-3-slave-1.1-2.pkg")
 success &= assertRelaxed(
-        new PkginfoFile( "all", "application", "Hudson Slave", "project-sysvpkg-3-slave", "1.1-2").desc(some("Hudson slave node")),
+        new Pkginfo( "all", "application", "Hudson Slave", "project-sysvpkg-3-slave", "1.1-2").desc(some("Hudson slave node")),
         PkginfoUtil.getPackageInfoForDevice(slave).some(),
         packageInfoEqual);
 
diff --git a/unix-maven-plugin/src/it/test-sysvpkg-classes/postbuild.groovy b/unix-maven-plugin/src/it/test-sysvpkg-classes/postbuild.groovy
old mode 100644
new mode 100755
index aec01b49..beb2829c
--- a/unix-maven-plugin/src/it/test-sysvpkg-classes/postbuild.groovy
+++ b/unix-maven-plugin/src/it/test-sysvpkg-classes/postbuild.groovy
@@ -1,10 +1,9 @@
 import static org.codehaus.mojo.unix.maven.plugin.ShittyUtil.*
 import static org.codehaus.mojo.unix.sysvpkg.PkgchkUtil.*
 import org.codehaus.mojo.unix.sysvpkg.PkginfoUtil
-import static fj.data.Option.*
 import fj.data.Option
 import org.joda.time.LocalDateTime
-import org.codehaus.mojo.unix.sysvpkg.PkginfoFile;
+import org.codehaus.mojo.unix.sysvpkg.Pkginfo;
 
 Option<LocalDateTime> ldtNone = Option.none()
 
@@ -13,7 +12,7 @@ boolean success = true
 File pkg = new File((File) basedir, "target/project-sysvpkg-classes-1.1.pkg")
 
 success &= assertRelaxed(
-        new PkginfoFile("all", "application", "Hudson", "project-sysvpkg-classes", "1.1"),
+        new Pkginfo("all", "application", "Hudson", "project-sysvpkg-classes", "1.1"),
         PkginfoUtil.getPackageInfoForDevice(pkg).some(), packageInfoEqual);
 
 // Ignore dates for now
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/MojoHelper.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/MojoHelper.java
old mode 100644
new mode 100755
index 64e2ef43..330936c4
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/MojoHelper.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/MojoHelper.java
@@ -71,16 +71,17 @@ public abstract class MojoHelper
     public static final String DUPLICATE_CLASSIFIER = "Duplicate package classifier: '%s'.";
     public static final String DUPLICATE_UNCLASSIFIED = "There can only be one package without an classifier.";
 
-    public static <UP extends UnixPackage<UP>> Execution create( Map platforms,
-                                    String platformType,
-                                    Map formats,
-                                    String formatType,
-                                    MavenProjectWrapper project,
-                                    boolean debug,
-                                    boolean attachedMode,
-                                    F<UP, UP> validateMojoSettingsAndApplyFormatSpecificSettingsToPackage,
-                                    PackagingMojoParameters mojoParameters,
-                                    final Log log )
+    public static <UP extends UnixPackage<UP, PP>, PP extends UnixPackage.PreparedPackage> Execution create(
+        Map platforms,
+        String platformType,
+        Map formats,
+        String formatType,
+        MavenProjectWrapper project,
+        boolean debug,
+        boolean attachedMode,
+        F<UP, UP> validateMojoSettingsAndApplyFormatSpecificSettingsToPackage,
+        PackagingMojoParameters mojoParameters,
+        final Log log )
         throws MojoFailureException, MojoExecutionException
     {
         MavenCommonLoggingLogFactory.setMavenLogger( log );
@@ -290,8 +291,8 @@ private void execute_( String artifactType, MavenProject mavenProject, MavenProj
 
                     File packageFile = new File( project.buildDirectory, name );
 
-                    unixPackage.
-                        packageToFile( packageFile, strategy );
+                    unixPackage.prepare( strategy ).
+                        packageToFile( packageFile );
 
                     attach( pakke.classifier, artifactType, packageFile, mavenProject, mavenProjectHelper,
                             attachedMode );
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/deb/DebPackagingFormat.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/deb/DebPackagingFormat.java
old mode 100644
new mode 100755
index d9d5ccbb..465ebf72
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/deb/DebPackagingFormat.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/deb/DebPackagingFormat.java
@@ -30,7 +30,7 @@
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
 public class DebPackagingFormat
-    implements PackagingFormat
+    implements PackagingFormat<DebUnixPackage>
 {
     public DebUnixPackage start()
     {
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/deb/DebUnixPackage.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/deb/DebUnixPackage.java
old mode 100644
new mode 100755
index 7d882818..038f9c14
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/deb/DebUnixPackage.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/deb/DebUnixPackage.java
@@ -45,7 +45,7 @@
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
 public class DebUnixPackage
-    extends UnixPackage<DebUnixPackage>
+    extends UnixPackage<DebUnixPackage, DebUnixPackage.DebPreparedPackage>
 {
     private ControlFile controlFile;
 
@@ -140,10 +140,10 @@ public void apply( F<UnixFsObject, Option<UnixFsObject>> f )
     //
     // -----------------------------------------------------------------------
 
-    public ScriptUtil.Result prepare( LocalFs fsRoot, ScriptUtil.Strategy strategy )
+    public DebPreparedPackage prepare( ScriptUtil.Strategy strategy )
         throws Exception
     {
-        LocalFs debian = fsRoot.resolve( relativePath( "DEBIAN" ) );
+        LocalFs debian = fileCollector.root.resolve( relativePath( "DEBIAN" ) );
         LocalFs controlFilePath = debian.resolve( relativePath( "control" ) );
 
         debian.mkdir();
@@ -151,35 +151,40 @@ public ScriptUtil.Result prepare( LocalFs fsRoot, ScriptUtil.Strategy strategy )
 
         fileCollector.collect();
 
-        return scriptUtil.
+        ScriptUtil.Result result = scriptUtil.
             createExecution( controlFile.packageName, "deb", getScripts(), debian.file, strategy ).
             execute();
+
+        return new DebPreparedPackage( result );
     }
 
-    public void packageToFile( File packageFile, ScriptUtil.Strategy strategy )
-        throws Exception
+    public class DebPreparedPackage
+        extends UnixPackage.PreparedPackage
     {
-        LocalFs fsRoot = fileCollector.root;
-
-        ScriptUtil.Result result = prepare( fsRoot, strategy );
+        private final ScriptUtil.Result result;
 
-        UnixUtil.chmodIf( result.preInstall, "0755" );
-        UnixUtil.chmodIf( result.postInstall, "0755" );
-        UnixUtil.chmodIf( result.preRemove, "0755" );
-        UnixUtil.chmodIf( result.postRemove, "0755" );
+        DebPreparedPackage( ScriptUtil.Result result )
+        {
+            this.result = result;
+        }
 
-        new DpkgDeb().
-            setDebug( debug ).
-            setPackageRoot( fsRoot.file ).
-            setDebFile( packageFile ).
-            setUseFakeroot( useFakeroot ).
-            setDpkgDeb( dpkgDeb ).
-            execute();
-    }
+        public void packageToFile( File packageFile )
+            throws Exception
+        {
 
-    public static DebUnixPackage cast( UnixPackage unixPackage )
-    {
-        return (DebUnixPackage) unixPackage;
+            UnixUtil.chmodIf( result.preInstall, "0755" );
+            UnixUtil.chmodIf( result.postInstall, "0755" );
+            UnixUtil.chmodIf( result.preRemove, "0755" );
+            UnixUtil.chmodIf( result.postRemove, "0755" );
+
+            new DpkgDeb().
+                setDebug( debug ).
+                setPackageRoot( fileCollector.root.file ).
+                setDebFile( packageFile ).
+                setUseFakeroot( useFakeroot ).
+                setDpkgDeb( dpkgDeb ).
+                execute();
+        }
     }
 
     // -----------------------------------------------------------------------
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/AbstractPackageAttachedMojo.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/AbstractPackageAttachedMojo.java
old mode 100644
new mode 100755
index 9544763b..7b313d94
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/AbstractPackageAttachedMojo.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/AbstractPackageAttachedMojo.java
@@ -34,7 +34,7 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
-public abstract class AbstractPackageAttachedMojo<UP extends UnixPackage<UP>>
+public abstract class AbstractPackageAttachedMojo<UP extends UnixPackage<UP, PP>, PP extends UnixPackage.PreparedPackage>
     extends AbstractUnixMojo
 {
     private final String platformType;
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/AbstractPackageMojo.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/AbstractPackageMojo.java
old mode 100644
new mode 100755
index ff7cbfe4..6e592cf2
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/AbstractPackageMojo.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/AbstractPackageMojo.java
@@ -34,7 +34,7 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
-public abstract class AbstractPackageMojo<UP extends UnixPackage<UP>>
+public abstract class AbstractPackageMojo<UP extends UnixPackage<UP, PP>, PP extends UnixPackage.PreparedPackage>
     extends AbstractUnixMojo
 {
     /**
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/FilterFiles.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/FilterFiles.java
old mode 100644
new mode 100755
index fce9ae99..4d031887
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/FilterFiles.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/FilterFiles.java
@@ -72,7 +72,6 @@ public void setLineEnding( String lineEnding )
         this.lineEnding = lineEnding;
     }
 
-    @Override
     public AssemblyOperation createOperation( CreateOperationContext context )
         throws MojoFailureException, UnknownArtifactException
     {
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageDebAttachedMojo.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageDebAttachedMojo.java
old mode 100644
new mode 100755
index 96c10f23..2a870fcf
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageDebAttachedMojo.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageDebAttachedMojo.java
@@ -36,7 +36,7 @@
  */
 @SuppressWarnings( "UnusedDeclaration" )
 public class PackageDebAttachedMojo
-    extends AbstractPackageAttachedMojo<DebUnixPackage>
+    extends AbstractPackageAttachedMojo<DebUnixPackage, DebUnixPackage.DebPreparedPackage>
 {
     /**
      * @parameter
@@ -52,7 +52,6 @@ protected F<DebUnixPackage, DebUnixPackage> getValidateMojoSettingsAndApplyForma
     {
         return new F<DebUnixPackage, DebUnixPackage>()
         {
-            @Override
             public DebUnixPackage f( DebUnixPackage debUnixPackage )
             {
                 return validateMojoSettingsAndApplyFormatSpecificSettingsToPackage( deb, debUnixPackage );
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageDebMojo.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageDebMojo.java
old mode 100644
new mode 100755
index d7e04e3b..3834f63f
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageDebMojo.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageDebMojo.java
@@ -36,7 +36,7 @@
  */
 @SuppressWarnings( "UnusedDeclaration" )
 public class PackageDebMojo
-    extends AbstractPackageMojo<DebUnixPackage>
+    extends AbstractPackageMojo<DebUnixPackage, DebUnixPackage.DebPreparedPackage>
 {
     /**
      * @parameter
@@ -48,12 +48,10 @@ public PackageDebMojo()
         super( "linux", "deb", "deb" );
     }
 
-    @Override
     protected F<DebUnixPackage, DebUnixPackage> getValidateMojoSettingsAndApplyFormatSpecificSettingsToPackageF()
     {
         return new F<DebUnixPackage, DebUnixPackage>()
         {
-            @Override
             public DebUnixPackage f( DebUnixPackage unixPackage )
             {
                 return validateMojoSettingsAndApplyFormatSpecificSettingsToPackage( deb, unixPackage );
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageRpmAttachedMojo.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageRpmAttachedMojo.java
old mode 100644
new mode 100755
index fec93350..7e4dec67
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageRpmAttachedMojo.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageRpmAttachedMojo.java
@@ -36,7 +36,7 @@
  */
 @SuppressWarnings( "UnusedDeclaration" )
 public class PackageRpmAttachedMojo
-    extends AbstractPackageAttachedMojo<RpmUnixPackage>
+    extends AbstractPackageAttachedMojo<RpmUnixPackage, RpmUnixPackage.RpmPreparedPackage>
 {
     /**
      * @parameter
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageRpmMojo.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageRpmMojo.java
old mode 100644
new mode 100755
index 2332c4dd..7d990957
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageRpmMojo.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageRpmMojo.java
@@ -36,7 +36,7 @@
  */
 @SuppressWarnings( "UnusedDeclaration" )
 public class PackageRpmMojo
-    extends AbstractPackageMojo<RpmUnixPackage>
+    extends AbstractPackageMojo<RpmUnixPackage, RpmUnixPackage.RpmPreparedPackage>
 {
     /**
      * @parameter
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageSysvPkgAttachedMojo.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageSysvPkgAttachedMojo.java
old mode 100644
new mode 100755
index be24d33f..846fd1ac
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageSysvPkgAttachedMojo.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageSysvPkgAttachedMojo.java
@@ -36,7 +36,7 @@
  */
 @SuppressWarnings( "UnusedDeclaration" )
 public class PackageSysvPkgAttachedMojo
-    extends AbstractPackageAttachedMojo<PkgUnixPackage>
+    extends AbstractPackageAttachedMojo<PkgUnixPackage, PkgUnixPackage.PkgPreparedPackage>
 {
     /**
      * @parameter
@@ -48,12 +48,10 @@ public PackageSysvPkgAttachedMojo()
         super( "solaris", "sysvpkg", "pkg" );
     }
 
-    @Override
     protected F<PkgUnixPackage, PkgUnixPackage> getValidateMojoSettingsAndApplyFormatSpecificSettingsToPackageF()
     {
         return new F<PkgUnixPackage, PkgUnixPackage>()
         {
-            @Override
             public PkgUnixPackage f( PkgUnixPackage unixPackage )
             {
                 return validateMojoSettingsAndApplyFormatSpecificSettingsToPackage( pkg, unixPackage );
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageSysvPkgMojo.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageSysvPkgMojo.java
old mode 100644
new mode 100755
index 794f6daa..d5202878
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageSysvPkgMojo.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageSysvPkgMojo.java
@@ -52,7 +52,6 @@ protected F<PkgUnixPackage, PkgUnixPackage> getValidateMojoSettingsAndApplyForma
     {
         return new F<PkgUnixPackage, PkgUnixPackage>()
         {
-            @Override
             public PkgUnixPackage f( PkgUnixPackage unixPackage )
             {
                 return validateMojoSettingsAndApplyFormatSpecificSettingsToPackage( pkg, unixPackage );
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageZipMojo.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageZipMojo.java
old mode 100644
new mode 100755
index eb9672f1..cfa1e412
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageZipMojo.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/PackageZipMojo.java
@@ -36,7 +36,7 @@
  */
 @SuppressWarnings( "UnusedDeclaration" )
 public class PackageZipMojo
-    extends AbstractPackageMojo<ZipUnixPackage>
+    extends AbstractPackageMojo<ZipUnixPackage, ZipUnixPackage.ZipPreparedPackage>
 {
     public PackageZipMojo()
     {
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmPackagingFormat.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmPackagingFormat.java
old mode 100644
new mode 100755
index ecae1bf4..a49a8abe
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmPackagingFormat.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmPackagingFormat.java
@@ -31,7 +31,7 @@
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
 public class RpmPackagingFormat
-    implements PackagingFormat
+    implements PackagingFormat<RpmUnixPackage>
 {
     public RpmUnixPackage start()
     {
@@ -47,9 +47,4 @@ public String defaultArchitecture()
     {
         return "all";
     }
-
-    public static RpmUnixPackage cast( UnixPackage unixPackage )
-    {
-        return (RpmUnixPackage) unixPackage;
-    }
 }
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackage.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackage.java
old mode 100644
new mode 100755
index 367ee01b..3448e879
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackage.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackage.java
@@ -44,7 +44,7 @@
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
 public class RpmUnixPackage
-    extends UnixPackage<RpmUnixPackage>
+    extends UnixPackage<RpmUnixPackage, RpmUnixPackage.RpmPreparedPackage>
 {
     private SpecFile specFile;
 
@@ -127,9 +127,10 @@ public void addSymlink( UnixFsObject.Symlink symlink )
     public void apply( F<UnixFsObject, Option<UnixFsObject>> f )
     {
         specFile.apply( f );
+        fileCollector.apply( f );
     }
 
-    public P2<File, File> prepare( ScriptUtil.Strategy strategy )
+    public RpmPreparedPackage prepare( ScriptUtil.Strategy strategy )
         throws Exception
     {
         File rpms = new File( workingDirectory.file, "RPMS" );
@@ -159,38 +160,42 @@ public P2<File, File> prepare( ScriptUtil.Strategy strategy )
 
         LineStreamUtil.toFile( specFile, specFilePath );
 
-        return p( tmp, specFilePath );
+        return new RpmPreparedPackage( tmp, specFilePath );
     }
 
-    public void packageToFile( File packageFile, ScriptUtil.Strategy strategy )
-        throws Exception
+    public class RpmPreparedPackage
+        extends UnixPackage.PreparedPackage
     {
-        P2<File, File> p =  prepare( strategy );
-
-        File tmp = p._1();
-        File specFilePath = p._2();
-
-        new Rpmbuild().
-            setDebug( debug ).
-            setBuildroot( specFile.buildRoot ).
-            define( "_tmppath " + tmp.getAbsolutePath() ).
-            define( "_topdir " + workingDirectory.file.getAbsolutePath() ).
-            define( "_rpmdir " + packageFile.getParentFile().getAbsolutePath() ).
-            define( "_rpmfilename " + packageFile.getName() ).
-            setSpecFile( specFilePath ).
-            setRpmbuild( rpmbuild ).
-            buildBinary();
+        private final File tmp;
+
+        private final File specFilePath;
+
+        RpmPreparedPackage( File tmp, File specFilePath )
+        {
+            this.tmp = tmp;
+            this.specFilePath = specFilePath;
+        }
+
+        public void packageToFile( File packageFile )
+            throws Exception
+        {
+            new Rpmbuild().
+                setDebug( debug ).
+                setBuildroot( specFile.buildRoot ).
+                define( "_tmppath " + tmp.getAbsolutePath() ).
+                define( "_topdir " + workingDirectory.file.getAbsolutePath() ).
+                define( "_rpmdir " + packageFile.getParentFile().getAbsolutePath() ).
+                define( "_rpmfilename " + packageFile.getName() ).
+                setSpecFile( specFilePath ).
+                setRpmbuild( rpmbuild ).
+                buildBinary();
+        }
     }
 
     // -----------------------------------------------------------------------
     // Static
     // -----------------------------------------------------------------------
 
-    public static RpmUnixPackage cast( UnixPackage unixPackage )
-    {
-        return (RpmUnixPackage) unixPackage;
-    }
-
     public static P2<String, String> getRpmVersion( PackageVersion version )
     {
         String rpmVersionString = version.version;
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/sysvpkg/PkgUnixPackage.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/sysvpkg/PkgUnixPackage.java
old mode 100644
new mode 100755
index 75aebae4..952c60f2
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/sysvpkg/PkgUnixPackage.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/sysvpkg/PkgUnixPackage.java
@@ -33,7 +33,7 @@
 import static org.codehaus.mojo.unix.FileAttributes.*;
 import org.codehaus.mojo.unix.UnixFsObject.*;
 import static org.codehaus.mojo.unix.UnixFsObject.*;
-
+import static org.codehaus.mojo.unix.core.FsFileCollector.*;
 import org.codehaus.mojo.unix.io.*;
 import org.codehaus.mojo.unix.io.fs.*;
 import org.codehaus.mojo.unix.sysvpkg.*;
@@ -52,10 +52,10 @@
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
 public class PkgUnixPackage
-    extends UnixPackage<PkgUnixPackage>
+    extends UnixPackage<PkgUnixPackage, PkgUnixPackage.PkgPreparedPackage>
 {
     private LocalFs prototype;
-    private LocalFs pkginfo;
+    private LocalFs pkginfoFile;
     private boolean debug;
 
     private static final ScriptUtil scriptUtil = new ScriptUtil( "preinstall", "postinstall", "preremove", "postremove" ).
@@ -68,7 +68,7 @@ public class PkgUnixPackage
 
     private PrototypeFile prototypeFile;
 
-    private PkginfoFile pkginfoFile;
+    private Pkginfo pkginfo;
 
     private List<IoEffect> operations = nil();
 
@@ -82,11 +82,11 @@ public PkgUnixPackage()
     public PkgUnixPackage parameters( PackageParameters parameters )
     {
         this.classifier = parameters.classifier;
-        pkginfoFile = new PkginfoFile( parameters.architecture.orSome( "all" ),
-                                       "application",
-                                       parameters.name,
-                                       parameters.id,
-                                       getPkgVersion( parameters.version ) ).
+        pkginfo = new Pkginfo( parameters.architecture.orSome( "all" ),
+                               "application",
+                               parameters.name,
+                               parameters.id,
+                               getPkgVersion( parameters.version ) ).
             desc( parameters.description ).
             email( parameters.contactEmail ).
             pstamp( some( parameters.version.timestamp ) ).
@@ -109,7 +109,7 @@ public void beforeAssembly( FileAttributes defaultDirectoryAttributes, LocalDate
         throws IOException
     {
         prototype = workingDirectory.resolve( relativePath( "prototype" ) );
-        pkginfo = workingDirectory.resolve( relativePath( "pkginfo" ) );
+        pkginfoFile = workingDirectory.resolve( relativePath( "pkginfo" ) );
 
         Directory defaultDirectory = directory( BASE, fromDateFields( new Date( 0 ) ), defaultDirectoryAttributes );
         DirectoryEntry directoryEntry = new DirectoryEntry( Option.<String>none(), defaultDirectory );
@@ -123,30 +123,26 @@ public void beforeAssembly( FileAttributes defaultDirectoryAttributes, LocalDate
 
     public PkgUnixPackage pkgParameters( List<String> classes, Option<String> category )
     {
-        pkginfoFile = pkginfoFile.
-            category( category.orSome( pkginfoFile.category ) ).
+        pkginfo = pkginfo.
+            category( category.orSome( pkginfo.category ) ).
             classes( classes );
 
         return this;
     }
 
-    public void packageToFile( File packageFile, ScriptUtil.Strategy strategy )
+    public PkgPreparedPackage prepare( ScriptUtil.Strategy strategy )
         throws Exception
     {
+        workingDirectory.mkdir();
+
         // -----------------------------------------------------------------------
         // Validate that the prototype looks sane
         // -----------------------------------------------------------------------
 
         // TODO: This should be more configurable
-        RelativePath[] specialPaths = new RelativePath[]{
-            BASE,
-            relativePath( "/etc" ),
-            relativePath( "/etc/opt" ),
-            relativePath( "/opt" ),
-            relativePath( "/usr" ),
-            relativePath( "/var" ),
-            relativePath( "/var/opt" ),
-        };
+        RelativePath[] specialPaths =
+            new RelativePath[]{ BASE, relativePath( "/etc" ), relativePath( "/etc/opt" ), relativePath( "/opt" ),
+                relativePath( "/usr" ), relativePath( "/var" ), relativePath( "/var/opt" ), };
 
         // TODO: This should use setDirectoryAttributes
         for ( RelativePath specialPath : specialPaths )
@@ -166,11 +162,9 @@ public void packageToFile( File packageFile, ScriptUtil.Strategy strategy )
             createExecution( classifier.orSome( "default" ), "pkg", getScripts(), workingDirectory.file, strategy ).
             execute();
 
-        LineStreamUtil.toFile( pkginfoFile.toList(), pkginfo.file );
+        LineStreamUtil.toFile( pkginfo.toList(), pkginfoFile.file );
 
-        String pkg = pkginfoFile.getPkgName( pkginfo.file );
-
-        prototypeFile.addIFileIf( pkginfo.file, "pkginfo" );
+        prototypeFile.addIFileIf( pkginfoFile.file, "pkginfo" );
         prototypeFile.addIFileIf( result.preInstall, "preinstall" );
         prototypeFile.addIFileIf( result.postInstall, "postinstall" );
         prototypeFile.addIFileIf( result.preRemove, "preremove" );
@@ -180,9 +174,6 @@ public void packageToFile( File packageFile, ScriptUtil.Strategy strategy )
             prototypeFile.addIFileIf( file );
         }
 
-        workingDirectory.resolve( relativePath( "assembly" ) );
-
-        // TODO: Replace this with an Actor-based execution
         for ( IoEffect operation : operations )
         {
             operation.run();
@@ -190,18 +181,30 @@ public void packageToFile( File packageFile, ScriptUtil.Strategy strategy )
 
         LineStreamUtil.toFile( prototypeFile, prototype.file );
 
-        new PkgmkCommand().
-            setDebug( debug ).
-            setOverwrite( true ).
-            setDevice( workingDirectory.file ).
-            setPrototype( prototype.file ).
-            execute();
+        return new PkgPreparedPackage();
+    }
 
-        new PkgtransCommand().
-            setDebug( debug ).
-            setAsDatastream( true ).
-            setOverwrite( true ).
-            execute( workingDirectory.file, packageFile, pkg );
+    public class PkgPreparedPackage
+        extends UnixPackage.PreparedPackage
+    {
+        public void packageToFile( File packageFile )
+            throws Exception
+        {
+            String pkg = pkginfo.getPkgName( pkginfoFile.file );
+
+            new PkgmkCommand().
+                setDebug( debug ).
+                setOverwrite( true ).
+                setDevice( workingDirectory.file ).
+                setPrototype( prototype.file ).
+                execute();
+
+            new PkgtransCommand().
+                setDebug( debug ).
+                setAsDatastream( true ).
+                setOverwrite( true ).
+                execute( workingDirectory.file, packageFile, pkg );
+        }
     }
 
     public static String getPkgVersion( PackageVersion v )
@@ -244,25 +247,20 @@ public void apply( F<UnixFsObject, Option<UnixFsObject>> f )
         prototypeFile.apply( f );
     }
 
-    public static PkgUnixPackage cast( UnixPackage unixPackage )
-    {
-        return PkgUnixPackage.class.cast( unixPackage );
-    }
-
     // -----------------------------------------------------------------------
     //
     // -----------------------------------------------------------------------
 
-    public LocalFs fromFile( final Fs<?> fromFile, UnixFsObject.RegularFile file )
+    public LocalFs fromFile( final Fs<?> fromFile, final UnixFsObject.RegularFile file )
     {
         // If it is a file on the local file system, just point the entry in the prototype file to it
-        if ( fromFile instanceof LocalFs )
+        if ( fromFile instanceof LocalFs && !needsFiltering( file ) )
         {
             return (LocalFs) fromFile;
         }
 
         // Creates a file under the working directory that should match the destination path
-        final LocalFs tmpFile = workingDirectory.resolve( file.path );
+        final LocalFs tmpFile = workingDirectory.resolve( relativePath( "assembly" ).add( file.path ) );
 
         operations = operations.cons( new IoEffect()
         {
@@ -272,8 +270,11 @@ public void run()
                 OutputStream outputStream = null;
                 try
                 {
+                    P2<InputStream, Option<Long>> p2 =
+                        filtersAndLineEndingHandingInputStream( file, fromFile.inputStream() );
+
                     tmpFile.parent().mkdir();
-                    tmpFile.copyFrom( fromFile );
+                    tmpFile.copyFrom( fromFile, p2._1() );
                 }
                 finally
                 {
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/sysvpkg/SysvPkgPackagingFormat.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/sysvpkg/SysvPkgPackagingFormat.java
old mode 100644
new mode 100755
index c353ba21..98a38d53
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/sysvpkg/SysvPkgPackagingFormat.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/sysvpkg/SysvPkgPackagingFormat.java
@@ -24,16 +24,15 @@
  * SOFTWARE.
  */
 
-import org.codehaus.mojo.unix.*;
 import org.codehaus.mojo.unix.maven.plugin.*;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
 public class SysvPkgPackagingFormat
-    implements PackagingFormat
+    implements PackagingFormat<PkgUnixPackage>
 {
-    public UnixPackage start()
+    public PkgUnixPackage start()
     {
         return new PkgUnixPackage();
     }
@@ -47,9 +46,4 @@ public String defaultArchitecture()
     {
         return "all";
     }
-
-    public static PkgUnixPackage cast( UnixPackage unixPackage )
-    {
-        return (PkgUnixPackage) unixPackage;
-    }
 }
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/zip/ZipPackagingFormat.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/zip/ZipPackagingFormat.java
old mode 100644
new mode 100755
index bbbbd507..3b5bb44b
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/zip/ZipPackagingFormat.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/zip/ZipPackagingFormat.java
@@ -24,16 +24,15 @@
  * SOFTWARE.
  */
 
-import org.codehaus.mojo.unix.*;
 import org.codehaus.mojo.unix.maven.plugin.*;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
 public class ZipPackagingFormat
-    implements PackagingFormat
+    implements PackagingFormat<ZipUnixPackage>
 {
-    public UnixPackage start()
+    public ZipUnixPackage start()
     {
         return new ZipUnixPackage();
     }
@@ -42,14 +41,4 @@ public boolean licenseRequired()
     {
         return false;
     }
-
-    public String defaultArchitecture()
-    {
-        return "all";
-    }
-
-    public static ZipUnixPackage cast( UnixPackage unixPackage )
-    {
-        return (ZipUnixPackage) unixPackage;
-    }
 }
diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/zip/ZipUnixPackage.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/zip/ZipUnixPackage.java
old mode 100644
new mode 100755
index bab17642..af78ce46
--- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/zip/ZipUnixPackage.java
+++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/zip/ZipUnixPackage.java
@@ -47,7 +47,7 @@
 import java.util.zip.*;
 
 public class ZipUnixPackage
-    extends UnixPackage<ZipUnixPackage>
+    extends UnixPackage<ZipUnixPackage, ZipUnixPackage.ZipPreparedPackage>
 {
     private PackageFileSystem<F2<UnixFsObject, ZipArchiveOutputStream, IoEffect>> fileSystem;
 
@@ -99,33 +99,43 @@ public void beforeAssembly( FileAttributes defaultDirectoryAttributes, LocalDate
         fileSystem = create( directory( rootDirectory ), directory( rootDirectory ) );
     }
 
-    public void packageToFile( File packageFile, ScriptUtil.Strategy strategy )
+    public ZipPreparedPackage prepare( ScriptUtil.Strategy strategy )
         throws Exception
     {
-        F2<RelativePath, PackageFileSystemObject<F2<UnixFsObject, ZipArchiveOutputStream, IoEffect>>, Boolean> pathFilter =
-            pathFilter();
+        return new ZipPreparedPackage();
+    }
 
-        fileSystem = fileSystem.prettify();
+    public class ZipPreparedPackage
+        extends UnixPackage.PreparedPackage
+    {
+        public void packageToFile( File packageFile )
+            throws Exception
+        {
+            F2<RelativePath, PackageFileSystemObject<F2<UnixFsObject, ZipArchiveOutputStream, IoEffect>>, Boolean>
+                pathFilter = pathFilter();
 
-        Stream<PackageFileSystemObject<F2<UnixFsObject, ZipArchiveOutputStream, IoEffect>>> items = fileSystem.
-            toList().
-            filter( compose( BooleanF.invert, curry( pathFilter, BASE ) ) );
+            fileSystem = fileSystem.prettify();
 
-        ZipArchiveOutputStream zos = null;
-        try
-        {
-            zos = new ZipArchiveOutputStream( packageFile );
-            zos.setLevel( Deflater.BEST_COMPRESSION );
+            Stream<PackageFileSystemObject<F2<UnixFsObject, ZipArchiveOutputStream, IoEffect>>> items = fileSystem.
+                toList().
+                filter( compose( BooleanF.invert, curry( pathFilter, BASE ) ) );
+
+            ZipArchiveOutputStream zos = null;
+            try
+            {
+                zos = new ZipArchiveOutputStream( packageFile );
+                zos.setLevel( Deflater.BEST_COMPRESSION );
 
-            for ( PackageFileSystemObject<F2<UnixFsObject, ZipArchiveOutputStream, IoEffect>> fileSystemObject : items )
+                for ( PackageFileSystemObject<F2<UnixFsObject, ZipArchiveOutputStream, IoEffect>> fileSystemObject : items )
+                {
+                    fileSystemObject.getExtension().f( fileSystemObject.getUnixFsObject(), zos ).run();
+                }
+            }
+            finally
             {
-                fileSystemObject.getExtension().f( fileSystemObject.getUnixFsObject(), zos ).run();
+                IOUtil.close( zos );
             }
         }
-        finally
-        {
-            IOUtil.close( zos );
-        }
     }
 
     public static <A> F2<RelativePath, PackageFileSystemObject<A>, Boolean> pathFilter()
diff --git a/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/UnixPackageTestUtil.java b/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/UnixPackageTestUtil.java
new file mode 100755
index 00000000..fe6bb4a4
--- /dev/null
+++ b/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/UnixPackageTestUtil.java
@@ -0,0 +1,83 @@
+package org.codehaus.mojo.unix.maven;
+
+import fj.data.*;
+import static fj.data.List.*;
+import static fj.data.Option.*;
+import static java.util.regex.Pattern.*;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+import static org.codehaus.mojo.unix.FileAttributes.*;
+import org.codehaus.mojo.unix.*;
+import static org.codehaus.mojo.unix.PackageParameters.*;
+import static org.codehaus.mojo.unix.PackageVersion.*;
+import static org.codehaus.mojo.unix.UnixFsObject.*;
+import static org.codehaus.mojo.unix.io.LineEnding.*;
+import org.codehaus.mojo.unix.io.fs.*;
+import org.codehaus.mojo.unix.maven.plugin.*;
+import static org.codehaus.mojo.unix.util.RelativePath.*;
+import static org.codehaus.mojo.unix.util.ScriptUtil.Strategy.*;
+import static org.codehaus.plexus.PlexusTestCase.*;
+import static org.codehaus.plexus.util.FileUtils.*;
+import org.joda.time.*;
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
+ */
+public class UnixPackageTestUtil<UP extends UnixPackage<UP, PP>, PP extends UnixPackage.PreparedPackage>
+{
+    private final String id;
+
+    private final PackagingFormat<UP> packagingFormat;
+
+    private final LocalDateTime now = new LocalDateTime();
+
+    private static final PackageVersion version = packageVersion( "1.0", "123", false, some( "1" ) );
+
+    public final PackageParameters parameters =
+        packageParameters( "mygroup", "myartifact", version, "id", "default-name", Option.<java.lang.String>none(),
+                           EMPTY, EMPTY ).
+            contact( "Kurt Cobain" ).
+            architecture( "all" ).
+            license( "BSD" );
+
+    public UnixPackageTestUtil( String id, PackagingFormat<UP> packagingFormat )
+    {
+        this.id = id;
+        this.packagingFormat = packagingFormat;
+    }
+
+    protected UP extraStuff( UP up )
+    {
+        return up;
+    }
+
+    public void testFiltering()
+        throws Exception
+    {
+        LocalFs resources = new LocalFs( getTestFile( "src/test/resources/test-filtering" ) );
+        LocalFs root = new LocalFs( getTestFile( "target/filtering-" + id ) );
+        deleteDirectory( root.file );
+        root.mkdir();
+        LocalFs workingDirectory = root.resolve( "working-directory" );
+
+        UP pkg = packagingFormat.start().
+            parameters( parameters ).
+            debug( true ).
+            workingDirectory( workingDirectory );
+
+        pkg = extraStuff( pkg );
+
+        pkg.beforeAssembly( EMPTY, now );
+        List<UnixFsObject.Replacer> replacers =
+            single( new UnixFsObject.Replacer( compile( quote( "${project.version}" ) ), "1.0" ) );
+        UnixFsObject.RegularFile file =
+            regularFile( relativePath( "/config.properties" ), now, 0, EMPTY, replacers, unix );
+        pkg.addFile( resources.resolve( "config.properties" ), file );
+
+        pkg.prepare( SINGLE );
+
+        LocalFs config = workingDirectory.resolve( "assembly" ).resolve( "config.properties" );
+        assertTrue( config.isFile() );
+        assertEquals( 12, config.size() );
+    }
+}
diff --git a/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/deb/DebUnixPackageTest.java b/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/deb/DebUnixPackageTest.java
old mode 100644
new mode 100755
index 112939f1..4f70934b
--- a/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/deb/DebUnixPackageTest.java
+++ b/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/deb/DebUnixPackageTest.java
@@ -25,19 +25,15 @@
  */
 
 import fj.data.*;
-import static fj.data.List.*;
 import static fj.data.Option.*;
-import static java.util.regex.Pattern.*;
 import static org.codehaus.mojo.unix.FileAttributes.*;
 import org.codehaus.mojo.unix.*;
 import static org.codehaus.mojo.unix.PackageParameters.*;
 import static org.codehaus.mojo.unix.PackageVersion.*;
-import static org.codehaus.mojo.unix.UnixFsObject.*;
 import org.codehaus.mojo.unix.deb.*;
-import static org.codehaus.mojo.unix.io.LineEnding.*;
 import org.codehaus.mojo.unix.io.fs.*;
+import org.codehaus.mojo.unix.maven.*;
 import org.codehaus.mojo.unix.maven.plugin.*;
-import static org.codehaus.mojo.unix.util.RelativePath.*;
 import static org.codehaus.mojo.unix.util.ScriptUtil.Strategy.*;
 import org.codehaus.plexus.*;
 import org.joda.time.*;
@@ -51,28 +47,23 @@ public class DebUnixPackageTest
     extends PlexusTestCase
 {
     private final LocalDateTime now = new LocalDateTime();
+
     private final PackageVersion version = packageVersion( "1.0", "123", false, some( "1" ) );
 
+    final PackageParameters parameters =
+        packageParameters( "mygroup", "myartifact", version, "id", "default-name", Option.<java.lang.String>none(),
+                           EMPTY, EMPTY ).
+            contact( "Kurt Cobain" ).
+            architecture( "all" );
+
     public void testBasic()
         throws Exception
     {
-        if ( !new DpkgDeb().available() )
-        {
-            System.err.println( "Skipping test: " + super.getName() );
-            return;
-        }
-
         DebPackagingFormat packagingFormat = (DebPackagingFormat) lookup( PackagingFormat.ROLE, "deb" );
 
         LocalFs root = new LocalFs( getTestFile( "target/deb-test" ) );
         File packageFile = root.resolve( "file.deb" ).file;
 
-        PackageVersion version = packageVersion( "1.0", "123", false, some( "1" ) );
-        PackageParameters parameters = packageParameters( "mygroup", "myartifact", version, "id", "default-name",
-                                                          Option.<java.lang.String>none(), EMPTY, EMPTY ).
-            contact( "Kurt Cobain" ).
-            architecture( "all" );
-
         List<String> nil = List.nil();
         UnixPackage pkg = packagingFormat.start().
             parameters( parameters ).
@@ -81,7 +72,15 @@ public void testBasic()
             debug( true ).
             workingDirectory( root.resolve( "working-directory" ) );
         pkg.beforeAssembly( EMPTY, now );
-        pkg.packageToFile( packageFile, SINGLE );
+        UnixPackage.PreparedPackage preparedPackage = pkg.prepare( SINGLE );
+
+        if ( !new DpkgDeb().available() )
+        {
+            System.err.println( "Skipping test: " + super.getName() );
+            return;
+        }
+
+        preparedPackage.packageToFile( packageFile );
 
         assertTrue( packageFile.canRead() );
     }
@@ -91,25 +90,6 @@ public void testFiltering()
     {
         DebPackagingFormat packagingFormat = (DebPackagingFormat) lookup( PackagingFormat.ROLE, "deb" );
 
-        LocalFs resources = new LocalFs( getTestFile( "src/test/resources/deb" ) );
-        LocalFs root = new LocalFs( getTestFile( "target/deb-filtering" ) );
-        LocalFs workingDirectory = root.resolve( "working-directory" );
-
-        PackageParameters parameters = packageParameters( "mygroup", "myartifact", version, "id", "default-name",
-                                                          Option.<java.lang.String>none(), EMPTY, EMPTY );
-
-        UnixPackage pkg = packagingFormat.start().
-            parameters( parameters ).
-            debug( true ).
-            workingDirectory( workingDirectory );
-        pkg.beforeAssembly( EMPTY, now );
-        List<Replacer> replacers = single( new Replacer( compile( quote( "${project.version}" ) ), "1.0" ) );
-        RegularFile file = regularFile( relativePath( "/config.properties" ), now, 0, EMPTY, replacers, unix );
-        pkg.addFile( resources.resolve( "config.properties" ), file );
-        DebUnixPackage.cast( pkg ).prepare( root, SINGLE );
-
-        LocalFs config = workingDirectory.resolve( "assembly" ).resolve( "config.properties" );
-        assertTrue( config.isFile() );
-        assertEquals( 12, config.size() );
+        new UnixPackageTestUtil<DebUnixPackage, DebUnixPackage.DebPreparedPackage>( "deb", packagingFormat ).testFiltering();
     }
 }
diff --git a/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/pkg/PkgUnixPackageTest.java b/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/pkg/PkgUnixPackageTest.java
new file mode 100755
index 00000000..a2b63c07
--- /dev/null
+++ b/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/pkg/PkgUnixPackageTest.java
@@ -0,0 +1,21 @@
+package org.codehaus.mojo.unix.maven.pkg;
+
+import org.codehaus.mojo.unix.maven.*;
+import org.codehaus.mojo.unix.maven.plugin.*;
+import org.codehaus.mojo.unix.maven.sysvpkg.*;
+import org.codehaus.plexus.*;
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
+ */
+public class PkgUnixPackageTest
+    extends PlexusTestCase
+{
+    public void testFiltering()
+        throws Exception
+    {
+        SysvPkgPackagingFormat packagingFormat = (SysvPkgPackagingFormat) lookup( PackagingFormat.ROLE, "sysvpkg" );
+
+        new UnixPackageTestUtil<PkgUnixPackage, PkgUnixPackage.PkgPreparedPackage>( "pkg", packagingFormat ).testFiltering();
+    }
+}
diff --git a/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/plugin/ShittyUtil.java b/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/plugin/ShittyUtil.java
old mode 100644
new mode 100755
index 737889cf..a92b172d
--- a/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/plugin/ShittyUtil.java
+++ b/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/plugin/ShittyUtil.java
@@ -401,13 +401,13 @@ public P2<RelativePath, UnixFsObject> f( UnixFsObject unixFsObject )
             }
         };
 
-    public static final Equal<PkginfoFile> packageInfoEqual = Equal.equal( new F<PkginfoFile, F<PkginfoFile, Boolean>>()
+    public static final Equal<Pkginfo> packageInfoEqual = Equal.equal( new F<Pkginfo, F<Pkginfo, Boolean>>()
     {
-        public F<PkginfoFile, Boolean> f( final PkginfoFile tis )
+        public F<Pkginfo, Boolean> f( final Pkginfo tis )
         {
-            return new F<PkginfoFile, Boolean>()
+            return new F<Pkginfo, Boolean>()
             {
-                public Boolean f( PkginfoFile that )
+                public Boolean f( Pkginfo that )
                 {
                     Equal<Option<String>> optionStringEqual = Equal.equal( Function.curry( new F2<Option<String>, Option<String>, Boolean>()
                     {
diff --git a/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackageTest.java b/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackageTest.java
old mode 100644
new mode 100755
index c5cbd483..a62d566a
--- a/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackageTest.java
+++ b/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackageTest.java
@@ -32,12 +32,13 @@
 import static org.codehaus.mojo.unix.UnixFsObject.*;
 
 import org.codehaus.mojo.unix.io.fs.*;
+import org.codehaus.mojo.unix.maven.*;
 import org.codehaus.mojo.unix.maven.plugin.*;
 import org.codehaus.mojo.unix.rpm.*;
 
 import static org.codehaus.mojo.unix.io.fs.FsUtil.resolve;
 import static org.codehaus.mojo.unix.util.RelativePath.*;
-import org.codehaus.mojo.unix.util.*;
+import static org.codehaus.mojo.unix.util.ScriptUtil.Strategy.SINGLE;
 import org.codehaus.plexus.*;
 import org.joda.time.*;
 
@@ -83,9 +84,9 @@ public void testBasic()
         unixPackage.addFile( fooLicense, regularFile( relativePath( "/foo-license.txt" ), now, 0, EMPTY ) );
         unixPackage.addFile( barLicense, regularFile( relativePath( "/bar-license.txt" ), now, 0, EMPTY ) );
 
-        unixPackage.
+        RpmUnixPackage.RpmPreparedPackage preparedPackage = unixPackage.
             debug( true ).
-            prepare( ScriptUtil.Strategy.SINGLE );
+            prepare( SINGLE );
 
         if ( !new Rpmbuild().available() )
         {
@@ -93,9 +94,25 @@ public void testBasic()
             return;
         }
 
-        unixPackage.
-            packageToFile( packageFile, ScriptUtil.Strategy.SINGLE );
+        preparedPackage.
+            packageToFile( packageFile );
 
         assertTrue( packageFile.canRead() );
     }
+
+    public void testFiltering()
+        throws Exception
+    {
+        RpmPackagingFormat packagingFormat = (RpmPackagingFormat) lookup( PackagingFormat.ROLE, "rpm" );
+
+        UnixPackageTestUtil<RpmUnixPackage, RpmUnixPackage.RpmPreparedPackage> unixPackageTestUtil =
+            new UnixPackageTestUtil<RpmUnixPackage, RpmUnixPackage.RpmPreparedPackage>( "rpm", packagingFormat  )
+            {
+                protected RpmUnixPackage extraStuff( RpmUnixPackage rpmUnixPackage )
+                {
+                    return rpmUnixPackage.rpmParameters( "my-group", Option.<String>none() );
+                }
+            };
+        unixPackageTestUtil.testFiltering();
+    }
 }
diff --git a/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/zip/ZipPackageTest.java b/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/zip/ZipPackageTest.java
old mode 100644
new mode 100755
index 5a4872e3..f2e6dace
--- a/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/zip/ZipPackageTest.java
+++ b/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/zip/ZipPackageTest.java
@@ -34,12 +34,14 @@
 import org.apache.commons.compress.archivers.zip.*;
 import org.codehaus.mojo.unix.*;
 import static org.codehaus.mojo.unix.FileAttributes.*;
+import static org.codehaus.mojo.unix.UnixFileMode._0777;
 import static org.codehaus.mojo.unix.UnixFsObject.*;
 import org.codehaus.mojo.unix.core.*;
 import org.codehaus.mojo.unix.io.LineEnding;
 import org.codehaus.mojo.unix.io.fs.*;
 import static org.codehaus.mojo.unix.util.RelativePath.*;
 import org.codehaus.mojo.unix.util.*;
+import static org.codehaus.mojo.unix.util.ScriptUtil.Strategy.SINGLE;
 import org.joda.time.*;
 
 import java.io.*;
@@ -108,7 +110,7 @@ public void testBasic()
             perform( zipPackage );
 
         UnixFileMode fileMode = UnixFileMode.fromInt( 0600 );
-        UnixFileMode dirMode = UnixFileMode.fromInt( 0777 );
+        UnixFileMode dirMode = _0777;
 
         FileAttributes fileAttributes = new FileAttributes( "root", "root", fileMode );
         FileAttributes directoryAttributes = new FileAttributes( "root", "root", dirMode );
@@ -117,7 +119,8 @@ public void testBasic()
             perform( zipPackage );
 
         zipPackage.
-            packageToFile( zip, ScriptUtil.Strategy.SINGLE );
+            prepare( SINGLE ).
+            packageToFile( zip );
 
         ZipFile file = new ZipFile( zip );
         Enumeration<ZipArchiveEntry> enumeration = file.getEntriesInPhysicalOrder();
diff --git a/unix-maven-plugin/src/test/resources/test-filtering/config.properties b/unix-maven-plugin/src/test/resources/test-filtering/config.properties
new file mode 100644
index 00000000..defbd482
--- /dev/null
+++ b/unix-maven-plugin/src/test/resources/test-filtering/config.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/unix-sysv-pkg/src/main/java/org/codehaus/mojo/unix/sysvpkg/PkginfoFile.java b/unix-sysv-pkg/src/main/java/org/codehaus/mojo/unix/sysvpkg/Pkginfo.java
old mode 100644
new mode 100755
similarity index 76%
rename from unix-sysv-pkg/src/main/java/org/codehaus/mojo/unix/sysvpkg/PkginfoFile.java
rename to unix-sysv-pkg/src/main/java/org/codehaus/mojo/unix/sysvpkg/Pkginfo.java
index 99662eb8..40f19637
--- a/unix-sysv-pkg/src/main/java/org/codehaus/mojo/unix/sysvpkg/PkginfoFile.java
+++ b/unix-sysv-pkg/src/main/java/org/codehaus/mojo/unix/sysvpkg/Pkginfo.java
@@ -45,7 +45,7 @@
  *
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
-public class PkginfoFile
+public class Pkginfo
 {
     public final String arch;
     // TODO: This should be a list according to the man page
@@ -58,8 +58,8 @@ public class PkginfoFile
     public final Option<String> email;
     public final List<String> classes;
 
-    public PkginfoFile( String arch, String category, String name, String pkg, String version, Option<String> pstamp,
-                        Option<String> desc, Option<String> email, List<String> classes )
+    public Pkginfo( String arch, String category, String name, String pkg, String version, Option<String> pstamp,
+                    Option<String> desc, Option<String> email, List<String> classes )
     {
         this.arch = arch;
         this.category = category;
@@ -72,44 +72,44 @@ public PkginfoFile( String arch, String category, String name, String pkg, Strin
         this.classes = classes;
     }
 
-    public PkginfoFile( String arch, String category, String name, String pkg, String version )
+    public Pkginfo( String arch, String category, String name, String pkg, String version )
     {
         this( arch, category, name, pkg, version, Option.<String>none(), Option.<String>none(),
               Option.<String>none(), List.<String>nil() );
     }
 
-    public static final F5<String, String, String, String, String, PkginfoFile> constructor =
-        new F5<String, String, String, String, String, PkginfoFile>()
+    public static final F5<String, String, String, String, String, Pkginfo> constructor =
+        new F5<String, String, String, String, String, Pkginfo>()
         {
-            public PkginfoFile f( String arch, String category, String name, String pkg, String version )
+            public Pkginfo f( String arch, String category, String name, String pkg, String version )
             {
-                return new PkginfoFile( arch, category, name, pkg, version );
+                return new Pkginfo( arch, category, name, pkg, version );
             }
         };
 
-    public PkginfoFile category( String category )
+    public Pkginfo category( String category )
     {
-        return new PkginfoFile( arch, category, name, pkg, version, pstamp, desc, email, classes );
+        return new Pkginfo( arch, category, name, pkg, version, pstamp, desc, email, classes );
     }
 
-    public PkginfoFile pstamp( Option<String> pstamp )
+    public Pkginfo pstamp( Option<String> pstamp )
     {
-        return new PkginfoFile( arch, category, name, pkg, version, pstamp, desc, email, classes );
+        return new Pkginfo( arch, category, name, pkg, version, pstamp, desc, email, classes );
     }
 
-    public PkginfoFile desc( Option<String> desc )
+    public Pkginfo desc( Option<String> desc )
     {
-        return new PkginfoFile( arch, category, name, pkg, version, pstamp, desc, email, classes );
+        return new Pkginfo( arch, category, name, pkg, version, pstamp, desc, email, classes );
     }
 
-    public PkginfoFile email( Option<String> email )
+    public Pkginfo email( Option<String> email )
     {
-        return new PkginfoFile( arch, category, name, pkg, version, pstamp, desc, email, classes );
+        return new Pkginfo( arch, category, name, pkg, version, pstamp, desc, email, classes );
     }
 
-    public PkginfoFile classes( List<String> classes )
+    public Pkginfo classes( List<String> classes )
     {
-        return new PkginfoFile( arch, category, name, pkg, version, pstamp, desc, email, classes );
+        return new Pkginfo( arch, category, name, pkg, version, pstamp, desc, email, classes );
     }
 
     public List<String> toList()
@@ -163,7 +163,7 @@ public String getPkgName( File pkginfoFile )
         }
     }
 
-    public static Option<PkginfoFile> fromStream( Iterable<String> lines )
+    public static Option<Pkginfo> fromStream( Iterable<String> lines )
     {
         TreeMap<String, String> map = TreeMap.empty( stringOrd );
 
@@ -186,11 +186,11 @@ public static Option<PkginfoFile> fromStream( Iterable<String> lines )
 
         return map.get( "ARCH" ).
             bind( map.get( "CATEGORY" ), map.get( "NAME" ), map.get( "PKG" ).orElse( map.get( "PKGINST" ) ), map.get( "VERSION" ),
-                                          curry( PkginfoFile.constructor ) ).map( new F<PkginfoFile, PkginfoFile>()
+                                          curry( Pkginfo.constructor ) ).map( new F<Pkginfo, Pkginfo>()
         {
-            public PkginfoFile f( PkginfoFile pkginfoFile )
+            public Pkginfo f( Pkginfo pkginfo )
             {
-                return pkginfoFile.
+                return pkginfo.
                     pstamp( map2.get( "PSTAMP" ) ).
                     desc( map2.get( "DESC" ) ).
                     email( map2.get( "EMAIL" ) ).
diff --git a/unix-sysv-pkg/src/main/java/org/codehaus/mojo/unix/sysvpkg/PkginfoUtil.java b/unix-sysv-pkg/src/main/java/org/codehaus/mojo/unix/sysvpkg/PkginfoUtil.java
old mode 100644
new mode 100755
index 523a2be0..c6f6df00
--- a/unix-sysv-pkg/src/main/java/org/codehaus/mojo/unix/sysvpkg/PkginfoUtil.java
+++ b/unix-sysv-pkg/src/main/java/org/codehaus/mojo/unix/sysvpkg/PkginfoUtil.java
@@ -50,13 +50,13 @@ public PkginfoUtil debug()
         return new PkginfoUtil( true );
     }
 
-    public Option<PkginfoFile> getPackageInfoForDevice2( File device )
+    public Option<Pkginfo> getPackageInfoForDevice2( File device )
         throws IOException
     {
         return getPackageInfoForDevice2( device, "all" );
     }
 
-    public Option<PkginfoFile> getPackageInfoForDevice2( File device, String instance )
+    public Option<Pkginfo> getPackageInfoForDevice2( File device, String instance )
         throws IOException
     {
         if ( !device.canRead() )
@@ -78,10 +78,10 @@ public Option<PkginfoFile> getPackageInfoForDevice2( File device, String instanc
             execute().
             assertSuccess();
 
-        return PkginfoFile.fromStream( Stream.iterableStream( consumer.strings ) );
+        return Pkginfo.fromStream( Stream.iterableStream( consumer.strings ) );
     }
 
-    public static Option<PkginfoFile> getPackageInfoForDevice( File device )
+    public static Option<Pkginfo> getPackageInfoForDevice( File device )
         throws IOException
     {
         return getPackageInfoForDevice( device, null );
@@ -90,7 +90,7 @@ public static Option<PkginfoFile> getPackageInfoForDevice( File device )
     /**
      * @deprecated
      */
-    public static Option<PkginfoFile> getPackageInfoForDevice( File device, String instance )
+    public static Option<Pkginfo> getPackageInfoForDevice( File device, String instance )
         throws IOException
     {
         return new PkginfoUtil().debug().getPackageInfoForDevice2( device, instance );
diff --git a/unix-sysv-pkg/src/test/java/org/codehaus/mojo/unix/sysvpkg/PkginfoFileTest.java b/unix-sysv-pkg/src/test/java/org/codehaus/mojo/unix/sysvpkg/PkginfoTest.java
old mode 100644
new mode 100755
similarity index 86%
rename from unix-sysv-pkg/src/test/java/org/codehaus/mojo/unix/sysvpkg/PkginfoFileTest.java
rename to unix-sysv-pkg/src/test/java/org/codehaus/mojo/unix/sysvpkg/PkginfoTest.java
index 570706b7..f4d27897
--- a/unix-sysv-pkg/src/test/java/org/codehaus/mojo/unix/sysvpkg/PkginfoFileTest.java
+++ b/unix-sysv-pkg/src/test/java/org/codehaus/mojo/unix/sysvpkg/PkginfoTest.java
@@ -28,13 +28,13 @@
 import static fj.data.List.*;
 import static fj.data.Option.*;
 import junit.framework.*;
-import static org.codehaus.mojo.unix.sysvpkg.PkginfoFile.*;
+import static org.codehaus.mojo.unix.sysvpkg.Pkginfo.*;
 import org.codehaus.mojo.unix.util.line.*;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
-public class PkginfoFileTest
+public class PkginfoTest
     extends TestCase
 {
     public void testParsing()
@@ -52,7 +52,7 @@ public void testParsing()
             add( "                        2 package information files" ).
             add( "                    40281 blocks used (approx)" ));
 
-        PkginfoFile expected = new PkginfoFile( "all", "application", "Hudson", "project-pkg-1", "1.1-2",
+        Pkginfo expected = new Pkginfo( "all", "application", "Hudson", "project-pkg-1", "1.1-2",
                                                 some( "20090129.134909" ), Option.<String>none(),
                                                 some( "trygvis@inamo.no" ), List.<String>nil() );
 
@@ -61,7 +61,7 @@ public void testParsing()
 
     public void testClasses()
     {
-        PkginfoFile pkginfoFile = new PkginfoFile( "all", "application", "name", "mypackage", "1.0" );
+        Pkginfo pkginfo = new Pkginfo( "all", "application", "name", "mypackage", "1.0" );
 
         assertEquals( new LineFile().
             add( "ARCH=all" ).
@@ -71,9 +71,9 @@ public void testClasses()
             add( "VERSION=1.0" ).
 //            add( "CLASSES=none"). I think this is the right behaviou.
 //  If pkgmk always insert *and* warn about the class it should be commented back in
-            toString(), pkginfoFile.toString() );
+            toString(), pkginfo.toString() );
 
-        pkginfoFile = pkginfoFile.
+        pkginfo = pkginfo.
             classes( list( "smf" ) );
 
         assertEquals( new LineFile().
@@ -83,9 +83,9 @@ public void testClasses()
             add( "PKG=mypackage" ).
             add( "VERSION=1.0" ).
             add( "CLASSES=smf" ).
-            toString(), pkginfoFile.toString() );
+            toString(), pkginfo.toString() );
 
-        pkginfoFile = pkginfoFile.
+        pkginfo = pkginfo.
             classes( list( "none", "smf" ) );
 
         assertEquals( new LineFile().
@@ -95,6 +95,6 @@ public void testClasses()
             add( "PKG=mypackage" ).
             add( "VERSION=1.0" ).
             add( "CLASSES=none smf" ).
-            toString(), pkginfoFile.toString() );
+            toString(), pkginfo.toString() );
     }
 }