Author: sseifert
Date: Sat Apr 29 07:46:04 2017
New Revision: 1793173
URL: http://svn.apache.org/viewvc?rev=1793173&view=rev
Log:
SLING-6813 sling-mock: Make compatible with org.apache.sling.jcr.resource 3.0.0
Modified:
sling/trunk/testing/mocks/sling-mock/pom.xml
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java
Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1793173&r1=1793172&r2=1793173&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Sat Apr 29 07:46:04 2017
@@ -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>
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java?rev=1793173&r1=1793172&r2=1793173&view=diff
==============================================================================
---
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
Sat Apr 29 07:46:04 2017
@@ -28,7 +28,6 @@ import org.apache.sling.api.resource.Res
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
+ }
}
/**
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java?rev=1793173&r1=1793172&r2=1793173&view=diff
==============================================================================
---
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
Sat Apr 29 07:46:04 2017
@@ -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();
}
Modified:
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=1793173&r1=1793172&r2=1793173&view=diff
==============================================================================
---
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java
Sat Apr 29 07:46:04 2017
@@ -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 AbstractJcrNamespa
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 AbstractJcrNamespa
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());
}
Modified:
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java?rev=1793173&r1=1793172&r2=1793173&view=diff
==============================================================================
---
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java
Sat Apr 29 07:46:04 2017
@@ -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 AbstractJcrResourc
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 AbstractJcrResourc
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());
}
