svn commit: r1648266 - /sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java

[ro...@apache.org]

Author: rombert
Date: Sun Dec 28 22:47:13 2014
New Revision: 1648266

URL: http://svn.apache.org/r1648266
Log:
SLING-4268 - ContentLoader should not try to import ACLs

Skip nodes named rep:policy when importing. This is not 100% full-proof
( looking at the node's primary type would be ideal ) but will work for
all practical cases.

Modified:
    sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java

Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java?rev=1648266&r1=1648265&r2=1648266&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java Sun Dec 28 22:47:13 2014
@@ -58,7 +58,8 @@ public final class ContentLoader {
 
     private static final Set<String> IGNORED_NAMES = ImmutableSet.of(JcrConstants.JCR_PRIMARYTYPE,
             JcrConstants.JCR_MIXINTYPES, JcrConstants.JCR_UUID, JcrConstants.JCR_BASEVERSION,
-            JcrConstants.JCR_PREDECESSORS, JcrConstants.JCR_SUCCESSORS, JcrConstants.JCR_CREATED, "jcr:checkedOut");
+            JcrConstants.JCR_PREDECESSORS, JcrConstants.JCR_SUCCESSORS, JcrConstants.JCR_CREATED, "jcr:checkedOut",
+            "rep:policy");
 
     private final ResourceResolver resourceResolver;
     private final BundleContext bundleContext;