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/20 01:55:00 UTC

svn commit: r1812695 [1/2] - 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-projects/generic-empty-directories/ it/src/...

Author: tripod
Date: Fri Oct 20 01:54:59 2017
New Revision: 1812695

URL: http://svn.apache.org/viewvc?rev=1812695&view=rev
Log:
JCRVLT-210 Allow to define excludes for the ContentPackageArchiver to prevent copying of script files from src to target

- this closes #2
- this closes #4

Added:
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/expected-files.txt
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/expected-empty-files.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/core/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/core/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/core/content/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/core/content/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-empty-directories/jcr_root/apps/wcm/core/content/siteadmin.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-empty-directories/jcr_root/apps/wcm/core/empty_directory/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/core/empty_directory/.dummy
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/pom.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/pom.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-file-order.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-files.txt
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/expected-empty-files.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-manifest.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/filter.xml   (contents, props changed)
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/_rep_policy.xml   (contents, props changed)
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-unusal-jcrroot/foo_root/apps/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/core/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/core/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/core/.gitignore
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/core/content/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/core/content/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/core/content/siteadmin.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-unusal-jcrroot/foo_root/etc/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/.gitignore
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/.vltignore
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/empty_directory/dummy.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/cloudservices/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/cloudservices/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/cloudservices/ooyala/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/cloudservices/ooyala/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/designs/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/designs/some-thirdparty-libs/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/designs/some-thirdparty-libs/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/designs/some-thirdparty-libs/clientlibs/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_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-unusal-jcrroot/foo_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-unusal-jcrroot/foo_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt   (contents, props changed)
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/empty_directory/dummy.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/pom.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/pom.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-file-order.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-files.txt
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/expected-empty-files.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-manifest.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/filter.xml   (contents, props changed)
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/_rep_policy.xml   (contents, props changed)
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/core/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/core/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/core/.gitignore
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/core/content/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/core/content/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/core/content/siteadmin.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-with-builtcd/jcr_root/etc/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/.gitignore
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/.vltignore
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/empty_directory/dummy.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/cloudservices/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/cloudservices/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/cloudservices/ooyala/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/cloudservices/ooyala/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/designs/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/designs/some-thirdparty-libs/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/designs/some-thirdparty-libs/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/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-with-builtcd/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-with-builtcd/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-with-builtcd/jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt   (contents, props changed)
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/empty_directory/dummy.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/pom.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/pom.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource-empty-directories/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource-empty-directories/expected-files.txt
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/expected-empty-files.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource-empty-directories/jcr_root/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource-empty-directories/jcr_root/apps/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource-empty-directories/jcr_root/apps/wcm/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource-empty-directories/jcr_root/apps/wcm/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource-empty-directories/jcr_root/apps/wcm/core/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource-empty-directories/jcr_root/apps/wcm/core/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource-empty-directories/jcr_root/apps/wcm/core/content/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource-empty-directories/jcr_root/apps/wcm/core/content/.content.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource-empty-directories/jcr_root/apps/wcm/core/content/siteadmin.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-empty-directories/jcr_root/apps/wcm/core/empty_directory/
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource-empty-directories/jcr_root/apps/wcm/core/empty_directory/dummy.txt
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/empty_directory/dummy.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/resource-empty-directories/pom.xml
      - copied, changed from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/pom.xml
Removed:
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/EmptyDirectoriesTest.java
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/expected-empty-files.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/expected-files.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/content/.content.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/content/siteadmin.xml
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/empty_directory/dummy.txt
    jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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/resources/test-projects/default-test-projects/generic/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=1812695&r1=1812694&r2=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/pom.xml Fri Oct 20 01:54:59 2017
@@ -56,16 +56,6 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
-            <!--<plugin>-->
-                <!--<groupId>org.apache.rat</groupId>-->
-                <!--<artifactId>apache-rat-plugin</artifactId>-->
-                <!--<configuration>-->
-                    <!--<excludes>-->
-                        <!--<exclude>src/test/resources/test-projects/**/*.txt</exclude>-->
-                    <!--</excludes>-->
-                <!--</configuration>-->
-            <!--</plugin>-->
-
         </plugins>
         <pluginManagement>
             <plugins>
@@ -81,6 +71,7 @@
                             <exclude>src/test/resources/test-projects/**/*.xml</exclude>
                             <exclude>src/test/resources/test-projects/**/.vlt</exclude>
                             <exclude>src/test/resources/test-projects/**/.vltignore</exclude>
+                            <exclude>src/test/resources/test-projects/**/.dummy</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=1812695&r1=1812694&r2=1812695&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 Fri Oct 20 01:54:59 2017
@@ -51,8 +51,6 @@ public class DefaultProjectTest extends
         File testPackageFile = buildProject(projectDir, getDefaultProperties());
         assertThat(testPackageFile.exists(), is(true));
 
-        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)) {
@@ -70,13 +68,24 @@ public class DefaultProjectTest extends
         assertEquals("MANIFEST.MF must be first entry", "META-INF/MANIFEST.MF", first);
 
         // 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()));
+        final File expectedFilesFile = new File(projectDir, "expected-files.txt");
+        if (expectedFilesFile.exists()) {
+            List<String> expectedEntries = Files.readAllLines(expectedFilesFile.toPath(), StandardCharsets.UTF_8);
+            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()));
+        final File expectedOrderFile = new File(projectDir, "expected-file-order.txt");
+        if (expectedOrderFile.exists()) {
+            List<String> expectedEntriesInOrder= Files.readAllLines(expectedOrderFile.toPath(), StandardCharsets.UTF_8);
+            assertThat("Order of entries within package", entries, Matchers.containsInRelativeOrder(expectedEntriesInOrder.toArray()));
+        }
 
-        String expectedManifest = FileUtils.fileRead(new File(projectDir, "expected-manifest.txt"));
-        verifyManifest(testPackageFile, expectedManifest);
+        final File expectedManifestFile = new File(projectDir, "expected-manifest.txt");
+        if (expectedManifestFile.exists()) {
+            String expectedManifest = FileUtils.fileRead(expectedManifestFile);
+            verifyManifest(testPackageFile, expectedManifest);
+        }
 
     }
 
@@ -86,7 +95,27 @@ public class DefaultProjectTest extends
     }
 
     @Test
+    public void generic_with_builtcd_project_package_contains_correct_files() throws Exception {
+        verify("generic-with-builtcd");
+    }
+
+    @Test
     public void resource_project_package_contains_correct_files() throws Exception {
         verify("resource");
     }
+
+    @Test
+    public void unusual_jcr_root_package_contains_correct_files() throws Exception {
+        verify("generic-unusal-jcrroot");
+    }
+
+    @Test
+    public void generic_empty_directories() throws Exception {
+        verify("generic-empty-directories");
+    }
+
+    @Test
+    public void resource_empty_directories() throws Exception {
+        verify("resource-empty-directories");
+    }
 }

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/expected-files.txt (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/expected-empty-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-empty-directories/expected-files.txt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/expected-files.txt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/expected-empty-files.txt&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-empty-directories/jcr_root/apps/wcm/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/core/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-empty-directories/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-empty-directories/jcr_root/apps/wcm/core/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/core/content/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-empty-directories/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-empty-directories/jcr_root/apps/wcm/core/content/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/content/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/core/content/siteadmin.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-empty-directories/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-empty-directories/jcr_root/apps/wcm/core/content/siteadmin.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/content/siteadmin.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/core/empty_directory/.dummy
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/core/empty_directory/.dummy?rev=1812695&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/core/empty_directory/.dummy (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/jcr_root/apps/wcm/core/empty_directory/.dummy Fri Oct 20 01:54:59 2017
@@ -0,0 +1 @@
+# dummy
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/pom.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-empty-directories/pom.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/pom.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/pom.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-empty-directories/pom.xml Fri Oct 20 01:54:59 2017
@@ -27,33 +27,15 @@
     <name>Packaging test</name>
 
     <build>
-        <resources>
-            <resource>
-                <directory>jcr_root</directory>
-                <excludes>
-                    <exclude>**/.vlt</exclude>
-                    <exclude>**/.vltignore</exclude>
-                    <exclude>**/.gitignore</exclude>
-                    <exclude>**/.DS_Store</exclude>
-                    <exclude>**/dummy.txt</exclude>
-                </excludes>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                    <includeEmptyDirs>${test.includeEmptyDirs}</includeEmptyDirs>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.jackrabbit</groupId>
                 <artifactId>filevault-package-maven-plugin</artifactId>
                 <version>${plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <failOnDependencyErrors>false</failOnDependencyErrors>
+                    <excludes>**/.dummy</excludes>
                     <filters>
                         <filter>
                             <root>/apps/wcm/core</root>

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/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-unusal-jcrroot/expected-file-order.txt?rev=1812695&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-file-order.txt (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-file-order.txt Fri Oct 20 01:54:59 2017
@@ -0,0 +1,6 @@
+META-INF/MANIFEST.MF
+META-INF/vault/
+jcr_root/apps/wcm/core/content/
+jcr_root/_rep_policy.xml
+jcr_root/etc/designs/some-thirdparty-libs/
+jcr_root/etc/cloudservices/ooyala/
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-files.txt (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/expected-empty-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-unusal-jcrroot/expected-files.txt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-files.txt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/expected-empty-files.txt&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/expected-empty-files.txt (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-files.txt Fri Oct 20 01:54:59 2017
@@ -1,10 +1,5 @@
 META-INF/
 META-INF/MANIFEST.MF
-META-INF/maven/
-META-INF/maven/org.apache.jackrabbit.filevault/
-META-INF/maven/org.apache.jackrabbit.filevault/package-plugin-test-pkg/
-META-INF/maven/org.apache.jackrabbit.filevault/package-plugin-test-pkg/pom.properties
-META-INF/maven/org.apache.jackrabbit.filevault/package-plugin-test-pkg/pom.xml
 META-INF/vault/
 META-INF/vault/config.xml
 META-INF/vault/filter.xml
@@ -14,8 +9,26 @@ jcr_root/
 jcr_root/apps/
 jcr_root/apps/wcm/
 jcr_root/apps/wcm/core/
-jcr_root/apps/wcm/core/.content.xml
 jcr_root/apps/wcm/core/content/
 jcr_root/apps/wcm/core/content/.content.xml
 jcr_root/apps/wcm/core/content/siteadmin.xml
-jcr_root/apps/wcm/core/empty_directory/
\ No newline at end of file
+jcr_root/_rep_policy.xml
+jcr_root/etc/
+jcr_root/etc/designs/
+jcr_root/etc/designs/some-thirdparty-libs/
+jcr_root/etc/designs/some-thirdparty-libs/clientlibs/
+jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/
+jcr_root/etc/designs/some-thirdparty-libs/.content.xml
+jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml
+jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt
+jcr_root/etc/cloudservices/
+jcr_root/etc/cloudservices/ooyala/
+jcr_root/etc/cloudservices/ooyala/.content.xml
+jcr_root/etc/cloudservices/.content.xml
+jcr_root/apps/wcm/.content.xml
+jcr_root/apps/wcm/core/.content.xml
+META-INF/maven/
+META-INF/maven/org.apache.jackrabbit.filevault/
+META-INF/maven/org.apache.jackrabbit.filevault/package-plugin-test-pkg/
+META-INF/maven/org.apache.jackrabbit.filevault/package-plugin-test-pkg/pom.xml
+META-INF/maven/org.apache.jackrabbit.filevault/package-plugin-test-pkg/pom.properties
\ No newline at end of file

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/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-unusal-jcrroot/expected-manifest.txt?rev=1812695&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-manifest.txt (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-manifest.txt Fri Oct 20 01:54:59 2017
@@ -0,0 +1,10 @@
+Archiver-Version:Plexus Archiver
+Content-Package-Description:Packaging test
+Content-Package-Id:org.apache.jackrabbit.filevault:package-plugin-test-pkg:1.0.0-SNAPSHOT
+Content-Package-Roots:/apps/some-thirdparty-libs,/apps/wcm/core/content,/etc/cloudservices/ooyala,/etc/designs/some-thirdparty-libs,/etc/packages/apache/consulting,/rep:policy
+Content-Package-Type:mixed
+Created-By:Apache Maven
+Implementation-Title:Packaging test
+Implementation-Vendor-Id:org.apache.jackrabbit.filevault
+Implementation-Version:1.0.0-SNAPSHOT
+Manifest-Version:1.0
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/filter.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-unusal-jcrroot/filter.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/filter.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/filter.xml Fri Oct 20 01:54:59 2017
@@ -16,5 +16,7 @@
   limitations under the License.
   -->
 
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
+<workspaceFilter version="1.0">
+    <filter root="/apps/wcm/core/content"/>
+    <filter root="/rep:policy" mode="merge"/>
+</workspaceFilter>

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/_rep_policy.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-unusal-jcrroot/foo_root/_rep_policy.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/_rep_policy.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/content/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/content/.content.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/_rep_policy.xml Fri Oct 20 01:54:59 2017
@@ -16,5 +16,14 @@
   limitations under the License.
   -->
 
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+          jcr:primaryType="rep:ACL">
+    <allow
+            jcr:primaryType="rep:GrantACE"
+            rep:principalName="workflow-repo-reader-service"
+            rep:privileges="{Name}[jcr:read]"/>
+    <allow0
+            jcr:primaryType="rep:GrantACE"
+            rep:principalName="workflow-process-service"
+            rep:privileges="{Name}[jcr:read,rep:write,jcr:versionManagement,jcr:lockManagement,crx:replicate]"/>
+</jcr:root>

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-unusal-jcrroot/foo_root/apps/wcm/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/core/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-unusal-jcrroot/foo_root/apps/wcm/core/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/core/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_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-unusal-jcrroot/foo_root/apps/wcm/core/.gitignore?rev=1812695&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/core/.gitignore (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/core/.gitignore Fri Oct 20 01:54:59 2017
@@ -0,0 +1 @@
+# deliberately empty as this is only to check that this will not end up in the generated package
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/core/content/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-unusal-jcrroot/foo_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-unusal-jcrroot/foo_root/apps/wcm/core/content/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/apps/wcm/core/content/siteadmin.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-unusal-jcrroot/foo_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-unusal-jcrroot/foo_root/apps/wcm/core/content/siteadmin.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/content/siteadmin.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_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-unusal-jcrroot/foo_root/etc/.gitignore?rev=1812695&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/.gitignore (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/.gitignore Fri Oct 20 01:54:59 2017
@@ -0,0 +1 @@
+!.*

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/.vltignore (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/empty_directory/dummy.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/.vltignore?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/.vltignore&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/empty_directory/dummy.txt&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/cloudservices/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-unusal-jcrroot/foo_root/etc/cloudservices/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/cloudservices/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/cloudservices/.content.xml Fri Oct 20 01:54:59 2017
@@ -16,5 +16,5 @@
   limitations under the License.
   -->
 
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          jcr:primaryType="sling:Folder"/>
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/cloudservices/ooyala/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-unusal-jcrroot/foo_root/etc/cloudservices/ooyala/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/cloudservices/ooyala/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/cloudservices/ooyala/.content.xml Fri Oct 20 01:54:59 2017
@@ -16,5 +16,8 @@
   limitations under the License.
   -->
 
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          jcr:primaryType="nt:unstructured"
+          url="http://ooyala.com"
+          apiKey="someKey"
+/>
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/designs/some-thirdparty-libs/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-unusal-jcrroot/foo_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-unusal-jcrroot/foo_root/etc/designs/some-thirdparty-libs/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/designs/some-thirdparty-libs/.content.xml Fri Oct 20 01:54:59 2017
@@ -16,5 +16,14 @@
   limitations under the License.
   -->
 
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+          xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+          jcr:primaryType="cq:Page">
+    <jcr:content
+            cq:doctype="html_5"
+            cq:template="/libs/wcm/core/templates/designpage"
+            jcr:primaryType="cq:PageContent"
+            jcr:title="some-thridparty-libs"
+            sling:resourceType="wcm/core/components/designer" />
+
+</jcr:root>

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-unusal-jcrroot/foo_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-unusal-jcrroot/foo_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/empty-directories/jcr_root/apps/wcm/core/content/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/content/.content.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml Fri Oct 20 01:54:59 2017
@@ -16,5 +16,6 @@
   limitations under the License.
   -->
 
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          jcr:primaryType="cq:ClientLibraryFolder"
+          categories="[thirdparty.common]" />
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/empty_directory/dummy.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_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-unusal-jcrroot/foo_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/empty-directories/jcr_root/apps/wcm/core/empty_directory/dummy.txt&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Propchange: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt
------------------------------------------------------------------------------
    svn:executable = *

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/pom.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/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-unusal-jcrroot/pom.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/pom.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/pom.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/pom.xml Fri Oct 20 01:54:59 2017
@@ -34,8 +34,8 @@
                 <version>${plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
-                    <builtContentDirectory>${project.basedir}/jcr_root</builtContentDirectory>
                     <filterSource>${project.basedir}/filter.xml</filterSource>
+                    <jcrRootSourceDirectory>${project.basedir}/foo_root</jcrRootSourceDirectory>
                     <filters>
                         <filter>
                             <root>/etc/designs/some-thirdparty-libs</root>

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/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-with-builtcd/expected-file-order.txt?rev=1812695&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-file-order.txt (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-file-order.txt Fri Oct 20 01:54:59 2017
@@ -0,0 +1,6 @@
+META-INF/MANIFEST.MF
+META-INF/vault/
+jcr_root/apps/wcm/core/content/
+jcr_root/_rep_policy.xml
+jcr_root/etc/designs/some-thirdparty-libs/
+jcr_root/etc/cloudservices/ooyala/
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-files.txt (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/expected-empty-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-with-builtcd/expected-files.txt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-files.txt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/expected-empty-files.txt&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/expected-empty-files.txt (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-files.txt Fri Oct 20 01:54:59 2017
@@ -1,10 +1,5 @@
 META-INF/
 META-INF/MANIFEST.MF
-META-INF/maven/
-META-INF/maven/org.apache.jackrabbit.filevault/
-META-INF/maven/org.apache.jackrabbit.filevault/package-plugin-test-pkg/
-META-INF/maven/org.apache.jackrabbit.filevault/package-plugin-test-pkg/pom.properties
-META-INF/maven/org.apache.jackrabbit.filevault/package-plugin-test-pkg/pom.xml
 META-INF/vault/
 META-INF/vault/config.xml
 META-INF/vault/filter.xml
@@ -14,8 +9,26 @@ jcr_root/
 jcr_root/apps/
 jcr_root/apps/wcm/
 jcr_root/apps/wcm/core/
-jcr_root/apps/wcm/core/.content.xml
 jcr_root/apps/wcm/core/content/
 jcr_root/apps/wcm/core/content/.content.xml
 jcr_root/apps/wcm/core/content/siteadmin.xml
-jcr_root/apps/wcm/core/empty_directory/
\ No newline at end of file
+jcr_root/_rep_policy.xml
+jcr_root/etc/
+jcr_root/etc/designs/
+jcr_root/etc/designs/some-thirdparty-libs/
+jcr_root/etc/designs/some-thirdparty-libs/clientlibs/
+jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/
+jcr_root/etc/designs/some-thirdparty-libs/.content.xml
+jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/.content.xml
+jcr_root/etc/designs/some-thirdparty-libs/clientlibs/thirdparty-common/js.txt
+jcr_root/etc/cloudservices/
+jcr_root/etc/cloudservices/ooyala/
+jcr_root/etc/cloudservices/ooyala/.content.xml
+jcr_root/etc/cloudservices/.content.xml
+jcr_root/apps/wcm/.content.xml
+jcr_root/apps/wcm/core/.content.xml
+META-INF/maven/
+META-INF/maven/org.apache.jackrabbit.filevault/
+META-INF/maven/org.apache.jackrabbit.filevault/package-plugin-test-pkg/
+META-INF/maven/org.apache.jackrabbit.filevault/package-plugin-test-pkg/pom.xml
+META-INF/maven/org.apache.jackrabbit.filevault/package-plugin-test-pkg/pom.properties
\ No newline at end of file

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/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-with-builtcd/expected-manifest.txt?rev=1812695&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-manifest.txt (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-manifest.txt Fri Oct 20 01:54:59 2017
@@ -0,0 +1,10 @@
+Archiver-Version:Plexus Archiver
+Content-Package-Description:Packaging test
+Content-Package-Id:org.apache.jackrabbit.filevault:package-plugin-test-pkg:1.0.0-SNAPSHOT
+Content-Package-Roots:/apps/some-thirdparty-libs,/apps/wcm/core/content,/etc/cloudservices/ooyala,/etc/designs/some-thirdparty-libs,/etc/packages/apache/consulting,/rep:policy
+Content-Package-Type:mixed
+Created-By:Apache Maven
+Implementation-Title:Packaging test
+Implementation-Vendor-Id:org.apache.jackrabbit.filevault
+Implementation-Version:1.0.0-SNAPSHOT
+Manifest-Version:1.0
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/filter.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-with-builtcd/filter.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/filter.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/filter.xml Fri Oct 20 01:54:59 2017
@@ -16,5 +16,7 @@
   limitations under the License.
   -->
 
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
+<workspaceFilter version="1.0">
+    <filter root="/apps/wcm/core/content"/>
+    <filter root="/rep:policy" mode="merge"/>
+</workspaceFilter>

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/_rep_policy.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-with-builtcd/jcr_root/_rep_policy.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/_rep_policy.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/_rep_policy.xml Fri Oct 20 01:54:59 2017
@@ -16,5 +16,14 @@
   limitations under the License.
   -->
 
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+          jcr:primaryType="rep:ACL">
+    <allow
+            jcr:primaryType="rep:GrantACE"
+            rep:principalName="workflow-repo-reader-service"
+            rep:privileges="{Name}[jcr:read]"/>
+    <allow0
+            jcr:primaryType="rep:GrantACE"
+            rep:principalName="workflow-process-service"
+            rep:privileges="{Name}[jcr:read,rep:write,jcr:versionManagement,jcr:lockManagement,crx:replicate]"/>
+</jcr:root>

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-with-builtcd/jcr_root/apps/wcm/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/core/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-with-builtcd/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-with-builtcd/jcr_root/apps/wcm/core/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/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-with-builtcd/jcr_root/apps/wcm/core/.gitignore?rev=1812695&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/core/.gitignore (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/core/.gitignore Fri Oct 20 01:54:59 2017
@@ -0,0 +1 @@
+# deliberately empty as this is only to check that this will not end up in the generated package
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/core/content/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-with-builtcd/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-with-builtcd/jcr_root/apps/wcm/core/content/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/apps/wcm/core/content/siteadmin.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-with-builtcd/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-with-builtcd/jcr_root/apps/wcm/core/content/siteadmin.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/content/siteadmin.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/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-with-builtcd/jcr_root/etc/.gitignore?rev=1812695&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/.gitignore (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/.gitignore Fri Oct 20 01:54:59 2017
@@ -0,0 +1 @@
+!.*

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/.vltignore (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/empty_directory/dummy.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/.vltignore?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/.vltignore&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/empty_directory/dummy.txt&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
    (empty)

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/cloudservices/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-with-builtcd/jcr_root/etc/cloudservices/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/cloudservices/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/core/.content.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/cloudservices/.content.xml Fri Oct 20 01:54:59 2017
@@ -16,5 +16,5 @@
   limitations under the License.
   -->
 
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          jcr:primaryType="sling:Folder"/>
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/cloudservices/ooyala/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-with-builtcd/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-with-builtcd/jcr_root/etc/cloudservices/ooyala/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/cloudservices/ooyala/.content.xml Fri Oct 20 01:54:59 2017
@@ -16,5 +16,8 @@
   limitations under the License.
   -->
 
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          jcr:primaryType="nt:unstructured"
+          url="http://ooyala.com"
+          apiKey="someKey"
+/>
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/designs/some-thirdparty-libs/.content.xml (from r1812694, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/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-with-builtcd/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-with-builtcd/jcr_root/etc/designs/some-thirdparty-libs/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml&r1=1812694&r2=1812695&rev=1812695&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/empty-directories/jcr_root/apps/wcm/.content.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/etc/designs/some-thirdparty-libs/.content.xml Fri Oct 20 01:54:59 2017
@@ -16,5 +16,14 @@
   limitations under the License.
   -->
 
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+          xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+          jcr:primaryType="cq:Page">
+    <jcr:content
+            cq:doctype="html_5"
+            cq:template="/libs/wcm/core/templates/designpage"
+            jcr:primaryType="cq:PageContent"
+            jcr:title="some-thridparty-libs"
+            sling:resourceType="wcm/core/components/designer" />
+
+</jcr:root>