Author: sseifert
Date: Tue Feb 23 01:05:32 2016
New Revision: 1731774
URL: http://svn.apache.org/viewvc?rev=1731774&view=rev
Log:
SLING-5548 Remove JCR_JACKRABBIT resource resolver type
Removed:
sling/trunk/testing/mocks/sling-mock-jackrabbit/
Modified:
sling/trunk/testing/mocks/pom.xml
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
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/resource/AbstractSlingCrudResourceResolverTest.java
Modified: sling/trunk/testing/mocks/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/pom.xml?rev=1731774&r1=1731773&r2=1731774&view=diff
==============================================================================
--- sling/trunk/testing/mocks/pom.xml (original)
+++ sling/trunk/testing/mocks/pom.xml Tue Feb 23 01:05:32 2016
@@ -47,7 +47,6 @@
<module>jcr-mock</module>
<module>osgi-mock</module>
<module>sling-mock</module>
- <module>sling-mock-jackrabbit</module>
<module>sling-mock-oak</module>
</modules>
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java?rev=1731774&r1=1731773&r2=1731774&view=diff
==============================================================================
---
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
Tue Feb 23 01:05:32 2016
@@ -54,20 +54,6 @@ public enum ResourceResolverType {
JCR_MOCK(MockJcrResourceResolverAdapter.class.getName(), null,
NodeTypeMode.NAMESPACES_ONLY),
/**
- * Uses a real JCR Jackrabbit repository.
- * <ul>
- * <li>Uses the real Sling Resource Resolver and JCR Resource mapping
- * implementation.</li>
- * <li>The JCR repository is started on first access, this may take some
- * seconds.</li>
- * <li>Beware: The repository is not cleared for each unit test, so make
- * sure us use a unique node path for each unit test.</li>
- * </ul>
- */
-
JCR_JACKRABBIT("org.apache.sling.testing.mock.sling.jackrabbit.JackrabbitMockResourceResolverAdapter",
- "org.apache.sling:org.apache.sling.testing.sling-mock-jackrabbit",
NodeTypeMode.NODETYPES_REQUIRED),
-
- /**
* Uses a real JCR Jackrabbit Oak repository.
* <ul>
* <li>Uses the real Sling Resource Resolver and JCR Resource mapping
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=1731774&r1=1731773&r2=1731774&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
Tue Feb 23 01:05:32 2016
@@ -48,9 +48,6 @@ final class ContextResourceResolverFacto
case JCR_MOCK:
initializeJcrMock(factory);
break;
- case JCR_JACKRABBIT:
- initializeJcrJackrabbit(factory);
- break;
case JCR_OAK:
initializeJcrOak(factory);
break;
@@ -74,10 +71,6 @@ final class ContextResourceResolverFacto
// nothing to do
}
- private static void initializeJcrJackrabbit(ResourceResolverFactory
factory) {
- // register sling node types?
- }
-
private static void initializeJcrOak(ResourceResolverFactory factory) {
// register sling node types?
}
Modified:
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java?rev=1731774&r1=1731773&r2=1731774&view=diff
==============================================================================
---
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
Tue Feb 23 01:05:32 2016
@@ -145,7 +145,6 @@ public abstract class AbstractSlingCrudR
// TODO: enable this test when JCR resource implementation supports
// writing Date objects (SLING-3846)
if (getResourceResolverType() != ResourceResolverType.JCR_MOCK
- && getResourceResolverType() !=
ResourceResolverType.JCR_JACKRABBIT
&& getResourceResolverType() != ResourceResolverType.JCR_OAK )
{
assertEquals(DATE_VALUE, props.get("dateProp", Date.class));
}
@@ -158,7 +157,6 @@ public abstract class AbstractSlingCrudR
// TODO: enable this test when JCR resource implementation supports
// writing Date objects (SLING-3846)
if (getResourceResolverType() != ResourceResolverType.JCR_MOCK
- && getResourceResolverType() !=
ResourceResolverType.JCR_JACKRABBIT
&& getResourceResolverType() != ResourceResolverType.JCR_OAK )
{
Calendar calendarValue = props.get("dateProp", Calendar.class);
assertNotNull(calendarValue);
