You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2015/01/14 12:33:52 UTC
svn commit: r1651623 -
/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
Author: sseifert
Date: Wed Jan 14 11:33:52 2015
New Revision: 1651623
URL: http://svn.apache.org/r1651623
Log:
SLING-4267 add some more property names to be ignored on import because they are managed by JCR internally
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=1651623&r1=1651622&r2=1651623&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 Wed Jan 14 11:33:52 2015
@@ -56,9 +56,18 @@ public final class ContentLoader {
private static final String PATH = "jcr:path:";
private static final String CONTENTTYPE_OCTET_STREAM = "application/octet-stream";
- 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",
+ 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,
+ JcrConstants.JCR_VERSIONHISTORY,
+ "jcr:checkedOut",
+ "jcr:isCheckedOut",
+ ":jcr:data",
"rep:policy");
private final ResourceResolver resourceResolver;