You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2017/10/18 09:04:50 UTC

svn commit: r1812478 - in /jackrabbit/commons/filevault-package-maven-plugin/trunk: it/ it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/ it/src/test/resources/test-projects/default-test-project/ it/src/test/resources/test-projects/defa...

Author: tripod
Date: Wed Oct 18 09:04:49 2017
New Revision: 1812478

URL: http://svn.apache.org/viewvc?rev=1812478&view=rev
Log:
JCRVLT-209 Always write to the filter.xml inside the vaultDir but never to filter-plugin-generated.xml

Added:
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/expected-file-order.txt
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-file-order.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/expected-files.txt
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-files.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/expected-manifest.txt
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-manifest.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/filter.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/filter.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/_rep_policy.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/_rep_policy.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/.content.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/.content.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/.gitignore
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/.gitignore
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/content/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/content/.content.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/content/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/content/siteadmin.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/content/siteadmin.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.DS_Store   (contents, props changed)
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.gitignore
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.vlt   (contents, props changed)
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.vltignore   (contents, props changed)
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/cloudservices/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/cloudservices/.content.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/cloudservices/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/cloudservices/ooyala/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/cloudservices/ooyala/.content.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/cloudservices/ooyala/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/.content.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/pom.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/pom.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/expected-file-order.txt
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-file-order.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/expected-files.txt
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-files.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/expected-manifest.txt
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-manifest.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/filter.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/filter.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/_rep_policy.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/_rep_policy.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/.content.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/.content.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/.gitignore
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/.gitignore
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/content/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/content/.content.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/content/siteadmin.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/content/siteadmin.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/cloudservices/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/cloudservices/.content.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/cloudservices/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/cloudservices/ooyala/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/cloudservices/ooyala/.content.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/cloudservices/ooyala/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/.content.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/pom.xml
      - copied, changed from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/pom.xml
Removed:
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-file-order.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-files.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-manifest.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/filter.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/_rep_policy.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/.gitignore
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/content/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/content/siteadmin.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/cloudservices/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/cloudservices/ooyala/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/pom.xml
Modified:
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/pom.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/DefaultProjectTest.java
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/PackageTestBase.java
    jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/pom.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/pom.xml?rev=1812478&r1=1812477&r2=1812478&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/pom.xml Wed Oct 18 09:04:49 2017
@@ -78,7 +78,9 @@
                     <configuration>
                         <excludes>
                             <exclude>src/test/resources/test-projects/**/*.txt</exclude>
-                            <exclude>src/test/resources/test-projects/**/expected-filter.xml</exclude>
+                            <exclude>src/test/resources/test-projects/**/*.xml</exclude>
+                            <exclude>src/test/resources/test-projects/**/.vlt</exclude>
+                            <exclude>src/test/resources/test-projects/**/.vltignore</exclude>
                         </excludes>
                     </configuration>
                 </plugin>

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/DefaultProjectTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/DefaultProjectTest.java?rev=1812478&r1=1812477&r2=1812478&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/DefaultProjectTest.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/DefaultProjectTest.java Wed Oct 18 09:04:49 2017
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.filevault.maven.packaging;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.ArrayList;
@@ -25,6 +26,7 @@ import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
+import org.apache.maven.it.VerificationException;
 import org.apache.maven.it.util.FileUtils;
 import org.hamcrest.Matchers;
 import org.junit.Test;
@@ -35,19 +37,22 @@ import static org.junit.Assert.assertTha
 
 public class DefaultProjectTest extends PackageTestBase {
 
-    private static final String TEST_PROJECT_NAME = "/default-test-project";
+    private static final String TEST_PROJECT_NAME = "/default-test-projects";
 
     protected File getProjectDirectory() {
         return new File(TEST_PROJECTS_ROOT + TEST_PROJECT_NAME);
     }
 
-    @Test
-    public void package_contains_correct_files() throws Exception {
-        File testPackageFile = buildProject(getDefaultProperties());
+
+    private void verify(String projectName) throws VerificationException, IOException {
+        // this is a bit awkward. todo: make better testing framework
+        final File projectDir = new File(getProjectDirectory(), projectName);
+
+        File testPackageFile = buildProject(projectDir, getDefaultProperties());
         assertThat(testPackageFile.exists(), is(true));
 
-        List<String> expectedEntries = Files.readAllLines(new File(testProjectDir, "expected-files.txt").toPath(), StandardCharsets.UTF_8);
-        List<String> expectedEntriesInOrder= Files.readAllLines(new File(testProjectDir, "expected-file-order.txt").toPath(), StandardCharsets.UTF_8);
+        List<String> expectedEntries = Files.readAllLines(new File(projectDir, "expected-files.txt").toPath(), StandardCharsets.UTF_8);
+        List<String> expectedEntriesInOrder= Files.readAllLines(new File(projectDir, "expected-file-order.txt").toPath(), StandardCharsets.UTF_8);
 
         List<String> entries = new ArrayList<String>();
         try (JarFile jar = new JarFile(testPackageFile)) {
@@ -66,12 +71,22 @@ public class DefaultProjectTest extends
 
         // first check that only the expected entries are there in the package (regardless of the order)
         assertThat("Package contains the expected entry names", entries, Matchers.containsInAnyOrder(expectedEntries.toArray()));
-        
+
         // then check order of some of the entries
         assertThat("Order of entries within package", entries, Matchers.containsInRelativeOrder(expectedEntriesInOrder.toArray()));
 
-        String expectedManifest = FileUtils.fileRead(new File(testProjectDir, "expected-manifest.txt"));
+        String expectedManifest = FileUtils.fileRead(new File(projectDir, "expected-manifest.txt"));
         verifyManifest(testPackageFile, expectedManifest);
 
     }
+
+    @Test
+    public void generic_project_package_contains_correct_files() throws Exception {
+        verify("generic");
+    }
+
+    @Test
+    public void resource_project_package_contains_correct_files() throws Exception {
+        verify("resource");
+    }
 }

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/PackageTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/PackageTestBase.java?rev=1812478&r1=1812477&r2=1812478&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/PackageTestBase.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/PackageTestBase.java Wed Oct 18 09:04:49 2017
@@ -59,7 +59,11 @@ public abstract class PackageTestBase {
     protected abstract File getProjectDirectory();
 
     File getTestPackageFile() {
-        return new File(testProjectDir, TEST_PACKAGE_DEFAULT_NAME);
+        return getTestPackageFile(testProjectDir);
+    }
+
+    File getTestPackageFile(File projectDir) {
+        return new File(projectDir, TEST_PACKAGE_DEFAULT_NAME);
     }
 
     Properties getDefaultProperties() {
@@ -70,13 +74,17 @@ public abstract class PackageTestBase {
     }
 
     File buildProject(Properties props) throws VerificationException {
-        Verifier verifier = new Verifier(testProjectDir.getAbsolutePath());
+        return buildProject(testProjectDir, props);
+    }
+
+    File buildProject(File projectDir, Properties props) throws VerificationException {
+        Verifier verifier = new Verifier(projectDir.getAbsolutePath());
         verifier.setSystemProperties(props);
         verifier.setDebug(true);
         verifier.setAutoclean(true);
         verifier.executeGoal("package");
 
-        File testPackageFile = getTestPackageFile();
+        File testPackageFile = getTestPackageFile(projectDir);
         assertThat(testPackageFile.exists(), is(true));
         return testPackageFile;
     }

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/expected-file-order.txt (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-file-order.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/expected-file-order.txt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/expected-file-order.txt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-file-order.txt&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/expected-files.txt (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-files.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/expected-files.txt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/expected-files.txt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-files.txt&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/expected-manifest.txt (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-manifest.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/expected-manifest.txt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/expected-manifest.txt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-manifest.txt&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/filter.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/filter.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/filter.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/filter.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/filter.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/_rep_policy.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/_rep_policy.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/_rep_policy.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/_rep_policy.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/_rep_policy.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/.content.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/.content.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/.content.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/.content.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/.gitignore (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/.gitignore)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/.gitignore?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/.gitignore&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/.gitignore&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/content/.content.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/content/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/content/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/content/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/content/.content.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/content/siteadmin.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/content/siteadmin.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/content/siteadmin.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/apps/wcm/core/content/siteadmin.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/content/siteadmin.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.DS_Store (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.DS_Store?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.DS_Store&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.gitignore
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.gitignore?rev=1812478&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.gitignore (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.gitignore Wed Oct 18 09:04:49 2017
@@ -0,0 +1 @@
+!.*

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.vlt (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.vlt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.vlt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.vltignore (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.vltignore?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/.vltignore&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/cloudservices/.content.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/cloudservices/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/cloudservices/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/cloudservices/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/cloudservices/.content.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/cloudservices/ooyala/.content.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/cloudservices/ooyala/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/cloudservices/ooyala/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/cloudservices/ooyala/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/cloudservices/ooyala/.content.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/.content.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/.content.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/pom.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/pom.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/pom.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/pom.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/pom.xml Wed Oct 18 09:04:49 2017
@@ -27,16 +27,6 @@
     <name>Packaging test</name>
 
     <build>
-        <resources>
-            <resource>
-                <directory>jcr_root</directory>
-                <excludes>
-                    <exclude>**/.vlt</exclude>
-                    <exclude>**/.vltignore</exclude>
-                    <exclude>**/.DS_Store</exclude>
-                </excludes>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.jackrabbit</groupId>
@@ -44,6 +34,7 @@
                 <version>${plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <builtContentDirectory>${project.basedir}/jcr_root</builtContentDirectory>
                     <filterSource>${project.basedir}/filter.xml</filterSource>
                     <filters>
                         <filter>

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/expected-file-order.txt (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-file-order.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/expected-file-order.txt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/expected-file-order.txt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-file-order.txt&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/expected-files.txt (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-files.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/expected-files.txt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/expected-files.txt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-files.txt&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/expected-manifest.txt (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-manifest.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/expected-manifest.txt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/expected-manifest.txt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/expected-manifest.txt&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/filter.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/filter.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/filter.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/filter.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/filter.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/_rep_policy.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/_rep_policy.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/_rep_policy.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/_rep_policy.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/_rep_policy.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/.content.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/.content.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/.content.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/.content.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/.gitignore (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/.gitignore)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/.gitignore?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/.gitignore&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/.gitignore&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/content/.content.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/content/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/content/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/.content.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/content/siteadmin.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/content/siteadmin.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/content/siteadmin.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/apps/wcm/core/content/siteadmin.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/apps/wcm/core/content/siteadmin.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/cloudservices/.content.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/cloudservices/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/cloudservices/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/cloudservices/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/cloudservices/.content.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/cloudservices/ooyala/.content.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/cloudservices/ooyala/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/cloudservices/ooyala/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/cloudservices/ooyala/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/cloudservices/ooyala/.content.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/.content.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/.content.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/pom.xml (from r1812375, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/pom.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/pom.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/pom.xml&r1=1812375&r2=1812478&rev=1812478&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-project/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource/pom.xml Wed Oct 18 09:04:49 2017
@@ -14,7 +14,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- ====================================================================== -->

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/pom.xml?rev=1812478&r1=1812477&r2=1812478&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/pom.xml Wed Oct 18 09:04:49 2017
@@ -41,7 +41,7 @@
     </prerequisites>
 
 	<properties>
-        <mavenVersion>3.2.5</mavenVersion>
+        <mavenVersion>3.3.9</mavenVersion> <!-- required for https://issues.apache.org/jira/browse/MNG-5440 -->
         <aether.version>1.0.2.v20150114</aether.version>
 	</properties>
 

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java?rev=1812478&r1=1812477&r2=1812478&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/plugin/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java Wed Oct 18 09:04:49 2017
@@ -53,6 +53,8 @@ import org.apache.maven.plugins.annotati
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.codehaus.plexus.archiver.ArchiveEntry;
 import org.codehaus.plexus.archiver.FileSet;
+import org.codehaus.plexus.util.AbstractScanner;
+import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
@@ -239,6 +241,17 @@ public class VaultMojo extends AbstractE
 
 
     /**
+     * The file name patterns to exclude in addition to the ones listed in 
+     * {@link AbstractScanner#DEFAULTEXCLUDES}. The format of each pattern is described in {@link DirectoryScanner}.
+     * 
+     * @since 1.0.0
+     */
+    @Parameter(property = "vault.excludes",
+               defaultValue="**/.vlt,**/.vltignore,**/.DS_Store",
+               required = true)
+    private String[] excludes;
+
+    /**
      * Defines the path under which the embedded bundles are placed. defaults to '/apps/bundles/install'
      * @since 0.0.6
      */
@@ -336,14 +349,17 @@ public class VaultMojo extends AbstractE
     private final Properties properties = new Properties();
 
     /**
-     * Creates a fileset for the archiver
+     * Creates a {@link FileSet} for the archiver
      * @param directory the directory
      * @param prefix the prefix
      * @return the fileset
      */
     @Nonnull
     private FileSet createFileSet(@Nonnull File directory, @Nonnull String prefix) {
-        return fileSet(directory).prefixed(prefix).includeExclude(null, null).includeEmptyDirs(true);
+        return fileSet(directory)
+                .prefixed(prefix)
+                .includeExclude(null, excludes)
+                .includeEmptyDirs(true);
     }
 
     /**
@@ -430,7 +446,7 @@ public class VaultMojo extends AbstractE
 
             ContentPackageArchiver contentPackageArchiver = new ContentPackageArchiver();
             contentPackageArchiver.setIncludeEmptyDirs(true);
-            contentPackageArchiver.addDirectory(workDirectory);
+            contentPackageArchiver.addFileSet(createFileSet(workDirectory, ""));
 
             // include content from build only if it exists
             if (builtContentDirectory.exists()) {