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/02/02 12:25:44 UTC

svn commit: r1656442 - in /sling/trunk/testing/mocks: jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/ sling-mock-jackrabbit/ sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/ sling-mock/ sling-mock/s...

Author: sseifert
Date: Mon Feb  2 11:25:43 2015
New Revision: 1656442

URL: http://svn.apache.org/r1656442
Log:
SLING-4362 make sure JCR namespaces are correctly registered in JCR mock on initialization through sling mock

Added:
    sling/trunk/testing/mocks/sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java   (with props)
    sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrNamespaceTest.java   (with props)
    sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java   (with props)
    sling/trunk/testing/mocks/sling-mock/src/test/resources/json-import-samples/SLING-4362.json   (with props)
Modified:
    sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockRepository.java
    sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockSession.java
    sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockWorkspace.java
    sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml
    sling/trunk/testing/mocks/sling-mock/pom.xml
    sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java
    sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrResourceResolverTest.java
    sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/SlingCrudResourceResolverTest.java

Modified: sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockRepository.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockRepository.java?rev=1656442&r1=1656441&r2=1656442&view=diff
==============================================================================
--- sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockRepository.java (original)
+++ sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockRepository.java Mon Feb  2 11:25:43 2015
@@ -22,11 +22,14 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import javax.jcr.Credentials;
+import javax.jcr.NamespaceRegistry;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 import javax.jcr.Value;
+import javax.jcr.nodetype.NodeTypeManager;
+import javax.jcr.observation.ObservationManager;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -40,6 +43,10 @@ class MockRepository implements Reposito
 
     // Use linked hashmap to ensure ordering when adding items is preserved.
     private final Map<String, ItemData> items = new LinkedHashMap<String, ItemData>();
+
+    private final NamespaceRegistry namespaceRegistry = new MockNamespaceRegistry();
+    private final ObservationManager observationManager = new MockObservationManager();
+    private final NodeTypeManager nodeTypeManager = new MockNodeTypeManager();
     
     public MockRepository() {
         this.items.put("/", ItemData.newNode("/", MockNodeTypes.NT_UNSTRUCTURED));
@@ -101,4 +108,16 @@ class MockRepository implements Reposito
         return null;
     }
 
+    NamespaceRegistry getNamespaceRegistry() {
+        return namespaceRegistry;
+    }
+
+    ObservationManager getObservationManager() {
+        return observationManager;
+    }
+
+    NodeTypeManager getNodeTypeManager() {
+        return nodeTypeManager;
+    }
+
 }

Modified: sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockSession.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockSession.java?rev=1656442&r1=1656441&r2=1656442&view=diff
==============================================================================
--- sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockSession.java (original)
+++ sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockSession.java Mon Feb  2 11:25:43 2015
@@ -51,15 +51,15 @@ import org.xml.sax.ContentHandler;
  */
 class MockSession implements Session {
 
-    private final Repository repository;
+    private final MockRepository repository;
     private final Workspace workspace;
     private final Map<String, ItemData> items;
     private final String userId;
 
-    public MockSession(Repository repository, Map<String,ItemData> items,
+    public MockSession(MockRepository repository, Map<String,ItemData> items,
             String userId, String workspaceName) {
         this.repository = repository;
-        this.workspace = new MockWorkspace(this, workspaceName);
+        this.workspace = new MockWorkspace(repository, this, workspaceName);
         this.items = items;
         this.userId = userId;
     }

Modified: sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockWorkspace.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockWorkspace.java?rev=1656442&r1=1656441&r2=1656442&view=diff
==============================================================================
--- sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockWorkspace.java (original)
+++ sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockWorkspace.java Mon Feb  2 11:25:43 2015
@@ -38,17 +38,16 @@ import org.xml.sax.ContentHandler;
  */
 class MockWorkspace implements Workspace {
 
+    private final MockRepository repository;
     private final Session session;
     private final String workspaceName;
-    private final NamespaceRegistry namespaceRegistry = new MockNamespaceRegistry();
-    private final ObservationManager observationManager = new MockObservationManager();
-    private final NodeTypeManager nodeTypeManager = new MockNodeTypeManager();
     private final QueryManager queryManager = new MockQueryManager();
 
     /**
      * @param session JCR session
      */
-    public MockWorkspace(Session session, String workspaceName) {
+    public MockWorkspace(MockRepository repository, Session session, String workspaceName) {
+        this.repository = repository;
         this.session = session;
         this.workspaceName = workspaceName;
     }
@@ -65,17 +64,17 @@ class MockWorkspace implements Workspace
 
     @Override
     public NamespaceRegistry getNamespaceRegistry() throws RepositoryException {
-        return this.namespaceRegistry;
+        return repository.getNamespaceRegistry();
     }
 
     @Override
     public ObservationManager getObservationManager() throws RepositoryException {
-        return this.observationManager;
+        return repository.getObservationManager();
     }
 
     @Override
     public NodeTypeManager getNodeTypeManager() throws RepositoryException {
-        return this.nodeTypeManager;
+        return repository.getNodeTypeManager();
     }
 
     @Override

Modified: sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml?rev=1656442&r1=1656441&r2=1656442&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml Mon Feb  2 11:25:43 2015
@@ -49,14 +49,14 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.3-SNAPSHOT</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>

Added: sling/trunk/testing/mocks/sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java?rev=1656442&view=auto
==============================================================================
--- sling/trunk/testing/mocks/sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java (added)
+++ sling/trunk/testing/mocks/sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java Mon Feb  2 11:25:43 2015
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.testing.mock.sling.jackrabbit.resource;
+
+import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.resource.AbstractJcrNamespaceTest;
+import org.junit.Ignore;
+
+//TEST IS DISABLED currently, it does not work with jackrabbit repository yet
+@Ignore
+public class JcrNamespaceTest extends AbstractJcrNamespaceTest {
+
+    @Override
+    protected ResourceResolverType getResourceResolverType() {
+        return ResourceResolverType.JCR_JACKRABBIT;
+    }
+
+}

Propchange: sling/trunk/testing/mocks/sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/testing/mocks/sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Feb  2 11:25:43 2015
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author

Propchange: sling/trunk/testing/mocks/sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1656442&r1=1656441&r2=1656442&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Mon Feb  2 11:25:43 2015
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.jcr-mock</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java?rev=1656442&r1=1656441&r2=1656442&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java Mon Feb  2 11:25:43 2015
@@ -71,6 +71,7 @@ final class ContextResourceResolverFacto
         Session session = resolver.adaptTo(Session.class);
         NamespaceRegistry namespaceRegistry = session.getWorkspace().getNamespaceRegistry();
         namespaceRegistry.registerNamespace("sling", "http://sling.apache.org/jcr/sling/1.0");
+        resolver.close();
     }
 
     private static void initializeJcrJackrabbit(ResourceResolverFactory factory) {

Added: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrNamespaceTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrNamespaceTest.java?rev=1656442&view=auto
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrNamespaceTest.java (added)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrNamespaceTest.java Mon Feb  2 11:25:43 2015
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.testing.mock.sling.jcrmock.resource;
+
+import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.resource.AbstractJcrNamespaceTest;
+
+public class JcrNamespaceTest extends AbstractJcrNamespaceTest {
+
+    @Override
+    protected ResourceResolverType getResourceResolverType() {
+        return ResourceResolverType.JCR_MOCK;
+    }
+
+}

Propchange: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrNamespaceTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrNamespaceTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Feb  2 11:25:43 2015
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author

Propchange: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrNamespaceTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrResourceResolverTest.java?rev=1656442&r1=1656441&r2=1656442&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrResourceResolverTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrResourceResolverTest.java Mon Feb  2 11:25:43 2015
@@ -27,6 +27,7 @@ import org.apache.sling.testing.mock.sli
  */
 public class JcrResourceResolverTest extends AbstractJcrResourceResolverTest {
 
+    @Override
     protected ResourceResolverType getResourceResolverType() {
         return ResourceResolverType.JCR_MOCK;
     }

Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/SlingCrudResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/SlingCrudResourceResolverTest.java?rev=1656442&r1=1656441&r2=1656442&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/SlingCrudResourceResolverTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/SlingCrudResourceResolverTest.java Mon Feb  2 11:25:43 2015
@@ -27,6 +27,7 @@ import org.apache.sling.testing.mock.sli
  */
 public class SlingCrudResourceResolverTest extends AbstractSlingCrudResourceResolverTest {
 
+    @Override
     protected ResourceResolverType getResourceResolverType() {
         return ResourceResolverType.JCR_MOCK;
     }

Added: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java?rev=1656442&view=auto
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java (added)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java Mon Feb  2 11:25:43 2015
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.testing.mock.sling.resource;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.jcr.NamespaceRegistry;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceUtil;
+import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.testing.mock.sling.MockSling;
+import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.junit.SlingContext;
+import org.apache.sling.testing.mock.sling.loader.ContentLoader;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Validates correct registering and mapping of JCR namespaces, esp. the sling namespace. 
+ */
+public abstract class AbstractJcrNamespaceTest {
+    
+    @Rule
+    public SlingContext context = new SlingContext(getResourceResolverType());
+
+    protected abstract ResourceResolverType getResourceResolverType();
+    
+    @Test
+    public void testSling4362_WithSlingNamespace() throws RepositoryException {
+        ResourceResolver resolver = MockSling.newResourceResolver(getResourceResolverType());
+        
+        NamespaceRegistry namespaceRegistry = resolver.adaptTo(Session.class).getWorkspace().getNamespaceRegistry();
+        namespaceRegistry.registerNamespace("sling", "http://mock/sling");
+        
+        ContentLoader contentLoader = new ContentLoader(resolver);
+        contentLoader.json("/json-import-samples/SLING-4362.json", "/content/foo");
+
+        Resource resource = resolver.getResource("/content/foo");
+        
+        ValueMap props = ResourceUtil.getValueMap(resource);
+        assertEquals("fooType", props.get("sling:resourceType"));
+        assertEquals("fooType", resource.getResourceType());
+    }
+
+    @Test
+    public void testSling4362_WithoutSlingNamespace() throws RepositoryException {
+        ResourceResolver resolver = MockSling.newResourceResolver(getResourceResolverType());
+        
+        ContentLoader contentLoader = new ContentLoader(resolver);
+        contentLoader.json("/json-import-samples/SLING-4362.json", "/content/foo");
+
+        Resource resource = resolver.getResource("/content/foo");
+        
+        ValueMap props = ResourceUtil.getValueMap(resource);
+        assertEquals("fooType", props.get("sling:resourceType"));
+        
+        // without proper sling namespace definition it is expected that the JCR resource implementation cannot detect the resource type properly
+        assertEquals("nt:unstructured", resource.getResourceType());
+    }
+
+    @Test
+    public void testSling4362_WithoutSlingNamespace_ViaContextRule() throws RepositoryException {
+        ResourceResolver resolver = context.resourceResolver();
+        
+        ContentLoader contentLoader = new ContentLoader(resolver);
+        contentLoader.json("/json-import-samples/SLING-4362.json", "/content/foo");
+
+        Resource resource = resolver.getResource("/content/foo");
+        
+        ValueMap props = ResourceUtil.getValueMap(resource);
+        assertEquals("fooType", props.get("sling:resourceType"));
+        assertEquals("fooType", resource.getResourceType());
+    }
+
+}

Propchange: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Feb  2 11:25:43 2015
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author

Propchange: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: sling/trunk/testing/mocks/sling-mock/src/test/resources/json-import-samples/SLING-4362.json
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/resources/json-import-samples/SLING-4362.json?rev=1656442&view=auto
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/resources/json-import-samples/SLING-4362.json (added)
+++ sling/trunk/testing/mocks/sling-mock/src/test/resources/json-import-samples/SLING-4362.json Mon Feb  2 11:25:43 2015
@@ -0,0 +1,5 @@
+{
+	"jcr:primaryType":"nt:unstructured",
+	"sling:resourceType": "fooType",
+	"thisIs": "child"
+}

Propchange: sling/trunk/testing/mocks/sling-mock/src/test/resources/json-import-samples/SLING-4362.json
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/testing/mocks/sling-mock/src/test/resources/json-import-samples/SLING-4362.json
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Feb  2 11:25:43 2015
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author

Propchange: sling/trunk/testing/mocks/sling-mock/src/test/resources/json-import-samples/SLING-4362.json
------------------------------------------------------------------------------
    svn:mime-type = text/plain