You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2016/01/23 02:06:53 UTC
svn commit: r1726349 - in
/jackrabbit/commons/filevault/trunk/vault-core/src/test:
java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java
resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_subpackage.zip
Author: tripod
Date: Sat Jan 23 01:06:53 2016
New Revision: 1726349
URL: http://svn.apache.org/viewvc?rev=1726349&view=rev
Log:
JCRVLT-107 Package manager applies the acHandling of parent package to all the subpackages
Added:
jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_subpackage.zip
Modified:
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java
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=1726349&r1=1726348&r2=1726349&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 Sat Jan 23 01:06:53 2016
@@ -141,6 +141,33 @@ public class TestACLAndMerge extends Int
}
/**
+ * Installs 2 packages with the same ACL. the later packages has a sub package with a different AC handling.
+ * See JCRVLT-107.
+ */
+ @Test
+ 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());
+
+ // 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());
+
+ // test if nodes and ACLs of 2nd package exist
+ assertNodeExists("/testroot/node_a");
+ assertNodeExists("/testroot/node_b");
+ assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
+ assertPermission("/testroot/secured", true, new String[]{"jcr:read"}, "everyone", "*/foo/*");
+ }
+
+ /**
* Installs 2 packages with the same ACE. the later packages has AC Handling MERGE and should overwrite the
* existing ACL.
*/
Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_subpackage.zip
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_subpackage.zip?rev=1726349&view=auto
==============================================================================
Binary files jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_subpackage.zip (added) and jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_subpackage.zip Sat Jan 23 01:06:53 2016 differ