You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:22:11 UTC
[sling-org-apache-sling-testing-sling-mock] 01/28: SLING-848
Support getting versioned resources by using uri path parameters
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-1.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 5e1c2d6fc93d27ac501789e65d8d9cffca55d435
Author: Tomasz Rekawek <to...@apache.org>
AuthorDate: Mon Feb 9 16:00:52 2015 +0000
SLING-848 Support getting versioned resources by using uri path parameters
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1658445 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +++---
.../mock/sling/MockJcrResourceResolverFactory.java | 15 +++++++++++----
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 64c4222..363d194 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,13 +81,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.4.0</version>
+ <version>2.8.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.resourceresolver</artifactId>
- <version>1.1.0</version>
+ <version>1.1.13-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>2.3.6</version>
+ <version>2.4.5-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java b/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java
index 2fb8248..60f3915 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java
@@ -29,6 +29,7 @@ import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.resource.internal.helper.jcr.JcrResourceProviderFactory;
+import org.apache.sling.jcr.resource.internal.helper.jcr.PathMapper;
import org.apache.sling.resourceresolver.impl.CommonResourceResolverFactoryImpl;
import org.apache.sling.resourceresolver.impl.ResourceAccessSecurityTracker;
import org.apache.sling.resourceresolver.impl.ResourceResolverImpl;
@@ -57,7 +58,7 @@ class MockJcrResourceResolverFactory implements ResourceResolverFactory {
private ResourceResolver getResourceResolverInternal(Map<String, Object> authenticationInfo, boolean isAdmin) throws LoginException {
// setup mock OSGi environment
BundleContext bundleContext = MockOsgi.newBundleContext();
-
+
Dictionary<String, Object> resourceProviderFactoryFactoryProps = new Hashtable<String, Object>();
resourceProviderFactoryFactoryProps.put(Constants.SERVICE_VENDOR, "sling-mock");
resourceProviderFactoryFactoryProps.put(Constants.SERVICE_DESCRIPTION, "sling-mock");
@@ -67,13 +68,14 @@ class MockJcrResourceResolverFactory implements ResourceResolverFactory {
// setup mocked JCR environment
bundleContext.registerService(SlingRepository.class.getName(), this.slingRepository, null);
+ bundleContext.registerService(PathMapper.class.getName(), new PathMapper(), null);
// setup real sling JCR resource provider implementation for use in
// mocked context
JcrResourceProviderFactory jcrResourceProviderFactory = new JcrResourceProviderFactory();
MockOsgi.injectServices(jcrResourceProviderFactory, bundleContext);
MockOsgi.activate(jcrResourceProviderFactory, bundleContext, ImmutableMap.<String, Object> of());
-
+
ResourceProvider resourceProvider;
if (isAdmin) {
resourceProvider = jcrResourceProviderFactory.getAdministrativeResourceProvider(authenticationInfo);
@@ -81,7 +83,7 @@ class MockJcrResourceResolverFactory implements ResourceResolverFactory {
else {
resourceProvider = jcrResourceProviderFactory.getResourceProvider(authenticationInfo);
}
-
+
Dictionary<Object, Object> resourceProviderProps = new Hashtable<Object, Object>();
resourceProviderProps.put(ResourceProvider.ROOTS, new String[] { "/" });
bundleContext.registerService(ResourceProvider.class.getName(), resourceProvider, resourceProviderProps);
@@ -112,7 +114,7 @@ class MockJcrResourceResolverFactory implements ResourceResolverFactory {
public ResourceResolver getResourceResolver(final Map<String, Object> authenticationInfo) throws LoginException {
return getResourceResolverInternal(authenticationInfo, false);
}
-
+
@Override
public ResourceResolver getAdministrativeResourceResolver(final Map<String, Object> authenticationInfo)
throws LoginException {
@@ -125,4 +127,9 @@ class MockJcrResourceResolverFactory implements ResourceResolverFactory {
return getResourceResolverInternal(authenticationInfo, true);
}
+ @Override
+ public ResourceResolver getThreadResourceResolver() {
+ return null;
+ }
+
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.