svn commit: r1767213 [1/4] - in /jackrabbit/commons/filevault/trunk: parent/ vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/ vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ vault-core/src/test/resources/...

[tr...@apache.org]

Author: tripod
Date: Mon Oct 31 01:55:37 2016
New Revision: 1767213

URL: http://svn.apache.org/viewvc?rev=1767213&view=rev
Log:
JCRVLT-138 Unzip test-packages for easier maintenance

Added:
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/config.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/nodetypes.cnd
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/config.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/nodetypes.cnd
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/node_a/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/node_a/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/node_b/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/node_b/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/secured/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/secured/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/secured/_rep_policy.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/config.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/definition/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/definition/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/nodetypes.cnd
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/node_a/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/node_a/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/node_b/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/node_b/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/secured/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/secured/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/secured/_rep_policy.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/config.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/definition/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/definition/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/nodetypes.cnd
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/node_a/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/node_a/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/node_b/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/node_b/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/secured/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/secured/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/secured/_rep_policy.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/config.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/definition/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/definition/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/nodetypes.cnd
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/node_a/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/node_a/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/node_b/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/node_b/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/secured/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/secured/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/secured/_rep_policy.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/config.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/definition/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/definition/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/nodetypes.cnd
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/node_a/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/node_a/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/node_b/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/node_b/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/secured/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/secured/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/secured/_rep_policy.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/config.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/definition/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/definition/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/nodetypes.cnd
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/testroot/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/testroot/node_c/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/testroot/node_c/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/testroot/secured/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/testroot/secured/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/testroot/secured/_rep_policy.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/vault/config.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/vault/definition/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/vault/definition/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/vault/nodetypes.cnd
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/node_d/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/node_d/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/secured/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/secured/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/secured/_rep_policy.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/vault/config.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/vault/definition/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/vault/definition/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/vault/nodetypes.cnd
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/node_e/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/node_e/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/secured/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/secured/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/secured/_rep_policy.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/config.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/definition/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/definition/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/nodetypes.cnd
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/testroot/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/testroot/node_d/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/testroot/node_d/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/testroot/secured/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/testroot/secured/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/testroot/secured/_rep_policy.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/vault/config.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/vault/definition/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/vault/definition/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/vault/nodetypes.cnd
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/jcr_root/testroot/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/jcr_root/testroot/secured/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/jcr_root/testroot/secured/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/vault/config.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/vault/definition/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/vault/definition/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/vault/nodetypes.cnd
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/testroot/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/testroot/node_a/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/testroot/node_a/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/testroot/secured/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/testroot/secured/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/testroot/secured/_rep_policy.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/vault/config.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/vault/definition/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/vault/definition/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/vault/nodetypes.cnd
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/vault/config.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/vault/definition/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/vault/definition/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/vault/nodetypes.cnd
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/jcr_root/_rep_repoPolicy.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/META-INF/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/META-INF/vault/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/META-INF/vault/filter.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/META-INF/vault/properties.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/jcr_root/
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/jcr_root/.content.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/jcr_root/_rep_policy.xml
Modified:
    jackrabbit/commons/filevault/trunk/parent/pom.xml
    jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/ZipVaultPackage.java
    jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
    jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java
    jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java

Modified: jackrabbit/commons/filevault/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/parent/pom.xml?rev=1767213&r1=1767212&r2=1767213&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/parent/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/parent/pom.xml Mon Oct 31 01:55:37 2016
@@ -181,6 +181,7 @@
                             <exclude>.idea/**</exclude>
                             <exclude>.gitignore</exclude>
                             <exclude>derby.log</exclude>
+                            <exclude>**/*.zip/**</exclude>
                         </excludes>
                     </configuration>
                 </plugin>

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/ZipVaultPackage.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/ZipVaultPackage.java?rev=1767213&r1=1767212&r2=1767213&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/ZipVaultPackage.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/ZipVaultPackage.java Mon Oct 31 01:55:37 2016
@@ -53,16 +53,16 @@ public class ZipVaultPackage extends Pac
 
     private Archive archive;
 
-    protected ZipVaultPackage(File file, boolean isTmpFile) throws IOException {
+    public ZipVaultPackage(File file, boolean isTmpFile) throws IOException {
         this(file, isTmpFile, false);
     }
 
-    protected ZipVaultPackage(File file, boolean isTmpFile, boolean strict)
+    public ZipVaultPackage(File file, boolean isTmpFile, boolean strict)
             throws IOException {
         this(new ZipArchive(file, isTmpFile), strict);
     }
 
-    protected ZipVaultPackage(Archive archive, boolean strict)
+    public ZipVaultPackage(Archive archive, boolean strict)
             throws IOException {
         this.archive = archive;
         if (strict) {

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java?rev=1767213&r1=1767212&r2=1767213&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java Mon Oct 31 01:55:37 2016
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -73,15 +74,19 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
 import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
 import org.apache.jackrabbit.vault.fs.api.ProgressTrackerListener;
+import org.apache.jackrabbit.vault.fs.io.FileArchive;
 import org.apache.jackrabbit.vault.fs.io.ImportOptions;
+import org.apache.jackrabbit.vault.packaging.JcrPackage;
 import org.apache.jackrabbit.vault.packaging.JcrPackageManager;
+import org.apache.jackrabbit.vault.packaging.PackageException;
+import org.apache.jackrabbit.vault.packaging.VaultPackage;
 import org.apache.jackrabbit.vault.packaging.impl.JcrPackageManagerImpl;
+import org.apache.jackrabbit.vault.packaging.impl.ZipVaultPackage;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -284,6 +289,39 @@ public class IntegrationTestBase  {
         return tmpFile;
     }
 
+    public VaultPackage loadVaultPackage(String name) throws IOException {
+        final URL packageURL = getClass().getResource(name);
+        final String filename = packageURL.getFile();
+        final File file = new File(filename);
+        return new ZipVaultPackage(new FileArchive(file), true);
+    }
+
+    public VaultPackage extractVaultPackage(String name) throws IOException, PackageException, RepositoryException {
+        return extractVaultPackage(name, null);
+    }
+
+    public VaultPackage extractVaultPackage(String name, ImportOptions opts) throws IOException, PackageException, RepositoryException {
+        if (opts == null) {
+            opts = getDefaultOptions();
+        }
+        VaultPackage pack = loadVaultPackage(name);
+        pack.extract(admin, opts);
+        return pack;
+    }
+
+    public JcrPackage installPackage(String name) throws IOException, RepositoryException, PackageException {
+        return installPackage(name, null);
+    }
+
+    public JcrPackage installPackage(String name, ImportOptions opts) throws IOException, RepositoryException, PackageException {
+        if (opts == null) {
+            opts = getDefaultOptions();
+        }
+        JcrPackage pack = packMgr.upload(getStream(name), false);
+        assertNotNull(pack);
+        pack.install(opts);
+        return pack;
+    }
 
     public ImportOptions getDefaultOptions() {
         ImportOptions opts = new ImportOptions();

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java?rev=1767213&r1=1767212&r2=1767213&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java Mon Oct 31 01:55:37 2016
@@ -18,26 +18,15 @@
 package org.apache.jackrabbit.vault.packaging.integration;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.security.AccessControlEntry;
-import javax.jcr.security.AccessControlPolicy;
-import javax.jcr.security.AccessControlPolicyIterator;
-import javax.jcr.security.Privilege;
 
 import org.apache.jackrabbit.api.JackrabbitSession;
-import org.apache.jackrabbit.api.security.JackrabbitAccessControlEntry;
-import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.UserManager;
-import org.apache.jackrabbit.core.security.principal.PrincipalImpl;
 import org.apache.jackrabbit.vault.fs.io.AccessControlHandling;
 import org.apache.jackrabbit.vault.fs.io.ImportOptions;
 import org.apache.jackrabbit.vault.packaging.JcrPackage;
@@ -49,7 +38,6 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 /**
  * AC Handling and import mode tests
@@ -93,17 +81,13 @@ public class TestACLAndMerge extends Int
     public void testACAndMerge() throws RepositoryException, IOException, PackageException {
         assertNodeMissing("/testroot");
 
-        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_a.zip");
 
         // test if nodes and ACLs of first package exist
         assertNodeExists("/testroot/node_a");
         assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
 
-        pack = packMgr.upload(getStream("testpackages/mode_ac_test_b.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_b.zip");
 
         // test if nodes and ACLs of 2nd package exist
         assertNodeExists("/testroot/node_a");
@@ -121,17 +105,13 @@ public class TestACLAndMerge extends Int
     public void testACMerge() throws RepositoryException, IOException, PackageException {
         assertNodeMissing("/testroot");
 
-        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_a.zip");
 
         // test if nodes and ACLs of first package exist
         assertNodeExists("/testroot/node_a");
         assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
 
-        pack = packMgr.upload(getStream("testpackages/mode_ac_test_b_merge.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_b_merge.zip");
 
         // test if nodes and ACLs of 2nd package exist
         assertNodeExists("/testroot/node_a");
@@ -148,17 +128,13 @@ public class TestACLAndMerge extends Int
     public void testACMergeSubpackage() throws RepositoryException, IOException, PackageException {
         assertNodeMissing("/testroot");
 
-        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_a.zip");
 
         // test if nodes and ACLs of first package exist
         assertNodeExists("/testroot/node_a");
         assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
 
-        pack = packMgr.upload(getStream("testpackages/mode_ac_subpackage.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        installPackage("testpackages/mode_ac_subpackage.zip");
 
         // test if nodes and ACLs of 2nd package exist
         assertNodeExists("/testroot/node_a");
@@ -175,17 +151,13 @@ public class TestACLAndMerge extends Int
     public void testACMerge4() throws RepositoryException, IOException, PackageException {
         assertNodeMissing("/testroot");
 
-        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_b2_merge.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_b2_merge.zip");
 
         // test if nodes and ACLs of first package exist
         assertNodeExists("/testroot/node_a");
         assertPermission("/testroot/secured", true, new String[]{"jcr:read", "jcr:write"}, "everyone", null);
 
-        pack = packMgr.upload(getStream("testpackages/mode_ac_test_b3_merge.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_b3_merge.zip");
 
         // test if nodes and ACLs of 2nd package exist
         assertNodeExists("/testroot/node_a");
@@ -201,17 +173,13 @@ public class TestACLAndMerge extends Int
     public void testACMerge2() throws RepositoryException, IOException, PackageException {
         assertNodeMissing("/testroot");
 
-        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_a.zip");
 
         // test if nodes and ACLs of first package exist
         assertNodeExists("/testroot/node_a");
         assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
 
-        pack = packMgr.upload(getStream("testpackages/mode_ac_test_c_merge.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_c_merge.zip");
 
         // test if nodes and ACLs of 2nd package exist
         assertNodeExists("/testroot/node_a");
@@ -228,17 +196,13 @@ public class TestACLAndMerge extends Int
     public void testACMerge3() throws RepositoryException, IOException, PackageException {
         assertNodeMissing("/testroot");
 
-        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_a.zip");
 
         // test if nodes and ACLs of first package exist
         assertNodeExists("/testroot/node_a");
         assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
 
-        pack = packMgr.upload(getStream("testpackages/mode_ac_test_d.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_d.zip");
 
         // test if nodes and ACLs of 2nd package exist
         assertNodeExists("/testroot/node_a");
@@ -255,19 +219,15 @@ public class TestACLAndMerge extends Int
     public void testACMergePreserve2() throws RepositoryException, IOException, PackageException {
         assertNodeMissing("/testroot");
 
-        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_a.zip");
 
         // test if nodes and ACLs of first package exist
         assertNodeExists("/testroot/node_a");
         assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
 
-        pack = packMgr.upload(getStream("testpackages/mode_ac_test_d.zip"), false);
-        assertNotNull(pack);
         ImportOptions opts = getDefaultOptions();
         opts.setAccessControlHandling(AccessControlHandling.MERGE_PRESERVE);
-        pack.install(opts);
+        extractVaultPackage("testpackages/mode_ac_test_d.zip", opts);
 
         // test if nodes and ACLs of 2nd package exist
         assertNodeExists("/testroot/node_a");
@@ -286,17 +246,13 @@ public class TestACLAndMerge extends Int
     public void testACMergePreserve() throws RepositoryException, IOException, PackageException {
         assertNodeMissing("/testroot");
 
-        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_a.zip");
 
         // test if nodes and ACLs of first package exist
         assertNodeExists("/testroot/node_a");
         assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
 
-        pack = packMgr.upload(getStream("testpackages/mode_ac_test_b_preserve.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_b_preserve.zip");
 
         // test if nodes and ACLs of 2nd package exist
         assertNodeExists("/testroot/node_a");
@@ -313,18 +269,14 @@ public class TestACLAndMerge extends Int
     public void testACMergePreserveNodeType() throws RepositoryException, IOException, PackageException {
         assertNodeMissing("/testroot");
 
-        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_a.zip");
 
         // test if nodes and ACLs of first package exist
         assertNodeExists("/testroot/node_a");
         assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
         assertProperty("/testroot/secured/jcr:primaryType", "nt:folder");
 
-        pack = packMgr.upload(getStream("testpackages/mode_ac_test_unsecured_nodetype.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_unsecured_nodetype.zip");
 
         // test if permissions remain and pt changed
         assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
@@ -387,11 +339,9 @@ public class TestACLAndMerge extends Int
     }
 
     private void doOrderTest(AccessControlHandling ac) throws Exception {
-        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_e.zip"), true);
-        assertNotNull(pack);
         ImportOptions opts = getDefaultOptions();
         opts.setAccessControlHandling(ac);
-        pack.install(opts);
+        extractVaultPackage("testpackages/mode_ac_test_e.zip", opts);
 
         // test if nodes and ACLs of first package exist
         assertNodeExists("/testroot/node_e");
@@ -412,9 +362,7 @@ public class TestACLAndMerge extends Int
         Assume.assumeTrue(isOak());
         assertNodeMissing("/testroot");
 
-        JcrPackage pack = packMgr.upload(getStream("testpackages/oak_ac_content_test.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/oak_ac_content_test.zip");
 
         // test if nodes and ACLs of first package exist
         assertNodeExists("/testroot/node_a");
@@ -435,9 +383,7 @@ public class TestACLAndMerge extends Int
     public void testMissingUser() throws RepositoryException, IOException, PackageException {
         assertNodeMissing("/testroot");
 
-        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_lateuser.zip"), false);
-        assertNotNull(pack);
-        pack.install(getDefaultOptions());
+        extractVaultPackage("testpackages/mode_ac_test_lateuser.zip");
 
         // test if nodes and ACLs of first package exist
         assertNodeExists("/testroot/node_d");
@@ -452,21 +398,17 @@ public class TestACLAndMerge extends Int
     public void testRepoACL() throws RepositoryException, IOException, PackageException {
         removeRepoACL();
 
-        JcrPackage pack = packMgr.upload(getStream("testpackages/repo_policy.zip"), false);
-        assertNotNull(pack);
         ImportOptions opts = getDefaultOptions();
         opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
-        pack.install(opts);
+        extractVaultPackage("testpackages/repo_policy.zip", opts);
 
         // test if nodes and ACLs of first package exist
         assertPermission(null, false, new String[]{"jcr:all"}, "everyone", null);
         assertPermission(null, false, new String[]{"jcr:all"}, "testuser", null);
 
-        pack = packMgr.upload(getStream("testpackages/repo_no_policy.zip"), true);
-        assertNotNull(pack);
         opts = getDefaultOptions();
         opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
-        pack.install(opts);
+        extractVaultPackage("testpackages/repo_no_policy.zip", opts);
 
         assertPermissionMissing(null, false, new String[]{"jcr:all"}, "everyone", null);
         assertPermissionMissing(null, false, new String[]{"jcr:all"}, "testuser", null);
@@ -484,11 +426,9 @@ public class TestACLAndMerge extends Int
         addACL(null, true, new String[]{"jcr:all"}, "testuser1");
         assertPermission(null, true, new String[]{"jcr:all"}, "testuser1", null);
 
-        JcrPackage pack = packMgr.upload(getStream("testpackages/repo_policy.zip"), false);
-        assertNotNull(pack);
         ImportOptions opts = getDefaultOptions();
         opts.setAccessControlHandling(AccessControlHandling.MERGE);
-        pack.install(opts);
+        extractVaultPackage("testpackages/repo_policy.zip", opts);
 
         // test if nodes and ACLs of first package exist
         assertPermission(null, false, new String[]{"jcr:all"}, "everyone", null);
@@ -507,11 +447,9 @@ public class TestACLAndMerge extends Int
         addACL(null, true, new String[]{"jcr:all"}, "testuser1");
         assertPermission(null, true, new String[]{"jcr:all"}, "testuser1", null);
 
-        JcrPackage pack = packMgr.upload(getStream("testpackages/repo_policy.zip"), false);
-        assertNotNull(pack);
         ImportOptions opts = getDefaultOptions();
         opts.setAccessControlHandling(AccessControlHandling.MERGE_PRESERVE);
-        pack.install(opts);
+        extractVaultPackage("testpackages/repo_policy.zip", opts);
 
         // test if nodes and ACLs of first package exist
         assertPermission(null, false, new String[]{"jcr:all"}, "everyone", null);
@@ -524,11 +462,9 @@ public class TestACLAndMerge extends Int
      */
     @Test
     public void testRootACL() throws RepositoryException, IOException, PackageException {
-        JcrPackage pack = packMgr.upload(getStream("testpackages/root_policy.zip"), false);
-        assertNotNull(pack);
         ImportOptions opts = getDefaultOptions();
         opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
-        pack.install(opts);
+        extractVaultPackage("testpackages/root_policy.zip", opts);
 
         // test if nodes and ACLs of first package exist
         assertPermission("/", true, new String[]{"jcr:all"}, "everyone", null);

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java?rev=1767213&r1=1767212&r2=1767213&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java Mon Oct 31 01:55:37 2016
@@ -20,15 +20,12 @@ package org.apache.jackrabbit.vault.pack
 import java.io.File;
 import java.io.IOException;
 
-import javax.jcr.Binary;
 import javax.jcr.NodeIterator;
 import javax.jcr.Property;
 import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.derby.impl.load.Import;
-import org.apache.jackrabbit.vault.fs.api.ProgressTrackerListener;
 import org.apache.jackrabbit.vault.fs.io.ImportOptions;
 import org.apache.jackrabbit.vault.packaging.InstallContext;
 import org.apache.jackrabbit.vault.packaging.JcrPackage;

Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/config.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/config.xml?rev=1767213&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/config.xml (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/config.xml Mon Oct 31 01:55:37 2016
@@ -0,0 +1,95 @@
+<!--
+
+  ADOBE CONFIDENTIAL
+  __________________
+
+   Copyright 2011 Adobe Systems Incorporated
+   All Rights Reserved.
+
+  NOTICE:  All information contained herein is, and remains
+  the property of Adobe Systems Incorporated and its suppliers,
+  if any.  The intellectual and technical concepts contained
+  herein are proprietary to Adobe Systems Incorporated and its
+  suppliers and are protected by trade secret or copyright law.
+  Dissemination of this information or reproduction of this material
+  is strictly forbidden unless prior written permission is obtained
+  from Adobe Systems Incorporated.
+
+  -->
+<vaultfs version="1.1">
+    <!--
+        Defines the content aggregation. The order of the defined aggregates
+        is important for finding the correct aggregator.
+    -->
+    <aggregates>
+        <!--
+            Defines an aggregate that handles nt:file and nt:resource nodes.
+        -->
+        <aggregate type="file" title="File Aggregate"/>
+
+        <!--
+            Defines an aggregate that handles file/folder like nodes. It matches
+            all nt:hierarchyNode nodes that have or define a jcr:content
+            child node and excludes child nodes that are nt:hierarchyNodes.
+        -->
+        <aggregate type="filefolder" title="File/Folder Aggregate"/>
+
+        <!--
+            Defines an aggregate that handles nt:nodeType nodes and serializes
+            them into .cnd notation.
+        -->
+        <aggregate type="nodetype" title="Node Type Aggregate" />
+
+        <!--
+            Defines an aggregate that defines full coverage for certain node
+            types that cannot be covered by the default aggregator.
+        -->
+        <aggregate type="full" title="Full Coverage Aggregate">
+            <matches>
+                <include nodeType="rep:AccessControl" respectSupertype="true" />
+                <include nodeType="rep:Policy" respectSupertype="true" />
+                <include nodeType="cq:Widget" respectSupertype="true" />
+                <include nodeType="cq:EditConfig" respectSupertype="true" />
+                <include nodeType="cq:WorkflowModel" respectSupertype="true" />
+                <include nodeType="vlt:FullCoverage" respectSupertype="true" />
+                <include nodeType="mix:language" respectSupertype="true" />
+                <include nodeType="sling:OsgiConfig" respectSupertype="true" />
+            </matches>
+        </aggregate>
+
+        <!--
+            Defines an aggregate that handles nt:folder like nodes.
+        -->
+        <aggregate type="generic" title="Folder Aggregate">
+            <matches>
+                <include nodeType="nt:folder" respectSupertype="true" />
+            </matches>
+            <contains>
+                <exclude isNode="true" />
+            </contains>
+        </aggregate>
+
+        <!--
+            Defines the default aggregate
+        -->
+        <aggregate type="generic" title="Default Aggregator" isDefault="true">
+            <matches>
+                <!-- all -->
+            </matches>
+            <contains>
+                <exclude nodeType="nt:hierarchyNode" respectSupertype="true" />
+            </contains>
+        </aggregate>
+
+    </aggregates>
+
+    <!--
+      defines the input handlers
+    -->
+    <handlers>
+        <handler type="folder"/>
+        <handler type="file"/>
+        <handler type="nodetype"/>
+        <handler type="generic"/>
+    </handlers>
+</vaultfs>

Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/.content.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/.content.xml?rev=1767213&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/.content.xml (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/.content.xml Mon Oct 31 01:55:37 2016
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:created="{Date}2011-11-15T09:43:22.972+01:00"
+    jcr:createdBy="admin"
+    jcr:description=""
+    jcr:lastModified="{Date}2011-11-15T09:43:22.972+01:00"
+    jcr:lastModifiedBy="admin"
+    jcr:primaryType="vlt:PackageDefinition"
+    buildCount="1"
+    cqVersion="5.3"
+    group=""
+    lastUnwrapped="{Date}2011-11-15T09:43:22.972+01:00"
+    lastUnwrappedBy="admin"
+    lastWrapped="{Date}2011-11-15T09:43:22.972+01:00"
+    lastWrappedBy="admin"
+    name="mode_ac_test_a"
+    version="">
+    <filter jcr:primaryType="nt:unstructured">
+        <f0
+            jcr:primaryType="nt:unstructured"
+            mode="replace"
+            root="/testroot"
+            rules="[]"/>
+    </filter>
+</jcr:root>

Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/filter.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/filter.xml?rev=1767213&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/filter.xml (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/filter.xml Mon Oct 31 01:55:37 2016
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspaceFilter version="1.0">
+    <filter root="/testroot" mode="merge"/>
+</workspaceFilter>

Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/nodetypes.cnd
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/nodetypes.cnd?rev=1767213&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/nodetypes.cnd (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/nodetypes.cnd Mon Oct 31 01:55:37 2016
@@ -0,0 +1,8 @@
+<'sling'='http://sling.apache.org/jcr/sling/1.0'>
+<'nt'='http://www.jcp.org/jcr/nt/1.0'>
+
+[sling:Folder] > nt:folder
+  - * (undefined)
+  - * (undefined) multiple
+  + * (nt:base) = sling:Folder version
+

Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/properties.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/properties.xml?rev=1767213&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/properties.xml (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/properties.xml Mon Oct 31 01:55:37 2016
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>FileVault Package Properties</comment>
+<entry key="createdBy">admin</entry>
+<entry key="name">mode_ac_test_a</entry>
+<entry key="lastModified">2011-11-15T09:43:22.972+01:00</entry>
+<entry key="lastModifiedBy">admin</entry>
+<entry key="created">2011-11-15T09:43:22.993+01:00</entry>
+<entry key="buildCount">1</entry>
+<entry key="version"/>
+<entry key="dependencies"/>
+<entry key="packageFormatVersion">2</entry>
+<entry key="description"/>
+<entry key="lastWrapped">2011-11-15T09:43:22.972+01:00</entry>
+<entry key="group"/>
+<entry key="lastWrappedBy">admin</entry>
+<entry key="acHandling">overwrite</entry>
+</properties>

Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/.content.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/.content.xml?rev=1767213&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/.content.xml (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/.content.xml Mon Oct 31 01:55:37 2016
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="rep:root"
+    sling:resourceType="sling:redirect"
+    sling:target="/index.html">
+    <rep:policy/>
+    <jcr:system/>
+    <var/>
+    <libs/>
+    <etc/>
+    <apps/>
+    <content/>
+    <tmp/>
+    <home/>
+    <testroot/>
+</jcr:root>

Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/.content.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/.content.xml?rev=1767213&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/.content.xml (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/.content.xml Mon Oct 31 01:55:37 2016
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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"
+    title="1234"/>

Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/.content.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/.content.xml?rev=1767213&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/.content.xml (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/.content.xml Mon Oct 31 01:55:37 2016
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="nt:folder"/>

Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml?rev=1767213&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml Mon Oct 31 01:55:37 2016
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:primaryType="rep:ACL">
+    <deny
+        jcr:primaryType="rep:DenyACE"
+        rep:principalName="everyone"
+        rep:privileges="{Name}[jcr:all]"/>
+</jcr:root>

Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/config.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/config.xml?rev=1767213&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/config.xml (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/config.xml Mon Oct 31 01:55:37 2016
@@ -0,0 +1,95 @@
+<!--
+
+  ADOBE CONFIDENTIAL
+  __________________
+
+   Copyright 2011 Adobe Systems Incorporated
+   All Rights Reserved.
+
+  NOTICE:  All information contained herein is, and remains
+  the property of Adobe Systems Incorporated and its suppliers,
+  if any.  The intellectual and technical concepts contained
+  herein are proprietary to Adobe Systems Incorporated and its
+  suppliers and are protected by trade secret or copyright law.
+  Dissemination of this information or reproduction of this material
+  is strictly forbidden unless prior written permission is obtained
+  from Adobe Systems Incorporated.
+
+  -->
+<vaultfs version="1.1">
+    <!--
+        Defines the content aggregation. The order of the defined aggregates
+        is important for finding the correct aggregator.
+    -->
+    <aggregates>
+        <!--
+            Defines an aggregate that handles nt:file and nt:resource nodes.
+        -->
+        <aggregate type="file" title="File Aggregate"/>
+
+        <!--
+            Defines an aggregate that handles file/folder like nodes. It matches
+            all nt:hierarchyNode nodes that have or define a jcr:content
+            child node and excludes child nodes that are nt:hierarchyNodes.
+        -->
+        <aggregate type="filefolder" title="File/Folder Aggregate"/>
+
+        <!--
+            Defines an aggregate that handles nt:nodeType nodes and serializes
+            them into .cnd notation.
+        -->
+        <aggregate type="nodetype" title="Node Type Aggregate" />
+
+        <!--
+            Defines an aggregate that defines full coverage for certain node
+            types that cannot be covered by the default aggregator.
+        -->
+        <aggregate type="full" title="Full Coverage Aggregate">
+            <matches>
+                <include nodeType="rep:AccessControl" respectSupertype="true" />
+                <include nodeType="rep:Policy" respectSupertype="true" />
+                <include nodeType="cq:Widget" respectSupertype="true" />
+                <include nodeType="cq:EditConfig" respectSupertype="true" />
+                <include nodeType="cq:WorkflowModel" respectSupertype="true" />
+                <include nodeType="vlt:FullCoverage" respectSupertype="true" />
+                <include nodeType="mix:language" respectSupertype="true" />
+                <include nodeType="sling:OsgiConfig" respectSupertype="true" />
+            </matches>
+        </aggregate>
+
+        <!--
+            Defines an aggregate that handles nt:folder like nodes.
+        -->
+        <aggregate type="generic" title="Folder Aggregate">
+            <matches>
+                <include nodeType="nt:folder" respectSupertype="true" />
+            </matches>
+            <contains>
+                <exclude isNode="true" />
+            </contains>
+        </aggregate>
+
+        <!--
+            Defines the default aggregate
+        -->
+        <aggregate type="generic" title="Default Aggregator" isDefault="true">
+            <matches>
+                <!-- all -->
+            </matches>
+            <contains>
+                <exclude nodeType="nt:hierarchyNode" respectSupertype="true" />
+            </contains>
+        </aggregate>
+
+    </aggregates>
+
+    <!--
+      defines the input handlers
+    -->
+    <handlers>
+        <handler type="folder"/>
+        <handler type="file"/>
+        <handler type="nodetype"/>
+        <handler type="generic"/>
+    </handlers>
+</vaultfs>

Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/.content.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/.content.xml?rev=1767213&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/.content.xml (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/.content.xml Mon Oct 31 01:55:37 2016
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:created="{Date}2011-11-15T09:45:14.664+01:00"
+    jcr:createdBy="admin"
+    jcr:description=""
+    jcr:lastModified="{Date}2011-11-15T09:45:14.664+01:00"
+    jcr:lastModifiedBy="admin"
+    jcr:primaryType="vlt:PackageDefinition"
+    buildCount="1"
+    cqVersion="5.3"
+    group=""
+    lastUnwrapped="{Date}2011-11-15T09:45:14.664+01:00"
+    lastUnwrappedBy="admin"
+    lastWrapped="{Date}2011-11-15T09:45:14.664+01:00"
+    lastWrappedBy="admin"
+    name="mode_ac_test_b"
+    version="">
+    <filter jcr:primaryType="nt:unstructured">
+        <f0
+            jcr:primaryType="nt:unstructured"
+            mode="replace"
+            root="/testroot"
+            rules="[]"/>
+    </filter>
+</jcr:root>

Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/filter.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/filter.xml?rev=1767213&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/filter.xml (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/filter.xml Mon Oct 31 01:55:37 2016
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspaceFilter version="1.0">
+    <filter root="/testroot" mode="merge"/>
+</workspaceFilter>

Re: svn commit: r1767213 [1/4] - in /jackrabbit/commons/filevault/trunk: parent/ vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/ vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ vault-core/src/test/resources/...

[Tobias Bocanegra <tr...@apache.org>]

Hi Julian,

thanks for the info. well, it doesn't matter if they are inside the zip or
not :-)
but it might be good to clean them.

regards, toby

On Mon, Oct 31, 2016 at 7:43 PM, Julian Sedding <js...@gmail.com> wrote:

> Hi Tobi
>
> Thanks for the change.
>
> Note: some of the files from the extracted packages have Adobe headers
> and other are missing the Apache license headers.
>
> Regards
> Julian
>
>
> On Mon, Oct 31, 2016 at 2:55 AM,  <tr...@apache.org> wrote:
> > Author: tripod
> > Date: Mon Oct 31 01:55:37 2016
> > New Revision: 1767213
> >
> > URL: http://svn.apache.org/viewvc?rev=1767213&view=rev
> > Log:
> > JCRVLT-138 Unzip test-packages for easier maintenance
> >
> > Added:
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/config.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/
> definition/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/nodetypes.cnd
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/
> testroot/node_a/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/
> testroot/secured/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/
> testroot/secured/_rep_policy.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/config.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/
> definition/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/nodetypes.cnd
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/node_a/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/jcr_root/
> testroot/node_a/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/node_b/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/jcr_root/
> testroot/node_b/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/secured/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/jcr_root/
> testroot/secured/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/jcr_root/
> testroot/secured/_rep_policy.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/
> vault/config.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/
> vault/definition/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/
> vault/definition/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/
> vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/
> vault/nodetypes.cnd
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/
> vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/
> testroot/node_a/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/
> testroot/node_a/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/
> testroot/node_b/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/
> testroot/node_b/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/
> testroot/secured/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/
> testroot/secured/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/
> testroot/secured/_rep_policy.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/
> vault/config.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/
> vault/definition/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/
> vault/definition/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/
> vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/
> vault/nodetypes.cnd
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/
> vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/
> testroot/node_a/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/
> testroot/node_a/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/
> testroot/node_b/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/
> testroot/node_b/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/
> testroot/secured/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/
> testroot/secured/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/
> testroot/secured/_rep_policy.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/META-INF/
> vault/config.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/META-INF/
> vault/definition/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/META-INF/
> vault/definition/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/META-INF/
> vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/META-INF/
> vault/nodetypes.cnd
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/META-INF/
> vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/
> testroot/node_a/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/
> testroot/node_a/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/
> testroot/node_b/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/
> testroot/node_b/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/
> testroot/secured/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/
> testroot/secured/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/
> testroot/secured/_rep_policy.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/META-
> INF/vault/config.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/META-
> INF/vault/definition/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/META-
> INF/vault/definition/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/META-
> INF/vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/META-
> INF/vault/nodetypes.cnd
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/META-
> INF/vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/jcr_
> root/testroot/node_a/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/jcr_
> root/testroot/node_a/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/jcr_
> root/testroot/node_b/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/jcr_
> root/testroot/node_b/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/jcr_
> root/testroot/secured/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/jcr_
> root/testroot/secured/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b_preserve.zip/jcr_
> root/testroot/secured/_rep_policy.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/META-INF/
> vault/config.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/META-INF/
> vault/definition/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/META-INF/
> vault/definition/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/META-INF/
> vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/META-INF/
> vault/nodetypes.cnd
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/META-INF/
> vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/testroot/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/
> testroot/node_c/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/
> testroot/node_c/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/
> testroot/secured/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/
> testroot/secured/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/
> testroot/secured/_rep_policy.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/META-INF/vault/config.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/META-INF/vault/definition/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/META-INF/vault/
> definition/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/META-INF/vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/META-INF/vault/nodetypes.cnd
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/META-INF/vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/node_d/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/jcr_root/
> testroot/node_d/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/secured/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/jcr_root/
> testroot/secured/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_d.zip/jcr_root/
> testroot/secured/_rep_policy.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/META-INF/vault/config.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/META-INF/vault/definition/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/META-INF/vault/
> definition/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/META-INF/vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/META-INF/vault/nodetypes.cnd
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/META-INF/vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/node_e/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/jcr_root/
> testroot/node_e/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/secured/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/jcr_root/
> testroot/secured/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_e.zip/jcr_root/
> testroot/secured/_rep_policy.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/META-INF/
> vault/config.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/META-INF/
> vault/definition/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/META-INF/
> vault/definition/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/META-INF/
> vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/META-INF/
> vault/nodetypes.cnd
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/META-INF/
> vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/testroot/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/
> testroot/node_d/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/
> testroot/node_d/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/
> testroot/secured/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/
> testroot/secured/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/
> testroot/secured/_rep_policy.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_unsecured_nodetype.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_unsecured_nodetype.
> zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_unsecured_nodetype.
> zip/META-INF/vault/config.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_unsecured_nodetype.
> zip/META-INF/vault/definition/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_unsecured_nodetype.
> zip/META-INF/vault/definition/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_unsecured_nodetype.
> zip/META-INF/vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_unsecured_nodetype.
> zip/META-INF/vault/nodetypes.cnd
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_unsecured_nodetype.
> zip/META-INF/vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_unsecured_nodetype.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_unsecured_nodetype.
> zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_unsecured_nodetype.
> zip/jcr_root/testroot/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_unsecured_nodetype.
> zip/jcr_root/testroot/secured/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_unsecured_nodetype.
> zip/jcr_root/testroot/secured/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/META-INF/vault/config.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/META-INF/
> vault/definition/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/META-INF/
> vault/definition/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/META-INF/vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/META-INF/
> vault/nodetypes.cnd
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/META-INF/
> vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/jcr_root/testroot/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/jcr_root/testroot/node_a/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/jcr_root/
> testroot/node_a/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/jcr_root/
> testroot/secured/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/jcr_root/
> testroot/secured/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/oak_ac_content_test.zip/jcr_root/
> testroot/secured/_rep_policy.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_no_policy.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_no_policy.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_no_policy.zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_no_policy.zip/META-INF/vault/config.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_no_policy.zip/META-INF/vault/definition/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_no_policy.zip/META-INF/vault/
> definition/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_no_policy.zip/META-INF/vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_no_policy.zip/META-INF/vault/nodetypes.cnd
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_no_policy.zip/META-INF/vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_no_policy.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_no_policy.zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_policy.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_policy.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_policy.zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_policy.zip/META-INF/vault/config.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_policy.zip/META-INF/vault/definition/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_policy.zip/META-INF/vault/
> definition/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_policy.zip/META-INF/vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_policy.zip/META-INF/vault/nodetypes.cnd
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_policy.zip/META-INF/vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_policy.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_policy.zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/repo_policy.zip/jcr_root/_rep_repoPolicy.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/root_policy.zip/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/root_policy.zip/META-INF/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/root_policy.zip/META-INF/vault/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/root_policy.zip/META-INF/vault/filter.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/root_policy.zip/META-INF/vault/properties.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/root_policy.zip/jcr_root/
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/root_policy.zip/jcr_root/.content.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/root_policy.zip/jcr_root/_rep_policy.xml
> > Modified:
> >     jackrabbit/commons/filevault/trunk/parent/pom.xml
> >     jackrabbit/commons/filevault/trunk/vault-core/src/main/
> java/org/apache/jackrabbit/vault/packaging/impl/ZipVaultPackage.java
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> java/org/apache/jackrabbit/vault/packaging/integration/
> IntegrationTestBase.java
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> java/org/apache/jackrabbit/vault/packaging/integration/
> TestACLAndMerge.java
> >     jackrabbit/commons/filevault/trunk/vault-core/src/test/
> java/org/apache/jackrabbit/vault/packaging/integration/
> TestPackageInstall.java
> >
> > Modified: jackrabbit/commons/filevault/trunk/parent/pom.xml
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/parent/pom.xml?rev=1767213&r1=1767212&r2=1767213&view=diff
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/parent/pom.xml (original)
> > +++ jackrabbit/commons/filevault/trunk/parent/pom.xml Mon Oct 31
> 01:55:37 2016
> > @@ -181,6 +181,7 @@
> >                              <exclude>.idea/**</exclude>
> >                              <exclude>.gitignore</exclude>
> >                              <exclude>derby.log</exclude>
> > +                            <exclude>**/*.zip/**</exclude>
> >                          </excludes>
> >                      </configuration>
> >                  </plugin>
> >
> > Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/
> java/org/apache/jackrabbit/vault/packaging/impl/ZipVaultPackage.java
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/
> ZipVaultPackage.java?rev=1767213&r1=1767212&r2=1767213&view=diff
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/main/
> java/org/apache/jackrabbit/vault/packaging/impl/ZipVaultPackage.java
> (original)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/main/
> java/org/apache/jackrabbit/vault/packaging/impl/ZipVaultPackage.java Mon
> Oct 31 01:55:37 2016
> > @@ -53,16 +53,16 @@ public class ZipVaultPackage extends Pac
> >
> >      private Archive archive;
> >
> > -    protected ZipVaultPackage(File file, boolean isTmpFile) throws
> IOException {
> > +    public ZipVaultPackage(File file, boolean isTmpFile) throws
> IOException {
> >          this(file, isTmpFile, false);
> >      }
> >
> > -    protected ZipVaultPackage(File file, boolean isTmpFile, boolean
> strict)
> > +    public ZipVaultPackage(File file, boolean isTmpFile, boolean strict)
> >              throws IOException {
> >          this(new ZipArchive(file, isTmpFile), strict);
> >      }
> >
> > -    protected ZipVaultPackage(Archive archive, boolean strict)
> > +    public ZipVaultPackage(Archive archive, boolean strict)
> >              throws IOException {
> >          this.archive = archive;
> >          if (strict) {
> >
> > Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> java/org/apache/jackrabbit/vault/packaging/integration/
> IntegrationTestBase.java
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/java/org/apache/jackrabbit/
> vault/packaging/integration/IntegrationTestBase.java?rev=
> 1767213&r1=1767212&r2=1767213&view=diff
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
> (original)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
> Mon Oct 31 01:55:37 2016
> > @@ -21,6 +21,7 @@ import java.io.File;
> >  import java.io.FileOutputStream;
> >  import java.io.IOException;
> >  import java.io.InputStream;
> > +import java.net.URL;
> >  import java.util.ArrayList;
> >  import java.util.Arrays;
> >  import java.util.HashMap;
> > @@ -73,15 +74,19 @@ import org.apache.jackrabbit.oak.spi.sec
> >  import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
> >  import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
> >  import org.apache.jackrabbit.vault.fs.api.ProgressTrackerListener;
> > +import org.apache.jackrabbit.vault.fs.io.FileArchive;
> >  import org.apache.jackrabbit.vault.fs.io.ImportOptions;
> > +import org.apache.jackrabbit.vault.packaging.JcrPackage;
> >  import org.apache.jackrabbit.vault.packaging.JcrPackageManager;
> > +import org.apache.jackrabbit.vault.packaging.PackageException;
> > +import org.apache.jackrabbit.vault.packaging.VaultPackage;
> >  import org.apache.jackrabbit.vault.packaging.impl.
> JcrPackageManagerImpl;
> > +import org.apache.jackrabbit.vault.packaging.impl.ZipVaultPackage;
> >  import org.junit.After;
> >  import org.junit.AfterClass;
> >  import org.junit.Before;
> >  import org.junit.BeforeClass;
> >  import org.junit.ClassRule;
> > -import org.junit.Rule;
> >  import org.junit.rules.TemporaryFolder;
> >  import org.slf4j.Logger;
> >  import org.slf4j.LoggerFactory;
> > @@ -284,6 +289,39 @@ public class IntegrationTestBase  {
> >          return tmpFile;
> >      }
> >
> > +    public VaultPackage loadVaultPackage(String name) throws
> IOException {
> > +        final URL packageURL = getClass().getResource(name);
> > +        final String filename = packageURL.getFile();
> > +        final File file = new File(filename);
> > +        return new ZipVaultPackage(new FileArchive(file), true);
> > +    }
> > +
> > +    public VaultPackage extractVaultPackage(String name) throws
> IOException, PackageException, RepositoryException {
> > +        return extractVaultPackage(name, null);
> > +    }
> > +
> > +    public VaultPackage extractVaultPackage(String name, ImportOptions
> opts) throws IOException, PackageException, RepositoryException {
> > +        if (opts == null) {
> > +            opts = getDefaultOptions();
> > +        }
> > +        VaultPackage pack = loadVaultPackage(name);
> > +        pack.extract(admin, opts);
> > +        return pack;
> > +    }
> > +
> > +    public JcrPackage installPackage(String name) throws IOException,
> RepositoryException, PackageException {
> > +        return installPackage(name, null);
> > +    }
> > +
> > +    public JcrPackage installPackage(String name, ImportOptions opts)
> throws IOException, RepositoryException, PackageException {
> > +        if (opts == null) {
> > +            opts = getDefaultOptions();
> > +        }
> > +        JcrPackage pack = packMgr.upload(getStream(name), false);
> > +        assertNotNull(pack);
> > +        pack.install(opts);
> > +        return pack;
> > +    }
> >
> >      public ImportOptions getDefaultOptions() {
> >          ImportOptions opts = new ImportOptions();
> >
> > Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> java/org/apache/jackrabbit/vault/packaging/integration/
> TestACLAndMerge.java
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/java/org/apache/jackrabbit/
> vault/packaging/integration/TestACLAndMerge.java?rev=
> 1767213&r1=1767212&r2=1767213&view=diff
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java
> (original)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java
> Mon Oct 31 01:55:37 2016
> > @@ -18,26 +18,15 @@
> >  package org.apache.jackrabbit.vault.packaging.integration;
> >
> >  import java.io.IOException;
> > -import java.util.Arrays;
> >  import java.util.Collections;
> >  import java.util.HashMap;
> > -import java.util.HashSet;
> >  import java.util.Map;
> > -import java.util.Set;
> >
> >  import javax.jcr.RepositoryException;
> > -import javax.jcr.Value;
> > -import javax.jcr.security.AccessControlEntry;
> > -import javax.jcr.security.AccessControlPolicy;
> > -import javax.jcr.security.AccessControlPolicyIterator;
> > -import javax.jcr.security.Privilege;
> >
> >  import org.apache.jackrabbit.api.JackrabbitSession;
> > -import org.apache.jackrabbit.api.security.JackrabbitAccessControlEntry;
> > -import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
> >  import org.apache.jackrabbit.api.security.user.Authorizable;
> >  import org.apache.jackrabbit.api.security.user.UserManager;
> > -import org.apache.jackrabbit.core.security.principal.PrincipalImpl;
> >  import org.apache.jackrabbit.vault.fs.io.AccessControlHandling;
> >  import org.apache.jackrabbit.vault.fs.io.ImportOptions;
> >  import org.apache.jackrabbit.vault.packaging.JcrPackage;
> > @@ -49,7 +38,6 @@ import org.junit.Test;
> >  import static org.junit.Assert.assertEquals;
> >  import static org.junit.Assert.assertNotNull;
> >  import static org.junit.Assert.assertTrue;
> > -import static org.junit.Assert.fail;
> >
> >  /**
> >   * AC Handling and import mode tests
> > @@ -93,17 +81,13 @@ public class TestACLAndMerge extends Int
> >      public void testACAndMerge() throws RepositoryException,
> IOException, PackageException {
> >          assertNodeMissing("/testroot");
> >
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/mode_ac_test_a.zip"), false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
> >
> >          // test if nodes and ACLs of first package exist
> >          assertNodeExists("/testroot/node_a");
> >          assertPermission("/testroot/secured", false, new
> String[]{"jcr:all"}, "everyone", null);
> >
> > -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_b.zip"),
> false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_b.zip");
> >
> >          // test if nodes and ACLs of 2nd package exist
> >          assertNodeExists("/testroot/node_a");
> > @@ -121,17 +105,13 @@ public class TestACLAndMerge extends Int
> >      public void testACMerge() throws RepositoryException, IOException,
> PackageException {
> >          assertNodeMissing("/testroot");
> >
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/mode_ac_test_a.zip"), false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
> >
> >          // test if nodes and ACLs of first package exist
> >          assertNodeExists("/testroot/node_a");
> >          assertPermission("/testroot/secured", false, new
> String[]{"jcr:all"}, "everyone", null);
> >
> > -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_b_merge.zip"),
> false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_b_merge.zip");
> >
> >          // test if nodes and ACLs of 2nd package exist
> >          assertNodeExists("/testroot/node_a");
> > @@ -148,17 +128,13 @@ public class TestACLAndMerge extends Int
> >      public void testACMergeSubpackage() throws RepositoryException,
> IOException, PackageException {
> >          assertNodeMissing("/testroot");
> >
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/mode_ac_test_a.zip"), false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
> >
> >          // test if nodes and ACLs of first package exist
> >          assertNodeExists("/testroot/node_a");
> >          assertPermission("/testroot/secured", false, new
> String[]{"jcr:all"}, "everyone", null);
> >
> > -        pack = packMgr.upload(getStream("testpackages/mode_ac_subpackage.zip"),
> false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        installPackage("testpackages/mode_ac_subpackage.zip");
> >
> >          // test if nodes and ACLs of 2nd package exist
> >          assertNodeExists("/testroot/node_a");
> > @@ -175,17 +151,13 @@ public class TestACLAndMerge extends Int
> >      public void testACMerge4() throws RepositoryException, IOException,
> PackageException {
> >          assertNodeMissing("/testroot");
> >
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/mode_ac_test_b2_merge.zip"), false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_b2_merge.zip");
> >
> >          // test if nodes and ACLs of first package exist
> >          assertNodeExists("/testroot/node_a");
> >          assertPermission("/testroot/secured", true, new
> String[]{"jcr:read", "jcr:write"}, "everyone", null);
> >
> > -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_b3_merge.zip"),
> false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_b3_merge.zip");
> >
> >          // test if nodes and ACLs of 2nd package exist
> >          assertNodeExists("/testroot/node_a");
> > @@ -201,17 +173,13 @@ public class TestACLAndMerge extends Int
> >      public void testACMerge2() throws RepositoryException, IOException,
> PackageException {
> >          assertNodeMissing("/testroot");
> >
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/mode_ac_test_a.zip"), false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
> >
> >          // test if nodes and ACLs of first package exist
> >          assertNodeExists("/testroot/node_a");
> >          assertPermission("/testroot/secured", false, new
> String[]{"jcr:all"}, "everyone", null);
> >
> > -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_c_merge.zip"),
> false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_c_merge.zip");
> >
> >          // test if nodes and ACLs of 2nd package exist
> >          assertNodeExists("/testroot/node_a");
> > @@ -228,17 +196,13 @@ public class TestACLAndMerge extends Int
> >      public void testACMerge3() throws RepositoryException, IOException,
> PackageException {
> >          assertNodeMissing("/testroot");
> >
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/mode_ac_test_a.zip"), false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
> >
> >          // test if nodes and ACLs of first package exist
> >          assertNodeExists("/testroot/node_a");
> >          assertPermission("/testroot/secured", false, new
> String[]{"jcr:all"}, "everyone", null);
> >
> > -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_d.zip"),
> false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_d.zip");
> >
> >          // test if nodes and ACLs of 2nd package exist
> >          assertNodeExists("/testroot/node_a");
> > @@ -255,19 +219,15 @@ public class TestACLAndMerge extends Int
> >      public void testACMergePreserve2() throws RepositoryException,
> IOException, PackageException {
> >          assertNodeMissing("/testroot");
> >
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/mode_ac_test_a.zip"), false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
> >
> >          // test if nodes and ACLs of first package exist
> >          assertNodeExists("/testroot/node_a");
> >          assertPermission("/testroot/secured", false, new
> String[]{"jcr:all"}, "everyone", null);
> >
> > -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_d.zip"),
> false);
> > -        assertNotNull(pack);
> >          ImportOptions opts = getDefaultOptions();
> >          opts.setAccessControlHandling(AccessControlHandling.MERGE_
> PRESERVE);
> > -        pack.install(opts);
> > +        extractVaultPackage("testpackages/mode_ac_test_d.zip", opts);
> >
> >          // test if nodes and ACLs of 2nd package exist
> >          assertNodeExists("/testroot/node_a");
> > @@ -286,17 +246,13 @@ public class TestACLAndMerge extends Int
> >      public void testACMergePreserve() throws RepositoryException,
> IOException, PackageException {
> >          assertNodeMissing("/testroot");
> >
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/mode_ac_test_a.zip"), false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
> >
> >          // test if nodes and ACLs of first package exist
> >          assertNodeExists("/testroot/node_a");
> >          assertPermission("/testroot/secured", false, new
> String[]{"jcr:all"}, "everyone", null);
> >
> > -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_b_preserve.zip"),
> false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_b_
> preserve.zip");
> >
> >          // test if nodes and ACLs of 2nd package exist
> >          assertNodeExists("/testroot/node_a");
> > @@ -313,18 +269,14 @@ public class TestACLAndMerge extends Int
> >      public void testACMergePreserveNodeType() throws
> RepositoryException, IOException, PackageException {
> >          assertNodeMissing("/testroot");
> >
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/mode_ac_test_a.zip"), false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
> >
> >          // test if nodes and ACLs of first package exist
> >          assertNodeExists("/testroot/node_a");
> >          assertPermission("/testroot/secured", false, new
> String[]{"jcr:all"}, "everyone", null);
> >          assertProperty("/testroot/secured/jcr:primaryType",
> "nt:folder");
> >
> > -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_unsecured_nodetype.zip"),
> false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_
> unsecured_nodetype.zip");
> >
> >          // test if permissions remain and pt changed
> >          assertPermission("/testroot/secured", false, new
> String[]{"jcr:all"}, "everyone", null);
> > @@ -387,11 +339,9 @@ public class TestACLAndMerge extends Int
> >      }
> >
> >      private void doOrderTest(AccessControlHandling ac) throws
> Exception {
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/mode_ac_test_e.zip"), true);
> > -        assertNotNull(pack);
> >          ImportOptions opts = getDefaultOptions();
> >          opts.setAccessControlHandling(ac);
> > -        pack.install(opts);
> > +        extractVaultPackage("testpackages/mode_ac_test_e.zip", opts);
> >
> >          // test if nodes and ACLs of first package exist
> >          assertNodeExists("/testroot/node_e");
> > @@ -412,9 +362,7 @@ public class TestACLAndMerge extends Int
> >          Assume.assumeTrue(isOak());
> >          assertNodeMissing("/testroot");
> >
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/oak_ac_content_test.zip"), false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/oak_ac_content_test.zip");
> >
> >          // test if nodes and ACLs of first package exist
> >          assertNodeExists("/testroot/node_a");
> > @@ -435,9 +383,7 @@ public class TestACLAndMerge extends Int
> >      public void testMissingUser() throws RepositoryException,
> IOException, PackageException {
> >          assertNodeMissing("/testroot");
> >
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/mode_ac_test_lateuser.zip"), false);
> > -        assertNotNull(pack);
> > -        pack.install(getDefaultOptions());
> > +        extractVaultPackage("testpackages/mode_ac_test_lateuser.zip");
> >
> >          // test if nodes and ACLs of first package exist
> >          assertNodeExists("/testroot/node_d");
> > @@ -452,21 +398,17 @@ public class TestACLAndMerge extends Int
> >      public void testRepoACL() throws RepositoryException, IOException,
> PackageException {
> >          removeRepoACL();
> >
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/repo_policy.zip"), false);
> > -        assertNotNull(pack);
> >          ImportOptions opts = getDefaultOptions();
> >          opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
> > -        pack.install(opts);
> > +        extractVaultPackage("testpackages/repo_policy.zip", opts);
> >
> >          // test if nodes and ACLs of first package exist
> >          assertPermission(null, false, new String[]{"jcr:all"},
> "everyone", null);
> >          assertPermission(null, false, new String[]{"jcr:all"},
> "testuser", null);
> >
> > -        pack = packMgr.upload(getStream("testpackages/repo_no_policy.zip"),
> true);
> > -        assertNotNull(pack);
> >          opts = getDefaultOptions();
> >          opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
> > -        pack.install(opts);
> > +        extractVaultPackage("testpackages/repo_no_policy.zip", opts);
> >
> >          assertPermissionMissing(null, false, new String[]{"jcr:all"},
> "everyone", null);
> >          assertPermissionMissing(null, false, new String[]{"jcr:all"},
> "testuser", null);
> > @@ -484,11 +426,9 @@ public class TestACLAndMerge extends Int
> >          addACL(null, true, new String[]{"jcr:all"}, "testuser1");
> >          assertPermission(null, true, new String[]{"jcr:all"},
> "testuser1", null);
> >
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/repo_policy.zip"), false);
> > -        assertNotNull(pack);
> >          ImportOptions opts = getDefaultOptions();
> >          opts.setAccessControlHandling(AccessControlHandling.MERGE);
> > -        pack.install(opts);
> > +        extractVaultPackage("testpackages/repo_policy.zip", opts);
> >
> >          // test if nodes and ACLs of first package exist
> >          assertPermission(null, false, new String[]{"jcr:all"},
> "everyone", null);
> > @@ -507,11 +447,9 @@ public class TestACLAndMerge extends Int
> >          addACL(null, true, new String[]{"jcr:all"}, "testuser1");
> >          assertPermission(null, true, new String[]{"jcr:all"},
> "testuser1", null);
> >
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/repo_policy.zip"), false);
> > -        assertNotNull(pack);
> >          ImportOptions opts = getDefaultOptions();
> >          opts.setAccessControlHandling(AccessControlHandling.MERGE_
> PRESERVE);
> > -        pack.install(opts);
> > +        extractVaultPackage("testpackages/repo_policy.zip", opts);
> >
> >          // test if nodes and ACLs of first package exist
> >          assertPermission(null, false, new String[]{"jcr:all"},
> "everyone", null);
> > @@ -524,11 +462,9 @@ public class TestACLAndMerge extends Int
> >       */
> >      @Test
> >      public void testRootACL() throws RepositoryException, IOException,
> PackageException {
> > -        JcrPackage pack = packMgr.upload(getStream("
> testpackages/root_policy.zip"), false);
> > -        assertNotNull(pack);
> >          ImportOptions opts = getDefaultOptions();
> >          opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
> > -        pack.install(opts);
> > +        extractVaultPackage("testpackages/root_policy.zip", opts);
> >
> >          // test if nodes and ACLs of first package exist
> >          assertPermission("/", true, new String[]{"jcr:all"},
> "everyone", null);
> >
> > Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> java/org/apache/jackrabbit/vault/packaging/integration/
> TestPackageInstall.java
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/java/org/apache/jackrabbit/
> vault/packaging/integration/TestPackageInstall.java?rev=
> 1767213&r1=1767212&r2=1767213&view=diff
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java
> (original)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java
> Mon Oct 31 01:55:37 2016
> > @@ -20,15 +20,12 @@ package org.apache.jackrabbit.vault.pack
> >  import java.io.File;
> >  import java.io.IOException;
> >
> > -import javax.jcr.Binary;
> >  import javax.jcr.NodeIterator;
> >  import javax.jcr.Property;
> >  import javax.jcr.PropertyType;
> >  import javax.jcr.RepositoryException;
> >
> >  import org.apache.commons.io.FileUtils;
> > -import org.apache.derby.impl.load.Import;
> > -import org.apache.jackrabbit.vault.fs.api.ProgressTrackerListener;
> >  import org.apache.jackrabbit.vault.fs.io.ImportOptions;
> >  import org.apache.jackrabbit.vault.packaging.InstallContext;
> >  import org.apache.jackrabbit.vault.packaging.JcrPackage;
> >
> > Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/config.xml
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/
> config.xml?rev=1767213&view=auto
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/config.xml
> (added)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/config.xml Mon
> Oct 31 01:55:37 2016
> > @@ -0,0 +1,95 @@
> > +<!--
> > +
> > +  ADOBE CONFIDENTIAL
> > +  __________________
> > +
> > +   Copyright 2011 Adobe Systems Incorporated
> > +   All Rights Reserved.
> > +
> > +  NOTICE:  All information contained herein is, and remains
> > +  the property of Adobe Systems Incorporated and its suppliers,
> > +  if any.  The intellectual and technical concepts contained
> > +  herein are proprietary to Adobe Systems Incorporated and its
> > +  suppliers and are protected by trade secret or copyright law.
> > +  Dissemination of this information or reproduction of this material
> > +  is strictly forbidden unless prior written permission is obtained
> > +  from Adobe Systems Incorporated.
> > +
> > +  -->
> > +<vaultfs version="1.1">
> > +    <!--
> > +        Defines the content aggregation. The order of the defined
> aggregates
> > +        is important for finding the correct aggregator.
> > +    -->
> > +    <aggregates>
> > +        <!--
> > +            Defines an aggregate that handles nt:file and nt:resource
> nodes.
> > +        -->
> > +        <aggregate type="file" title="File Aggregate"/>
> > +
> > +        <!--
> > +            Defines an aggregate that handles file/folder like nodes.
> It matches
> > +            all nt:hierarchyNode nodes that have or define a jcr:content
> > +            child node and excludes child nodes that are
> nt:hierarchyNodes.
> > +        -->
> > +        <aggregate type="filefolder" title="File/Folder Aggregate"/>
> > +
> > +        <!--
> > +            Defines an aggregate that handles nt:nodeType nodes and
> serializes
> > +            them into .cnd notation.
> > +        -->
> > +        <aggregate type="nodetype" title="Node Type Aggregate" />
> > +
> > +        <!--
> > +            Defines an aggregate that defines full coverage for certain
> node
> > +            types that cannot be covered by the default aggregator.
> > +        -->
> > +        <aggregate type="full" title="Full Coverage Aggregate">
> > +            <matches>
> > +                <include nodeType="rep:AccessControl"
> respectSupertype="true" />
> > +                <include nodeType="rep:Policy" respectSupertype="true"
> />
> > +                <include nodeType="cq:Widget" respectSupertype="true" />
> > +                <include nodeType="cq:EditConfig"
> respectSupertype="true" />
> > +                <include nodeType="cq:WorkflowModel"
> respectSupertype="true" />
> > +                <include nodeType="vlt:FullCoverage"
> respectSupertype="true" />
> > +                <include nodeType="mix:language"
> respectSupertype="true" />
> > +                <include nodeType="sling:OsgiConfig"
> respectSupertype="true" />
> > +            </matches>
> > +        </aggregate>
> > +
> > +        <!--
> > +            Defines an aggregate that handles nt:folder like nodes.
> > +        -->
> > +        <aggregate type="generic" title="Folder Aggregate">
> > +            <matches>
> > +                <include nodeType="nt:folder" respectSupertype="true" />
> > +            </matches>
> > +            <contains>
> > +                <exclude isNode="true" />
> > +            </contains>
> > +        </aggregate>
> > +
> > +        <!--
> > +            Defines the default aggregate
> > +        -->
> > +        <aggregate type="generic" title="Default Aggregator"
> isDefault="true">
> > +            <matches>
> > +                <!-- all -->
> > +            </matches>
> > +            <contains>
> > +                <exclude nodeType="nt:hierarchyNode"
> respectSupertype="true" />
> > +            </contains>
> > +        </aggregate>
> > +
> > +    </aggregates>
> > +
> > +    <!--
> > +      defines the input handlers
> > +    -->
> > +    <handlers>
> > +        <handler type="folder"/>
> > +        <handler type="file"/>
> > +        <handler type="nodetype"/>
> > +        <handler type="generic"/>
> > +    </handlers>
> > +</vaultfs>
> >
> > Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/
> definition/.content.xml
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/
> definition/.content.xml?rev=1767213&view=auto
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/.content.xml
> (added)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/.content.xml
> Mon Oct 31 01:55:37 2016
> > @@ -0,0 +1,25 @@
> > +<?xml version="1.0" encoding="UTF-8"?>
> > +<jcr:root xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="
> http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
> > +    jcr:created="{Date}2011-11-15T09:43:22.972+01:00"
> > +    jcr:createdBy="admin"
> > +    jcr:description=""
> > +    jcr:lastModified="{Date}2011-11-15T09:43:22.972+01:00"
> > +    jcr:lastModifiedBy="admin"
> > +    jcr:primaryType="vlt:PackageDefinition"
> > +    buildCount="1"
> > +    cqVersion="5.3"
> > +    group=""
> > +    lastUnwrapped="{Date}2011-11-15T09:43:22.972+01:00"
> > +    lastUnwrappedBy="admin"
> > +    lastWrapped="{Date}2011-11-15T09:43:22.972+01:00"
> > +    lastWrappedBy="admin"
> > +    name="mode_ac_test_a"
> > +    version="">
> > +    <filter jcr:primaryType="nt:unstructured">
> > +        <f0
> > +            jcr:primaryType="nt:unstructured"
> > +            mode="replace"
> > +            root="/testroot"
> > +            rules="[]"/>
> > +    </filter>
> > +</jcr:root>
> >
> > Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/filter.xml
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/
> filter.xml?rev=1767213&view=auto
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/filter.xml
> (added)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/filter.xml Mon
> Oct 31 01:55:37 2016
> > @@ -0,0 +1,4 @@
> > +<?xml version="1.0" encoding="UTF-8"?>
> > +<workspaceFilter version="1.0">
> > +    <filter root="/testroot" mode="merge"/>
> > +</workspaceFilter>
> >
> > Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/nodetypes.cnd
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/
> nodetypes.cnd?rev=1767213&view=auto
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/nodetypes.cnd
> (added)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/nodetypes.cnd
> Mon Oct 31 01:55:37 2016
> > @@ -0,0 +1,8 @@
> > +<'sling'='http://sling.apache.org/jcr/sling/1.0'>
> > +<'nt'='http://www.jcp.org/jcr/nt/1.0'>
> > +
> > +[sling:Folder] > nt:folder
> > +  - * (undefined)
> > +  - * (undefined) multiple
> > +  + * (nt:base) = sling:Folder version
> > +
> >
> > Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/properties.xml
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/
> properties.xml?rev=1767213&view=auto
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/properties.xml
> (added)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/META-INF/vault/properties.xml
> Mon Oct 31 01:55:37 2016
> > @@ -0,0 +1,19 @@
> > +<?xml version="1.0" encoding="utf-8" standalone="no"?>
> > +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
> > +<properties>
> > +<comment>FileVault Package Properties</comment>
> > +<entry key="createdBy">admin</entry>
> > +<entry key="name">mode_ac_test_a</entry>
> > +<entry key="lastModified">2011-11-15T09:43:22.972+01:00</entry>
> > +<entry key="lastModifiedBy">admin</entry>
> > +<entry key="created">2011-11-15T09:43:22.993+01:00</entry>
> > +<entry key="buildCount">1</entry>
> > +<entry key="version"/>
> > +<entry key="dependencies"/>
> > +<entry key="packageFormatVersion">2</entry>
> > +<entry key="description"/>
> > +<entry key="lastWrapped">2011-11-15T09:43:22.972+01:00</entry>
> > +<entry key="group"/>
> > +<entry key="lastWrappedBy">admin</entry>
> > +<entry key="acHandling">overwrite</entry>
> > +</properties>
> >
> > Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/.content.xml
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/.
> content.xml?rev=1767213&view=auto
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/.content.xml (added)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/.content.xml Mon Oct
> 31 01:55:37 2016
> > @@ -0,0 +1,17 @@
> > +<?xml version="1.0" encoding="UTF-8"?>
> > +<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
> xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
> > +    jcr:mixinTypes="[rep:AccessControllable]"
> > +    jcr:primaryType="rep:root"
> > +    sling:resourceType="sling:redirect"
> > +    sling:target="/index.html">
> > +    <rep:policy/>
> > +    <jcr:system/>
> > +    <var/>
> > +    <libs/>
> > +    <etc/>
> > +    <apps/>
> > +    <content/>
> > +    <tmp/>
> > +    <home/>
> > +    <testroot/>
> > +</jcr:root>
> >
> > Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/
> testroot/node_a/.content.xml
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/
> testroot/node_a/.content.xml?rev=1767213&view=auto
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/.content.xml
> (added)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/.content.xml
> Mon Oct 31 01:55:37 2016
> > @@ -0,0 +1,4 @@
> > +<?xml version="1.0" encoding="UTF-8"?>
> > +<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"
> > +    title="1234"/>
> >
> > Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/
> testroot/secured/.content.xml
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/
> testroot/secured/.content.xml?rev=1767213&view=auto
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/.content.xml
> (added)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/.content.xml
> Mon Oct 31 01:55:37 2016
> > @@ -0,0 +1,4 @@
> > +<?xml version="1.0" encoding="UTF-8"?>
> > +<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="
> http://www.jcp.org/jcr/nt/1.0" xmlns:rep="internal"
> > +    jcr:mixinTypes="[rep:AccessControllable]"
> > +    jcr:primaryType="nt:folder"/>
> >
> > Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/
> testroot/secured/_rep_policy.xml
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/
> testroot/secured/_rep_policy.xml?rev=1767213&view=auto
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/
> testroot/secured/_rep_policy.xml (added)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_a.zip/jcr_root/
> testroot/secured/_rep_policy.xml Mon Oct 31 01:55:37 2016
> > @@ -0,0 +1,8 @@
> > +<?xml version="1.0" encoding="UTF-8"?>
> > +<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
> > +    jcr:primaryType="rep:ACL">
> > +    <deny
> > +        jcr:primaryType="rep:DenyACE"
> > +        rep:principalName="everyone"
> > +        rep:privileges="{Name}[jcr:all]"/>
> > +</jcr:root>
> >
> > Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/config.xml
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/
> config.xml?rev=1767213&view=auto
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/config.xml
> (added)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/config.xml Mon
> Oct 31 01:55:37 2016
> > @@ -0,0 +1,95 @@
> > +<!--
> > +
> > +  ADOBE CONFIDENTIAL
> > +  __________________
> > +
> > +   Copyright 2011 Adobe Systems Incorporated
> > +   All Rights Reserved.
> > +
> > +  NOTICE:  All information contained herein is, and remains
> > +  the property of Adobe Systems Incorporated and its suppliers,
> > +  if any.  The intellectual and technical concepts contained
> > +  herein are proprietary to Adobe Systems Incorporated and its
> > +  suppliers and are protected by trade secret or copyright law.
> > +  Dissemination of this information or reproduction of this material
> > +  is strictly forbidden unless prior written permission is obtained
> > +  from Adobe Systems Incorporated.
> > +
> > +  -->
> > +<vaultfs version="1.1">
> > +    <!--
> > +        Defines the content aggregation. The order of the defined
> aggregates
> > +        is important for finding the correct aggregator.
> > +    -->
> > +    <aggregates>
> > +        <!--
> > +            Defines an aggregate that handles nt:file and nt:resource
> nodes.
> > +        -->
> > +        <aggregate type="file" title="File Aggregate"/>
> > +
> > +        <!--
> > +            Defines an aggregate that handles file/folder like nodes.
> It matches
> > +            all nt:hierarchyNode nodes that have or define a jcr:content
> > +            child node and excludes child nodes that are
> nt:hierarchyNodes.
> > +        -->
> > +        <aggregate type="filefolder" title="File/Folder Aggregate"/>
> > +
> > +        <!--
> > +            Defines an aggregate that handles nt:nodeType nodes and
> serializes
> > +            them into .cnd notation.
> > +        -->
> > +        <aggregate type="nodetype" title="Node Type Aggregate" />
> > +
> > +        <!--
> > +            Defines an aggregate that defines full coverage for certain
> node
> > +            types that cannot be covered by the default aggregator.
> > +        -->
> > +        <aggregate type="full" title="Full Coverage Aggregate">
> > +            <matches>
> > +                <include nodeType="rep:AccessControl"
> respectSupertype="true" />
> > +                <include nodeType="rep:Policy" respectSupertype="true"
> />
> > +                <include nodeType="cq:Widget" respectSupertype="true" />
> > +                <include nodeType="cq:EditConfig"
> respectSupertype="true" />
> > +                <include nodeType="cq:WorkflowModel"
> respectSupertype="true" />
> > +                <include nodeType="vlt:FullCoverage"
> respectSupertype="true" />
> > +                <include nodeType="mix:language"
> respectSupertype="true" />
> > +                <include nodeType="sling:OsgiConfig"
> respectSupertype="true" />
> > +            </matches>
> > +        </aggregate>
> > +
> > +        <!--
> > +            Defines an aggregate that handles nt:folder like nodes.
> > +        -->
> > +        <aggregate type="generic" title="Folder Aggregate">
> > +            <matches>
> > +                <include nodeType="nt:folder" respectSupertype="true" />
> > +            </matches>
> > +            <contains>
> > +                <exclude isNode="true" />
> > +            </contains>
> > +        </aggregate>
> > +
> > +        <!--
> > +            Defines the default aggregate
> > +        -->
> > +        <aggregate type="generic" title="Default Aggregator"
> isDefault="true">
> > +            <matches>
> > +                <!-- all -->
> > +            </matches>
> > +            <contains>
> > +                <exclude nodeType="nt:hierarchyNode"
> respectSupertype="true" />
> > +            </contains>
> > +        </aggregate>
> > +
> > +    </aggregates>
> > +
> > +    <!--
> > +      defines the input handlers
> > +    -->
> > +    <handlers>
> > +        <handler type="folder"/>
> > +        <handler type="file"/>
> > +        <handler type="nodetype"/>
> > +        <handler type="generic"/>
> > +    </handlers>
> > +</vaultfs>
> >
> > Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/
> definition/.content.xml
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/
> definition/.content.xml?rev=1767213&view=auto
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/.content.xml
> (added)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/.content.xml
> Mon Oct 31 01:55:37 2016
> > @@ -0,0 +1,25 @@
> > +<?xml version="1.0" encoding="UTF-8"?>
> > +<jcr:root xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="
> http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
> > +    jcr:created="{Date}2011-11-15T09:45:14.664+01:00"
> > +    jcr:createdBy="admin"
> > +    jcr:description=""
> > +    jcr:lastModified="{Date}2011-11-15T09:45:14.664+01:00"
> > +    jcr:lastModifiedBy="admin"
> > +    jcr:primaryType="vlt:PackageDefinition"
> > +    buildCount="1"
> > +    cqVersion="5.3"
> > +    group=""
> > +    lastUnwrapped="{Date}2011-11-15T09:45:14.664+01:00"
> > +    lastUnwrappedBy="admin"
> > +    lastWrapped="{Date}2011-11-15T09:45:14.664+01:00"
> > +    lastWrappedBy="admin"
> > +    name="mode_ac_test_b"
> > +    version="">
> > +    <filter jcr:primaryType="nt:unstructured">
> > +        <f0
> > +            jcr:primaryType="nt:unstructured"
> > +            mode="replace"
> > +            root="/testroot"
> > +            rules="[]"/>
> > +    </filter>
> > +</jcr:root>
> >
> > Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/filter.xml
> > URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/
> trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/
> filter.xml?rev=1767213&view=auto
> > ============================================================
> ==================
> > --- jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/filter.xml
> (added)
> > +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/
> resources/org/apache/jackrabbit/vault/packaging/
> integration/testpackages/mode_ac_test_b.zip/META-INF/vault/filter.xml Mon
> Oct 31 01:55:37 2016
> > @@ -0,0 +1,4 @@
> > +<?xml version="1.0" encoding="UTF-8"?>
> > +<workspaceFilter version="1.0">
> > +    <filter root="/testroot" mode="merge"/>
> > +</workspaceFilter>
> >
> >
> >
>
>

Re: svn commit: r1767213 [1/4] - in /jackrabbit/commons/filevault/trunk: parent/ vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/ vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ vault-core/src/test/resources/...

[Julian Sedding <js...@gmail.com>]

Hi Tobi

Thanks for the change.

Note: some of the files from the extracted packages have Adobe headers
and other are missing the Apache license headers.

Regards
Julian


On Mon, Oct 31, 2016 at 2:55 AM,  <tr...@apache.org> wrote:
> Author: tripod
> Date: Mon Oct 31 01:55:37 2016
> New Revision: 1767213
>
> URL: http://svn.apache.org/viewvc?rev=1767213&view=rev
> Log:
> JCRVLT-138 Unzip test-packages for easier maintenance
>
> Added:
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/config.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/nodetypes.cnd
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/config.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/nodetypes.cnd
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/node_a/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/node_a/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/node_b/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/node_b/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/secured/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/secured/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/jcr_root/testroot/secured/_rep_policy.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/config.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/definition/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/definition/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/nodetypes.cnd
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/node_a/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/node_a/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/node_b/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/node_b/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/secured/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/secured/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b2_merge.zip/jcr_root/testroot/secured/_rep_policy.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/config.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/definition/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/definition/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/nodetypes.cnd
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/node_a/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/node_a/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/node_b/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/node_b/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/secured/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/secured/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b3_merge.zip/jcr_root/testroot/secured/_rep_policy.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/config.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/definition/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/definition/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/nodetypes.cnd
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/node_a/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/node_a/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/node_b/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/node_b/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/secured/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/secured/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_merge.zip/jcr_root/testroot/secured/_rep_policy.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/config.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/definition/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/definition/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/nodetypes.cnd
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/node_a/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/node_a/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/node_b/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/node_b/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/secured/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/secured/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b_preserve.zip/jcr_root/testroot/secured/_rep_policy.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/config.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/definition/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/definition/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/nodetypes.cnd
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/testroot/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/testroot/node_c/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/testroot/node_c/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/testroot/secured/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/testroot/secured/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_c_merge.zip/jcr_root/testroot/secured/_rep_policy.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/vault/config.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/vault/definition/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/vault/definition/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/vault/nodetypes.cnd
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/node_d/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/node_d/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/secured/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/secured/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_d.zip/jcr_root/testroot/secured/_rep_policy.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/vault/config.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/vault/definition/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/vault/definition/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/vault/nodetypes.cnd
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/node_e/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/node_e/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/secured/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/secured/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_e.zip/jcr_root/testroot/secured/_rep_policy.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/config.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/definition/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/definition/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/nodetypes.cnd
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/testroot/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/testroot/node_d/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/testroot/node_d/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/testroot/secured/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/testroot/secured/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_lateuser.zip/jcr_root/testroot/secured/_rep_policy.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/vault/config.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/vault/definition/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/vault/definition/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/vault/nodetypes.cnd
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/jcr_root/testroot/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/jcr_root/testroot/secured/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_unsecured_nodetype.zip/jcr_root/testroot/secured/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/vault/config.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/vault/definition/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/vault/definition/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/vault/nodetypes.cnd
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/testroot/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/testroot/node_a/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/testroot/node_a/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/testroot/secured/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/testroot/secured/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/oak_ac_content_test.zip/jcr_root/testroot/secured/_rep_policy.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/vault/config.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/vault/definition/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/vault/definition/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/vault/nodetypes.cnd
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_no_policy.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/vault/config.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/vault/definition/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/vault/definition/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/vault/nodetypes.cnd
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/repo_policy.zip/jcr_root/_rep_repoPolicy.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/META-INF/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/META-INF/vault/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/META-INF/vault/filter.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/META-INF/vault/properties.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/jcr_root/
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/jcr_root/.content.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/root_policy.zip/jcr_root/_rep_policy.xml
> Modified:
>     jackrabbit/commons/filevault/trunk/parent/pom.xml
>     jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/ZipVaultPackage.java
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java
>     jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java
>
> Modified: jackrabbit/commons/filevault/trunk/parent/pom.xml
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/parent/pom.xml?rev=1767213&r1=1767212&r2=1767213&view=diff
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/parent/pom.xml (original)
> +++ jackrabbit/commons/filevault/trunk/parent/pom.xml Mon Oct 31 01:55:37 2016
> @@ -181,6 +181,7 @@
>                              <exclude>.idea/**</exclude>
>                              <exclude>.gitignore</exclude>
>                              <exclude>derby.log</exclude>
> +                            <exclude>**/*.zip/**</exclude>
>                          </excludes>
>                      </configuration>
>                  </plugin>
>
> Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/ZipVaultPackage.java
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/ZipVaultPackage.java?rev=1767213&r1=1767212&r2=1767213&view=diff
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/ZipVaultPackage.java (original)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/ZipVaultPackage.java Mon Oct 31 01:55:37 2016
> @@ -53,16 +53,16 @@ public class ZipVaultPackage extends Pac
>
>      private Archive archive;
>
> -    protected ZipVaultPackage(File file, boolean isTmpFile) throws IOException {
> +    public ZipVaultPackage(File file, boolean isTmpFile) throws IOException {
>          this(file, isTmpFile, false);
>      }
>
> -    protected ZipVaultPackage(File file, boolean isTmpFile, boolean strict)
> +    public ZipVaultPackage(File file, boolean isTmpFile, boolean strict)
>              throws IOException {
>          this(new ZipArchive(file, isTmpFile), strict);
>      }
>
> -    protected ZipVaultPackage(Archive archive, boolean strict)
> +    public ZipVaultPackage(Archive archive, boolean strict)
>              throws IOException {
>          this.archive = archive;
>          if (strict) {
>
> Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java?rev=1767213&r1=1767212&r2=1767213&view=diff
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java (original)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java Mon Oct 31 01:55:37 2016
> @@ -21,6 +21,7 @@ import java.io.File;
>  import java.io.FileOutputStream;
>  import java.io.IOException;
>  import java.io.InputStream;
> +import java.net.URL;
>  import java.util.ArrayList;
>  import java.util.Arrays;
>  import java.util.HashMap;
> @@ -73,15 +74,19 @@ import org.apache.jackrabbit.oak.spi.sec
>  import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
>  import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
>  import org.apache.jackrabbit.vault.fs.api.ProgressTrackerListener;
> +import org.apache.jackrabbit.vault.fs.io.FileArchive;
>  import org.apache.jackrabbit.vault.fs.io.ImportOptions;
> +import org.apache.jackrabbit.vault.packaging.JcrPackage;
>  import org.apache.jackrabbit.vault.packaging.JcrPackageManager;
> +import org.apache.jackrabbit.vault.packaging.PackageException;
> +import org.apache.jackrabbit.vault.packaging.VaultPackage;
>  import org.apache.jackrabbit.vault.packaging.impl.JcrPackageManagerImpl;
> +import org.apache.jackrabbit.vault.packaging.impl.ZipVaultPackage;
>  import org.junit.After;
>  import org.junit.AfterClass;
>  import org.junit.Before;
>  import org.junit.BeforeClass;
>  import org.junit.ClassRule;
> -import org.junit.Rule;
>  import org.junit.rules.TemporaryFolder;
>  import org.slf4j.Logger;
>  import org.slf4j.LoggerFactory;
> @@ -284,6 +289,39 @@ public class IntegrationTestBase  {
>          return tmpFile;
>      }
>
> +    public VaultPackage loadVaultPackage(String name) throws IOException {
> +        final URL packageURL = getClass().getResource(name);
> +        final String filename = packageURL.getFile();
> +        final File file = new File(filename);
> +        return new ZipVaultPackage(new FileArchive(file), true);
> +    }
> +
> +    public VaultPackage extractVaultPackage(String name) throws IOException, PackageException, RepositoryException {
> +        return extractVaultPackage(name, null);
> +    }
> +
> +    public VaultPackage extractVaultPackage(String name, ImportOptions opts) throws IOException, PackageException, RepositoryException {
> +        if (opts == null) {
> +            opts = getDefaultOptions();
> +        }
> +        VaultPackage pack = loadVaultPackage(name);
> +        pack.extract(admin, opts);
> +        return pack;
> +    }
> +
> +    public JcrPackage installPackage(String name) throws IOException, RepositoryException, PackageException {
> +        return installPackage(name, null);
> +    }
> +
> +    public JcrPackage installPackage(String name, ImportOptions opts) throws IOException, RepositoryException, PackageException {
> +        if (opts == null) {
> +            opts = getDefaultOptions();
> +        }
> +        JcrPackage pack = packMgr.upload(getStream(name), false);
> +        assertNotNull(pack);
> +        pack.install(opts);
> +        return pack;
> +    }
>
>      public ImportOptions getDefaultOptions() {
>          ImportOptions opts = new ImportOptions();
>
> Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java?rev=1767213&r1=1767212&r2=1767213&view=diff
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java (original)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java Mon Oct 31 01:55:37 2016
> @@ -18,26 +18,15 @@
>  package org.apache.jackrabbit.vault.packaging.integration;
>
>  import java.io.IOException;
> -import java.util.Arrays;
>  import java.util.Collections;
>  import java.util.HashMap;
> -import java.util.HashSet;
>  import java.util.Map;
> -import java.util.Set;
>
>  import javax.jcr.RepositoryException;
> -import javax.jcr.Value;
> -import javax.jcr.security.AccessControlEntry;
> -import javax.jcr.security.AccessControlPolicy;
> -import javax.jcr.security.AccessControlPolicyIterator;
> -import javax.jcr.security.Privilege;
>
>  import org.apache.jackrabbit.api.JackrabbitSession;
> -import org.apache.jackrabbit.api.security.JackrabbitAccessControlEntry;
> -import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
>  import org.apache.jackrabbit.api.security.user.Authorizable;
>  import org.apache.jackrabbit.api.security.user.UserManager;
> -import org.apache.jackrabbit.core.security.principal.PrincipalImpl;
>  import org.apache.jackrabbit.vault.fs.io.AccessControlHandling;
>  import org.apache.jackrabbit.vault.fs.io.ImportOptions;
>  import org.apache.jackrabbit.vault.packaging.JcrPackage;
> @@ -49,7 +38,6 @@ import org.junit.Test;
>  import static org.junit.Assert.assertEquals;
>  import static org.junit.Assert.assertNotNull;
>  import static org.junit.Assert.assertTrue;
> -import static org.junit.Assert.fail;
>
>  /**
>   * AC Handling and import mode tests
> @@ -93,17 +81,13 @@ public class TestACLAndMerge extends Int
>      public void testACAndMerge() throws RepositoryException, IOException, PackageException {
>          assertNodeMissing("/testroot");
>
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
>
>          // test if nodes and ACLs of first package exist
>          assertNodeExists("/testroot/node_a");
>          assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
>
> -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_b.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_b.zip");
>
>          // test if nodes and ACLs of 2nd package exist
>          assertNodeExists("/testroot/node_a");
> @@ -121,17 +105,13 @@ public class TestACLAndMerge extends Int
>      public void testACMerge() throws RepositoryException, IOException, PackageException {
>          assertNodeMissing("/testroot");
>
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
>
>          // test if nodes and ACLs of first package exist
>          assertNodeExists("/testroot/node_a");
>          assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
>
> -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_b_merge.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_b_merge.zip");
>
>          // test if nodes and ACLs of 2nd package exist
>          assertNodeExists("/testroot/node_a");
> @@ -148,17 +128,13 @@ public class TestACLAndMerge extends Int
>      public void testACMergeSubpackage() throws RepositoryException, IOException, PackageException {
>          assertNodeMissing("/testroot");
>
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
>
>          // test if nodes and ACLs of first package exist
>          assertNodeExists("/testroot/node_a");
>          assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
>
> -        pack = packMgr.upload(getStream("testpackages/mode_ac_subpackage.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        installPackage("testpackages/mode_ac_subpackage.zip");
>
>          // test if nodes and ACLs of 2nd package exist
>          assertNodeExists("/testroot/node_a");
> @@ -175,17 +151,13 @@ public class TestACLAndMerge extends Int
>      public void testACMerge4() throws RepositoryException, IOException, PackageException {
>          assertNodeMissing("/testroot");
>
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_b2_merge.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_b2_merge.zip");
>
>          // test if nodes and ACLs of first package exist
>          assertNodeExists("/testroot/node_a");
>          assertPermission("/testroot/secured", true, new String[]{"jcr:read", "jcr:write"}, "everyone", null);
>
> -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_b3_merge.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_b3_merge.zip");
>
>          // test if nodes and ACLs of 2nd package exist
>          assertNodeExists("/testroot/node_a");
> @@ -201,17 +173,13 @@ public class TestACLAndMerge extends Int
>      public void testACMerge2() throws RepositoryException, IOException, PackageException {
>          assertNodeMissing("/testroot");
>
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
>
>          // test if nodes and ACLs of first package exist
>          assertNodeExists("/testroot/node_a");
>          assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
>
> -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_c_merge.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_c_merge.zip");
>
>          // test if nodes and ACLs of 2nd package exist
>          assertNodeExists("/testroot/node_a");
> @@ -228,17 +196,13 @@ public class TestACLAndMerge extends Int
>      public void testACMerge3() throws RepositoryException, IOException, PackageException {
>          assertNodeMissing("/testroot");
>
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
>
>          // test if nodes and ACLs of first package exist
>          assertNodeExists("/testroot/node_a");
>          assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
>
> -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_d.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_d.zip");
>
>          // test if nodes and ACLs of 2nd package exist
>          assertNodeExists("/testroot/node_a");
> @@ -255,19 +219,15 @@ public class TestACLAndMerge extends Int
>      public void testACMergePreserve2() throws RepositoryException, IOException, PackageException {
>          assertNodeMissing("/testroot");
>
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
>
>          // test if nodes and ACLs of first package exist
>          assertNodeExists("/testroot/node_a");
>          assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
>
> -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_d.zip"), false);
> -        assertNotNull(pack);
>          ImportOptions opts = getDefaultOptions();
>          opts.setAccessControlHandling(AccessControlHandling.MERGE_PRESERVE);
> -        pack.install(opts);
> +        extractVaultPackage("testpackages/mode_ac_test_d.zip", opts);
>
>          // test if nodes and ACLs of 2nd package exist
>          assertNodeExists("/testroot/node_a");
> @@ -286,17 +246,13 @@ public class TestACLAndMerge extends Int
>      public void testACMergePreserve() throws RepositoryException, IOException, PackageException {
>          assertNodeMissing("/testroot");
>
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
>
>          // test if nodes and ACLs of first package exist
>          assertNodeExists("/testroot/node_a");
>          assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
>
> -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_b_preserve.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_b_preserve.zip");
>
>          // test if nodes and ACLs of 2nd package exist
>          assertNodeExists("/testroot/node_a");
> @@ -313,18 +269,14 @@ public class TestACLAndMerge extends Int
>      public void testACMergePreserveNodeType() throws RepositoryException, IOException, PackageException {
>          assertNodeMissing("/testroot");
>
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_a.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_a.zip");
>
>          // test if nodes and ACLs of first package exist
>          assertNodeExists("/testroot/node_a");
>          assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
>          assertProperty("/testroot/secured/jcr:primaryType", "nt:folder");
>
> -        pack = packMgr.upload(getStream("testpackages/mode_ac_test_unsecured_nodetype.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_unsecured_nodetype.zip");
>
>          // test if permissions remain and pt changed
>          assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
> @@ -387,11 +339,9 @@ public class TestACLAndMerge extends Int
>      }
>
>      private void doOrderTest(AccessControlHandling ac) throws Exception {
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_e.zip"), true);
> -        assertNotNull(pack);
>          ImportOptions opts = getDefaultOptions();
>          opts.setAccessControlHandling(ac);
> -        pack.install(opts);
> +        extractVaultPackage("testpackages/mode_ac_test_e.zip", opts);
>
>          // test if nodes and ACLs of first package exist
>          assertNodeExists("/testroot/node_e");
> @@ -412,9 +362,7 @@ public class TestACLAndMerge extends Int
>          Assume.assumeTrue(isOak());
>          assertNodeMissing("/testroot");
>
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/oak_ac_content_test.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/oak_ac_content_test.zip");
>
>          // test if nodes and ACLs of first package exist
>          assertNodeExists("/testroot/node_a");
> @@ -435,9 +383,7 @@ public class TestACLAndMerge extends Int
>      public void testMissingUser() throws RepositoryException, IOException, PackageException {
>          assertNodeMissing("/testroot");
>
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/mode_ac_test_lateuser.zip"), false);
> -        assertNotNull(pack);
> -        pack.install(getDefaultOptions());
> +        extractVaultPackage("testpackages/mode_ac_test_lateuser.zip");
>
>          // test if nodes and ACLs of first package exist
>          assertNodeExists("/testroot/node_d");
> @@ -452,21 +398,17 @@ public class TestACLAndMerge extends Int
>      public void testRepoACL() throws RepositoryException, IOException, PackageException {
>          removeRepoACL();
>
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/repo_policy.zip"), false);
> -        assertNotNull(pack);
>          ImportOptions opts = getDefaultOptions();
>          opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
> -        pack.install(opts);
> +        extractVaultPackage("testpackages/repo_policy.zip", opts);
>
>          // test if nodes and ACLs of first package exist
>          assertPermission(null, false, new String[]{"jcr:all"}, "everyone", null);
>          assertPermission(null, false, new String[]{"jcr:all"}, "testuser", null);
>
> -        pack = packMgr.upload(getStream("testpackages/repo_no_policy.zip"), true);
> -        assertNotNull(pack);
>          opts = getDefaultOptions();
>          opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
> -        pack.install(opts);
> +        extractVaultPackage("testpackages/repo_no_policy.zip", opts);
>
>          assertPermissionMissing(null, false, new String[]{"jcr:all"}, "everyone", null);
>          assertPermissionMissing(null, false, new String[]{"jcr:all"}, "testuser", null);
> @@ -484,11 +426,9 @@ public class TestACLAndMerge extends Int
>          addACL(null, true, new String[]{"jcr:all"}, "testuser1");
>          assertPermission(null, true, new String[]{"jcr:all"}, "testuser1", null);
>
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/repo_policy.zip"), false);
> -        assertNotNull(pack);
>          ImportOptions opts = getDefaultOptions();
>          opts.setAccessControlHandling(AccessControlHandling.MERGE);
> -        pack.install(opts);
> +        extractVaultPackage("testpackages/repo_policy.zip", opts);
>
>          // test if nodes and ACLs of first package exist
>          assertPermission(null, false, new String[]{"jcr:all"}, "everyone", null);
> @@ -507,11 +447,9 @@ public class TestACLAndMerge extends Int
>          addACL(null, true, new String[]{"jcr:all"}, "testuser1");
>          assertPermission(null, true, new String[]{"jcr:all"}, "testuser1", null);
>
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/repo_policy.zip"), false);
> -        assertNotNull(pack);
>          ImportOptions opts = getDefaultOptions();
>          opts.setAccessControlHandling(AccessControlHandling.MERGE_PRESERVE);
> -        pack.install(opts);
> +        extractVaultPackage("testpackages/repo_policy.zip", opts);
>
>          // test if nodes and ACLs of first package exist
>          assertPermission(null, false, new String[]{"jcr:all"}, "everyone", null);
> @@ -524,11 +462,9 @@ public class TestACLAndMerge extends Int
>       */
>      @Test
>      public void testRootACL() throws RepositoryException, IOException, PackageException {
> -        JcrPackage pack = packMgr.upload(getStream("testpackages/root_policy.zip"), false);
> -        assertNotNull(pack);
>          ImportOptions opts = getDefaultOptions();
>          opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
> -        pack.install(opts);
> +        extractVaultPackage("testpackages/root_policy.zip", opts);
>
>          // test if nodes and ACLs of first package exist
>          assertPermission("/", true, new String[]{"jcr:all"}, "everyone", null);
>
> Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java?rev=1767213&r1=1767212&r2=1767213&view=diff
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java (original)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java Mon Oct 31 01:55:37 2016
> @@ -20,15 +20,12 @@ package org.apache.jackrabbit.vault.pack
>  import java.io.File;
>  import java.io.IOException;
>
> -import javax.jcr.Binary;
>  import javax.jcr.NodeIterator;
>  import javax.jcr.Property;
>  import javax.jcr.PropertyType;
>  import javax.jcr.RepositoryException;
>
>  import org.apache.commons.io.FileUtils;
> -import org.apache.derby.impl.load.Import;
> -import org.apache.jackrabbit.vault.fs.api.ProgressTrackerListener;
>  import org.apache.jackrabbit.vault.fs.io.ImportOptions;
>  import org.apache.jackrabbit.vault.packaging.InstallContext;
>  import org.apache.jackrabbit.vault.packaging.JcrPackage;
>
> Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/config.xml
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/config.xml?rev=1767213&view=auto
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/config.xml (added)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/config.xml Mon Oct 31 01:55:37 2016
> @@ -0,0 +1,95 @@
> +<!--
> +
> +  ADOBE CONFIDENTIAL
> +  __________________
> +
> +   Copyright 2011 Adobe Systems Incorporated
> +   All Rights Reserved.
> +
> +  NOTICE:  All information contained herein is, and remains
> +  the property of Adobe Systems Incorporated and its suppliers,
> +  if any.  The intellectual and technical concepts contained
> +  herein are proprietary to Adobe Systems Incorporated and its
> +  suppliers and are protected by trade secret or copyright law.
> +  Dissemination of this information or reproduction of this material
> +  is strictly forbidden unless prior written permission is obtained
> +  from Adobe Systems Incorporated.
> +
> +  -->
> +<vaultfs version="1.1">
> +    <!--
> +        Defines the content aggregation. The order of the defined aggregates
> +        is important for finding the correct aggregator.
> +    -->
> +    <aggregates>
> +        <!--
> +            Defines an aggregate that handles nt:file and nt:resource nodes.
> +        -->
> +        <aggregate type="file" title="File Aggregate"/>
> +
> +        <!--
> +            Defines an aggregate that handles file/folder like nodes. It matches
> +            all nt:hierarchyNode nodes that have or define a jcr:content
> +            child node and excludes child nodes that are nt:hierarchyNodes.
> +        -->
> +        <aggregate type="filefolder" title="File/Folder Aggregate"/>
> +
> +        <!--
> +            Defines an aggregate that handles nt:nodeType nodes and serializes
> +            them into .cnd notation.
> +        -->
> +        <aggregate type="nodetype" title="Node Type Aggregate" />
> +
> +        <!--
> +            Defines an aggregate that defines full coverage for certain node
> +            types that cannot be covered by the default aggregator.
> +        -->
> +        <aggregate type="full" title="Full Coverage Aggregate">
> +            <matches>
> +                <include nodeType="rep:AccessControl" respectSupertype="true" />
> +                <include nodeType="rep:Policy" respectSupertype="true" />
> +                <include nodeType="cq:Widget" respectSupertype="true" />
> +                <include nodeType="cq:EditConfig" respectSupertype="true" />
> +                <include nodeType="cq:WorkflowModel" respectSupertype="true" />
> +                <include nodeType="vlt:FullCoverage" respectSupertype="true" />
> +                <include nodeType="mix:language" respectSupertype="true" />
> +                <include nodeType="sling:OsgiConfig" respectSupertype="true" />
> +            </matches>
> +        </aggregate>
> +
> +        <!--
> +            Defines an aggregate that handles nt:folder like nodes.
> +        -->
> +        <aggregate type="generic" title="Folder Aggregate">
> +            <matches>
> +                <include nodeType="nt:folder" respectSupertype="true" />
> +            </matches>
> +            <contains>
> +                <exclude isNode="true" />
> +            </contains>
> +        </aggregate>
> +
> +        <!--
> +            Defines the default aggregate
> +        -->
> +        <aggregate type="generic" title="Default Aggregator" isDefault="true">
> +            <matches>
> +                <!-- all -->
> +            </matches>
> +            <contains>
> +                <exclude nodeType="nt:hierarchyNode" respectSupertype="true" />
> +            </contains>
> +        </aggregate>
> +
> +    </aggregates>
> +
> +    <!--
> +      defines the input handlers
> +    -->
> +    <handlers>
> +        <handler type="folder"/>
> +        <handler type="file"/>
> +        <handler type="nodetype"/>
> +        <handler type="generic"/>
> +    </handlers>
> +</vaultfs>
>
> Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/.content.xml
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/.content.xml?rev=1767213&view=auto
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/.content.xml (added)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/definition/.content.xml Mon Oct 31 01:55:37 2016
> @@ -0,0 +1,25 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<jcr:root xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
> +    jcr:created="{Date}2011-11-15T09:43:22.972+01:00"
> +    jcr:createdBy="admin"
> +    jcr:description=""
> +    jcr:lastModified="{Date}2011-11-15T09:43:22.972+01:00"
> +    jcr:lastModifiedBy="admin"
> +    jcr:primaryType="vlt:PackageDefinition"
> +    buildCount="1"
> +    cqVersion="5.3"
> +    group=""
> +    lastUnwrapped="{Date}2011-11-15T09:43:22.972+01:00"
> +    lastUnwrappedBy="admin"
> +    lastWrapped="{Date}2011-11-15T09:43:22.972+01:00"
> +    lastWrappedBy="admin"
> +    name="mode_ac_test_a"
> +    version="">
> +    <filter jcr:primaryType="nt:unstructured">
> +        <f0
> +            jcr:primaryType="nt:unstructured"
> +            mode="replace"
> +            root="/testroot"
> +            rules="[]"/>
> +    </filter>
> +</jcr:root>
>
> Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/filter.xml
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/filter.xml?rev=1767213&view=auto
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/filter.xml (added)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/filter.xml Mon Oct 31 01:55:37 2016
> @@ -0,0 +1,4 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<workspaceFilter version="1.0">
> +    <filter root="/testroot" mode="merge"/>
> +</workspaceFilter>
>
> Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/nodetypes.cnd
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/nodetypes.cnd?rev=1767213&view=auto
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/nodetypes.cnd (added)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/nodetypes.cnd Mon Oct 31 01:55:37 2016
> @@ -0,0 +1,8 @@
> +<'sling'='http://sling.apache.org/jcr/sling/1.0'>
> +<'nt'='http://www.jcp.org/jcr/nt/1.0'>
> +
> +[sling:Folder] > nt:folder
> +  - * (undefined)
> +  - * (undefined) multiple
> +  + * (nt:base) = sling:Folder version
> +
>
> Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/properties.xml
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/properties.xml?rev=1767213&view=auto
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/properties.xml (added)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/META-INF/vault/properties.xml Mon Oct 31 01:55:37 2016
> @@ -0,0 +1,19 @@
> +<?xml version="1.0" encoding="utf-8" standalone="no"?>
> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
> +<properties>
> +<comment>FileVault Package Properties</comment>
> +<entry key="createdBy">admin</entry>
> +<entry key="name">mode_ac_test_a</entry>
> +<entry key="lastModified">2011-11-15T09:43:22.972+01:00</entry>
> +<entry key="lastModifiedBy">admin</entry>
> +<entry key="created">2011-11-15T09:43:22.993+01:00</entry>
> +<entry key="buildCount">1</entry>
> +<entry key="version"/>
> +<entry key="dependencies"/>
> +<entry key="packageFormatVersion">2</entry>
> +<entry key="description"/>
> +<entry key="lastWrapped">2011-11-15T09:43:22.972+01:00</entry>
> +<entry key="group"/>
> +<entry key="lastWrappedBy">admin</entry>
> +<entry key="acHandling">overwrite</entry>
> +</properties>
>
> Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/.content.xml
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/.content.xml?rev=1767213&view=auto
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/.content.xml (added)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/.content.xml Mon Oct 31 01:55:37 2016
> @@ -0,0 +1,17 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
> +    jcr:mixinTypes="[rep:AccessControllable]"
> +    jcr:primaryType="rep:root"
> +    sling:resourceType="sling:redirect"
> +    sling:target="/index.html">
> +    <rep:policy/>
> +    <jcr:system/>
> +    <var/>
> +    <libs/>
> +    <etc/>
> +    <apps/>
> +    <content/>
> +    <tmp/>
> +    <home/>
> +    <testroot/>
> +</jcr:root>
>
> Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/.content.xml
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/.content.xml?rev=1767213&view=auto
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/.content.xml (added)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/node_a/.content.xml Mon Oct 31 01:55:37 2016
> @@ -0,0 +1,4 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<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"
> +    title="1234"/>
>
> Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/.content.xml
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/.content.xml?rev=1767213&view=auto
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/.content.xml (added)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/.content.xml Mon Oct 31 01:55:37 2016
> @@ -0,0 +1,4 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rep="internal"
> +    jcr:mixinTypes="[rep:AccessControllable]"
> +    jcr:primaryType="nt:folder"/>
>
> Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml?rev=1767213&view=auto
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml (added)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml Mon Oct 31 01:55:37 2016
> @@ -0,0 +1,8 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
> +    jcr:primaryType="rep:ACL">
> +    <deny
> +        jcr:primaryType="rep:DenyACE"
> +        rep:principalName="everyone"
> +        rep:privileges="{Name}[jcr:all]"/>
> +</jcr:root>
>
> Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/config.xml
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/config.xml?rev=1767213&view=auto
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/config.xml (added)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/config.xml Mon Oct 31 01:55:37 2016
> @@ -0,0 +1,95 @@
> +<!--
> +
> +  ADOBE CONFIDENTIAL
> +  __________________
> +
> +   Copyright 2011 Adobe Systems Incorporated
> +   All Rights Reserved.
> +
> +  NOTICE:  All information contained herein is, and remains
> +  the property of Adobe Systems Incorporated and its suppliers,
> +  if any.  The intellectual and technical concepts contained
> +  herein are proprietary to Adobe Systems Incorporated and its
> +  suppliers and are protected by trade secret or copyright law.
> +  Dissemination of this information or reproduction of this material
> +  is strictly forbidden unless prior written permission is obtained
> +  from Adobe Systems Incorporated.
> +
> +  -->
> +<vaultfs version="1.1">
> +    <!--
> +        Defines the content aggregation. The order of the defined aggregates
> +        is important for finding the correct aggregator.
> +    -->
> +    <aggregates>
> +        <!--
> +            Defines an aggregate that handles nt:file and nt:resource nodes.
> +        -->
> +        <aggregate type="file" title="File Aggregate"/>
> +
> +        <!--
> +            Defines an aggregate that handles file/folder like nodes. It matches
> +            all nt:hierarchyNode nodes that have or define a jcr:content
> +            child node and excludes child nodes that are nt:hierarchyNodes.
> +        -->
> +        <aggregate type="filefolder" title="File/Folder Aggregate"/>
> +
> +        <!--
> +            Defines an aggregate that handles nt:nodeType nodes and serializes
> +            them into .cnd notation.
> +        -->
> +        <aggregate type="nodetype" title="Node Type Aggregate" />
> +
> +        <!--
> +            Defines an aggregate that defines full coverage for certain node
> +            types that cannot be covered by the default aggregator.
> +        -->
> +        <aggregate type="full" title="Full Coverage Aggregate">
> +            <matches>
> +                <include nodeType="rep:AccessControl" respectSupertype="true" />
> +                <include nodeType="rep:Policy" respectSupertype="true" />
> +                <include nodeType="cq:Widget" respectSupertype="true" />
> +                <include nodeType="cq:EditConfig" respectSupertype="true" />
> +                <include nodeType="cq:WorkflowModel" respectSupertype="true" />
> +                <include nodeType="vlt:FullCoverage" respectSupertype="true" />
> +                <include nodeType="mix:language" respectSupertype="true" />
> +                <include nodeType="sling:OsgiConfig" respectSupertype="true" />
> +            </matches>
> +        </aggregate>
> +
> +        <!--
> +            Defines an aggregate that handles nt:folder like nodes.
> +        -->
> +        <aggregate type="generic" title="Folder Aggregate">
> +            <matches>
> +                <include nodeType="nt:folder" respectSupertype="true" />
> +            </matches>
> +            <contains>
> +                <exclude isNode="true" />
> +            </contains>
> +        </aggregate>
> +
> +        <!--
> +            Defines the default aggregate
> +        -->
> +        <aggregate type="generic" title="Default Aggregator" isDefault="true">
> +            <matches>
> +                <!-- all -->
> +            </matches>
> +            <contains>
> +                <exclude nodeType="nt:hierarchyNode" respectSupertype="true" />
> +            </contains>
> +        </aggregate>
> +
> +    </aggregates>
> +
> +    <!--
> +      defines the input handlers
> +    -->
> +    <handlers>
> +        <handler type="folder"/>
> +        <handler type="file"/>
> +        <handler type="nodetype"/>
> +        <handler type="generic"/>
> +    </handlers>
> +</vaultfs>
>
> Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/.content.xml
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/.content.xml?rev=1767213&view=auto
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/.content.xml (added)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/definition/.content.xml Mon Oct 31 01:55:37 2016
> @@ -0,0 +1,25 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<jcr:root xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
> +    jcr:created="{Date}2011-11-15T09:45:14.664+01:00"
> +    jcr:createdBy="admin"
> +    jcr:description=""
> +    jcr:lastModified="{Date}2011-11-15T09:45:14.664+01:00"
> +    jcr:lastModifiedBy="admin"
> +    jcr:primaryType="vlt:PackageDefinition"
> +    buildCount="1"
> +    cqVersion="5.3"
> +    group=""
> +    lastUnwrapped="{Date}2011-11-15T09:45:14.664+01:00"
> +    lastUnwrappedBy="admin"
> +    lastWrapped="{Date}2011-11-15T09:45:14.664+01:00"
> +    lastWrappedBy="admin"
> +    name="mode_ac_test_b"
> +    version="">
> +    <filter jcr:primaryType="nt:unstructured">
> +        <f0
> +            jcr:primaryType="nt:unstructured"
> +            mode="replace"
> +            root="/testroot"
> +            rules="[]"/>
> +    </filter>
> +</jcr:root>
>
> Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/filter.xml
> URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/filter.xml?rev=1767213&view=auto
> ==============================================================================
> --- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/filter.xml (added)
> +++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_b.zip/META-INF/vault/filter.xml Mon Oct 31 01:55:37 2016
> @@ -0,0 +1,4 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<workspaceFilter version="1.0">
> +    <filter root="/testroot" mode="merge"/>
> +</workspaceFilter>
>
>
>