Author: tomekr
Date: Tue Feb 24 09:33:51 2015
New Revision: 1661870
URL: http://svn.apache.org/r1661870
Log:
SLING-848; Updated API version to 2.9.0. Use MockJcrResourceResolverFactory
implementation from the Sling Mock in versioning IT
Added:
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/testing/mock/sling/MockResolverProvider.java
Removed:
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java
Modified:
sling/trunk/bundles/jcr/it-resource-versioning/pom.xml
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/jcr/resource/it/ResourceVersioningTest.java
sling/trunk/bundles/jcr/resource/pom.xml
sling/trunk/bundles/resourceresolver/pom.xml
Modified: sling/trunk/bundles/jcr/it-resource-versioning/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-resource-versioning/pom.xml?rev=1661870&r1=1661869&r2=1661870&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-resource-versioning/pom.xml (original)
+++ sling/trunk/bundles/jcr/it-resource-versioning/pom.xml Tue Feb 24 09:33:51
2015
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.8.1-SNAPSHOT</version>
+ <version>2.9.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/jcr/resource/it/ResourceVersioningTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/jcr/resource/it/ResourceVersioningTest.java?rev=1661870&r1=1661869&r2=1661870&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/jcr/resource/it/ResourceVersioningTest.java
(original)
+++
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/jcr/resource/it/ResourceVersioningTest.java
Tue Feb 24 09:33:51 2015
@@ -35,9 +35,7 @@ import org.apache.jackrabbit.JcrConstant
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.commons.testing.jcr.RepositoryProvider;
-import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.testing.mock.sling.MockJcrResourceResolverFactory;
+import org.apache.sling.testing.mock.sling.MockResolverProvider;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -54,8 +52,7 @@ public class ResourceVersioningTest {
@Before
public void setUp() throws Exception {
- SlingRepository repository =
RepositoryProvider.instance().getRepository();
- resolver = new
MockJcrResourceResolverFactory(repository).getAdministrativeResourceResolver(null);
+ resolver = MockResolverProvider.getResourceResolver();
session = resolver.adaptTo(Session.class);
versionManager = session.getWorkspace().getVersionManager();
registerNamespace("sling", "http://sling.apache.org/jcr/sling/1.0";);
Added:
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/testing/mock/sling/MockResolverProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/testing/mock/sling/MockResolverProvider.java?rev=1661870&view=auto
==============================================================================
---
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/testing/mock/sling/MockResolverProvider.java
(added)
+++
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/testing/mock/sling/MockResolverProvider.java
Tue Feb 24 09:33:51 2015
@@ -0,0 +1,23 @@
+package org.apache.sling.testing.mock.sling;
+
+import javax.jcr.RepositoryException;
+
+import org.apache.sling.api.resource.LoginException;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.commons.testing.jcr.RepositoryProvider;
+import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.jcr.resource.internal.helper.jcr.PathMapper;
+import org.apache.sling.testing.mock.osgi.MockOsgi;
+import org.osgi.framework.BundleContext;
+
+public class MockResolverProvider {
+ private MockResolverProvider() {
+ }
+
+ public static ResourceResolver getResourceResolver() throws
RepositoryException, LoginException {
+ final SlingRepository repository =
RepositoryProvider.instance().getRepository();
+ final BundleContext bundleContext = MockOsgi.newBundleContext();
+ bundleContext.registerService(PathMapper.class.getName(), new
PathMapper(), null);
+ return new MockJcrResourceResolverFactory(repository,
bundleContext).getAdministrativeResourceResolver(null);
+ }
+}
Modified: sling/trunk/bundles/jcr/resource/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=1661870&r1=1661869&r2=1661870&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/pom.xml (original)
+++ sling/trunk/bundles/jcr/resource/pom.xml Tue Feb 24 09:33:51 2015
@@ -142,7 +142,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.8.1-SNAPSHOT</version>
+ <version>2.9.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: sling/trunk/bundles/resourceresolver/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/pom.xml?rev=1661870&r1=1661869&r2=1661870&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/pom.xml (original)
+++ sling/trunk/bundles/resourceresolver/pom.xml Tue Feb 24 09:33:51 2015
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.8.1-SNAPSHOT</version>
+ <version>2.9.0</version>
<scope>provided</scope>
</dependency>
<dependency>
