This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-2.2.10 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 960d1056090fd479feeda324fe07e5a8af23a9c3 Author: Stefan Seifert <[email protected]> AuthorDate: Sat Apr 29 07:46:04 2017 +0000 SLING-6813 sling-mock: Make compatible with org.apache.sling.jcr.resource 3.0.0 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1793173 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- .../mock/sling/ResourceResolverFactoryInitializer.java | 11 +++++++++-- .../apache/sling/testing/mock/sling/context/UniqueRoot.java | 8 +++----- .../testing/mock/sling/resource/AbstractJcrNamespaceTest.java | 5 ++--- .../mock/sling/resource/AbstractJcrResourceResolverTest.java | 6 ++---- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 39cb36f..ab30579 100644 --- a/pom.xml +++ b/pom.xml @@ -280,7 +280,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.resource</artifactId> - <version>2.9.2</version> + <version>3.0.1-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --git a/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java b/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java index 0b42c49..5b64c58 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java @@ -28,7 +28,6 @@ import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.commons.classloader.DynamicClassLoaderManager; import org.apache.sling.jcr.api.SlingRepository; import org.apache.sling.jcr.resource.internal.helper.jcr.JcrResourceProvider; -import org.apache.sling.jcr.resource.internal.helper.jcr.PathMapper; import org.apache.sling.resourceresolver.impl.ResourceAccessSecurityTracker; import org.apache.sling.resourceresolver.impl.ResourceResolverFactoryActivator; import org.apache.sling.serviceusermapping.ServiceUserMapper; @@ -84,11 +83,19 @@ class ResourceResolverFactoryInitializer { * Ensure dependencies for JcrResourceProvider are present. * @param bundleContext Bundle context */ + @SuppressWarnings("unchecked") private static void ensureJcrResourceProviderDependencies(BundleContext bundleContext) { if (bundleContext.getServiceReference(DynamicClassLoaderManager.class) == null) { bundleContext.registerService(DynamicClassLoaderManager.class, new MockDynamicClassLoaderManager(), null); } - registerServiceIfNotPresent(bundleContext, PathMapper.class, new PathMapper()); + + try { + Class pathMapperClass = Class.forName("org.apache.sling.jcr.resource.internal.helper.jcr.PathMapper"); + registerServiceIfNotPresent(bundleContext, pathMapperClass, pathMapperClass.newInstance()); + } + catch (ClassNotFoundException | InstantiationException | IllegalAccessException ex) { + // ignore - service was removed in org.apache.sling.jcr.resource 3.0.0 + } } /** diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java b/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java index 7e897ef..f5f68d3 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java @@ -18,8 +18,6 @@ */ package org.apache.sling.testing.mock.sling.context; -import static org.apache.sling.jcr.resource.JcrResourceConstants.NT_SLING_ORDERED_FOLDER; - import java.util.UUID; import org.apache.jackrabbit.JcrConstants; @@ -81,7 +79,7 @@ public class UniqueRoot { */ public final String content() { if (contentRoot == null) { - contentRoot = getOrCreateResource("/content/" + uniquePathPart, NT_SLING_ORDERED_FOLDER); + contentRoot = getOrCreateResource("/content/" + uniquePathPart, "sling:OrderedFolder"); } return contentRoot.getPath(); } @@ -93,7 +91,7 @@ public class UniqueRoot { */ public final String apps() { if (appsRoot == null) { - appsRoot = getOrCreateResource("/apps/" + uniquePathPart, NT_SLING_ORDERED_FOLDER); + appsRoot = getOrCreateResource("/apps/" + uniquePathPart, "sling:OrderedFolder"); } return appsRoot.getPath(); } @@ -105,7 +103,7 @@ public class UniqueRoot { */ public final String libs() { if (libsRoot == null) { - libsRoot = getOrCreateResource("/libs/" + uniquePathPart, NT_SLING_ORDERED_FOLDER); + libsRoot = getOrCreateResource("/libs/" + uniquePathPart, "sling:OrderedFolder"); } return libsRoot.getPath(); } diff --git a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java index 427e338..3fedcca 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java @@ -18,7 +18,6 @@ */ package org.apache.sling.testing.mock.sling.resource; -import static org.apache.sling.jcr.resource.JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY; import static org.junit.Assert.assertEquals; import javax.jcr.RepositoryException; @@ -57,7 +56,7 @@ public abstract class AbstractJcrNamespaceTest { Resource resource = resolver.getResource(context.uniqueRoot().content() + "/foo"); ValueMap props = ResourceUtil.getValueMap(resource); - assertEquals("fooType", props.get(SLING_RESOURCE_TYPE_PROPERTY)); + assertEquals("fooType", props.get("sling:resourceType")); assertEquals("fooType", resource.getResourceType()); MockOsgi.shutdown(bundleContext); @@ -73,7 +72,7 @@ public abstract class AbstractJcrNamespaceTest { Resource resource = resolver.getResource(context.uniqueRoot().content() + "/foo"); ValueMap props = ResourceUtil.getValueMap(resource); - assertEquals("fooType", props.get(SLING_RESOURCE_TYPE_PROPERTY)); + assertEquals("fooType", props.get("sling:resourceType")); assertEquals("fooType", resource.getResourceType()); } diff --git a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java index 2726da9..8b6251a 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java @@ -18,8 +18,6 @@ */ package org.apache.sling.testing.mock.sling.resource; -import static org.apache.sling.jcr.resource.JcrResourceConstants.NT_SLING_ORDERED_FOLDER; -import static org.apache.sling.jcr.resource.JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -153,7 +151,7 @@ public abstract class AbstractJcrResourceResolverTest { Resource parent = context.resourceResolver().getResource(getTestRootNode().getPath()); Resource child = context.resourceResolver().create(parent, "nodeTypeResource", ImmutableMap.<String, Object> builder() - .put(SLING_RESOURCE_TYPE_PROPERTY, JcrConstants.NT_UNSTRUCTURED).build()); + .put("sling:resourceType", JcrConstants.NT_UNSTRUCTURED).build()); assertNotNull(child); assertEquals(JcrConstants.NT_UNSTRUCTURED, child.getResourceType()); assertEquals(JcrConstants.NT_UNSTRUCTURED, child.adaptTo(Node.class).getPrimaryNodeType().getName()); @@ -166,7 +164,7 @@ public abstract class AbstractJcrResourceResolverTest { Resource child = ResourceUtil.getOrCreateResource(context.resourceResolver(), parent.getPath() + "/intermediate/child", "sling/resource/type", JcrConstants.NT_UNSTRUCTURED, true); assertNotNull(child); - assertEquals(NT_SLING_ORDERED_FOLDER, parent.getResourceType()); + assertEquals("sling:OrderedFolder", parent.getResourceType()); assertEquals("sling/resource/type", child.getResourceType()); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
