Author: sseifert
Date: Tue May 19 21:31:21 2015
New Revision: 1680397
URL: http://svn.apache.org/r1680397
Log:
refactor unit tests
Added:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTest.java
- copied, changed from r1680091,
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProviderTest.java
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTransactionalTest.java
- copied, changed from r1680116,
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProviderTransactionalTest.java
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderQueryTest.java
(with props)
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTest.java
(with props)
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTransactionalTest.java
(with props)
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/provider/
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/provider/SimpleNoSqlAdapter.java
- copied, changed from r1680116,
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlAdapter.java
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/provider/SimpleNoSqlResourceProviderFactory.java
- copied, changed from r1680116,
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderFactory.java
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/resources/OSGI-INF/org.apache.sling.nosql.generic.simple.provider.SimpleNoSqlResourceProviderFactory.xml
- copied, changed from r1680116,
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/resources/OSGI-INF/org.apache.sling.nosql.generic.simple.SimpleNoSqlResourceProviderFactory.xml
Removed:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProviderQueryTest.java
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProviderTest.java
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProviderTransactionalTest.java
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlAdapter.java
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderFactory.java
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/resources/OSGI-INF/org.apache.sling.nosql.generic.simple.SimpleNoSqlResourceProviderFactory.xml
Modified:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/pom.xml
Modified: sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/pom.xml
URL:
http://svn.apache.org/viewvc/sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/pom.xml?rev=1680397&r1=1680396&r2=1680397&view=diff
==============================================================================
--- sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/pom.xml (original)
+++ sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/pom.xml Tue May 19
21:31:21 2015
@@ -53,6 +53,20 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
+
+ <!-- Publish test artifact -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
Copied:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTest.java
(from r1680091,
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProviderTest.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTest.java?p2=sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTest.java&p1=sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProviderTest.java&r1=1680091&r2=1680397&rev=1680397&view=diff
==============================================================================
---
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProviderTest.java
(original)
+++
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTest.java
Tue May 19 21:31:21 2015
@@ -36,13 +36,10 @@ import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.JcrConstants;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
-import
org.apache.sling.nosql.generic.simple.SimpleNoSqlResourceProviderFactory;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
-import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -53,7 +50,7 @@ import com.google.common.collect.Immutab
/**
* Test basic ResourceResolver and ValueMap with different data types.
*/
-public class NoSqlResourceProviderTest {
+public abstract class AbstractNoSqlResourceProviderTest {
private static final String STRING_VALUE = "value1";
private static final String[] STRING_ARRAY_VALUE = new String[] {
"value1", "value2" };
@@ -67,16 +64,16 @@ public class NoSqlResourceProviderTest {
@Rule
public SlingContext context = new
SlingContext(ResourceResolverType.JCR_MOCK);
- private Resource testRoot;
+ protected abstract void registerResourceProviderFactory();
+
+ protected abstract Resource testRoot();
@Before
public void setUp() throws Exception {
- context.registerInjectActivateService(new
SimpleNoSqlResourceProviderFactory(), ImmutableMap.<String, Object>builder()
- .put(ResourceProvider.ROOTS, "/nosql-simple")
- .build());
+ registerResourceProviderFactory();
// prepare some test data using Sling CRUD API
- Resource rootNode = getTestRootResource();
+ Resource rootNode = testRoot();
Map<String, Object> props = new HashMap<String, Object>();
props.put(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED);
@@ -98,30 +95,9 @@ public class NoSqlResourceProviderTest {
context.resourceResolver().commit();
}
-
- @After
- public final void tearDown() {
- this.testRoot = null;
- }
-
- /**
- * Return a test root resource, created on demand, with a unique path
- * @throws PersistenceException
- */
- private Resource getTestRootResource() throws PersistenceException {
- if (this.testRoot == null) {
- Map<String, Object> props = new HashMap<String, Object>();
- props.put(JcrConstants.JCR_PRIMARYTYPE,
JcrConstants.NT_UNSTRUCTURED);
- final Resource root = context.resourceResolver().getResource("/");
- Resource noSqlRoot = context.resourceResolver().create(root,
"nosql-simple", props);
- this.testRoot = context.resourceResolver().create(noSqlRoot,
"test", props);
- }
- return this.testRoot;
- }
-
@Test
public void testSimpleProperties() throws IOException {
- Resource resource1 =
context.resourceResolver().getResource(getTestRootResource().getPath() +
"/node1");
+ Resource resource1 =
context.resourceResolver().getResource(testRoot().getPath() + "/node1");
assertTrue(resource1 instanceof NoSqlResource);
assertNotNull(resource1);
@@ -137,9 +113,9 @@ public class NoSqlResourceProviderTest {
@Test
public void testSimpleProperties_DeepPathAccess() throws IOException {
- Resource resource1 =
context.resourceResolver().getResource(testRoot.getPath());
+ Resource resource1 =
context.resourceResolver().getResource(testRoot().getPath());
assertNotNull(resource1);
- assertEquals(testRoot.getName(), resource1.getName());
+ assertEquals(testRoot().getName(), resource1.getName());
ValueMap props = ResourceUtil.getValueMap(resource1);
assertEquals(STRING_VALUE, props.get("node1/stringProp",
String.class));
@@ -152,14 +128,14 @@ public class NoSqlResourceProviderTest {
@Test
public void testDateProperty() throws IOException {
- Resource resource1 =
context.resourceResolver().getResource(getTestRootResource().getPath() +
"/node1");
+ Resource resource1 =
context.resourceResolver().getResource(testRoot().getPath() + "/node1");
ValueMap props = ResourceUtil.getValueMap(resource1);
assertEquals(DATE_VALUE, props.get("dateProp", Date.class));
}
@Test
public void testDatePropertyToCalendar() throws IOException {
- Resource resource1 =
context.resourceResolver().getResource(getTestRootResource().getPath() +
"/node1");
+ Resource resource1 =
context.resourceResolver().getResource(testRoot().getPath() + "/node1");
ValueMap props = ResourceUtil.getValueMap(resource1);
Calendar calendarValue = props.get("dateProp", Calendar.class);
assertNotNull(calendarValue);
@@ -168,14 +144,14 @@ public class NoSqlResourceProviderTest {
@Test
public void testCalendarProperty() throws IOException {
- Resource resource1 =
context.resourceResolver().getResource(getTestRootResource().getPath() +
"/node1");
+ Resource resource1 =
context.resourceResolver().getResource(testRoot().getPath() + "/node1");
ValueMap props = ResourceUtil.getValueMap(resource1);
assertEquals(CALENDAR_VALUE.getTime(), props.get("calendarProp",
Calendar.class).getTime());
}
@Test
public void testCalendarPropertyToDate() throws IOException {
- Resource resource1 =
context.resourceResolver().getResource(getTestRootResource().getPath() +
"/node1");
+ Resource resource1 =
context.resourceResolver().getResource(testRoot().getPath() + "/node1");
ValueMap props = ResourceUtil.getValueMap(resource1);
Date dateValue = props.get("calendarProp", Date.class);
assertNotNull(dateValue);
@@ -184,7 +160,7 @@ public class NoSqlResourceProviderTest {
@Test
public void testListChildren() throws IOException {
- Resource resource1 =
context.resourceResolver().getResource(getTestRootResource().getPath() +
"/node1");
+ Resource resource1 =
context.resourceResolver().getResource(testRoot().getPath() + "/node1");
List<Resource> children =
ImmutableList.copyOf(resource1.listChildren());
assertEquals(2, children.size());
@@ -194,7 +170,7 @@ public class NoSqlResourceProviderTest {
@Test
public void testBinaryData() throws IOException {
- Resource resource1 =
context.resourceResolver().getResource(getTestRootResource().getPath() +
"/node1");
+ Resource resource1 =
context.resourceResolver().getResource(testRoot().getPath() + "/node1");
InputStream is = ResourceUtil.getValueMap(resource1).get("binaryProp",
InputStream.class);
byte[] dataFromResource = IOUtils.toByteArray(is);
@@ -204,7 +180,7 @@ public class NoSqlResourceProviderTest {
@Test
public void testValueMapTypes() throws IOException {
- Resource resource1 =
context.resourceResolver().getResource(getTestRootResource().getPath() +
"/node1");
+ Resource resource1 =
context.resourceResolver().getResource(testRoot().getPath() + "/node1");
// ensure that value map has only supported primitive types (all other
supported types converted to string)
ValueMap valueMap = resource1.getValueMap();
@@ -215,7 +191,7 @@ public class NoSqlResourceProviderTest {
@Test
public void testPrimaryTypeResourceType() throws PersistenceException {
- Resource resource =
context.resourceResolver().getResource(getTestRootResource().getPath());
+ Resource resource =
context.resourceResolver().getResource(testRoot().getPath());
assertEquals(JcrConstants.NT_UNSTRUCTURED, resource.getResourceType());
}
Copied:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTransactionalTest.java
(from r1680116,
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProviderTransactionalTest.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTransactionalTest.java?p2=sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTransactionalTest.java&p1=sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProviderTransactionalTest.java&r1=1680116&r2=1680397&rev=1680397&view=diff
==============================================================================
---
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProviderTransactionalTest.java
(original)
+++
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTransactionalTest.java
Tue May 19 21:31:21 2015
@@ -24,16 +24,11 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import java.util.HashMap;
import java.util.Iterator;
-import java.util.Map;
-import org.apache.jackrabbit.JcrConstants;
import org.apache.sling.api.resource.ModifiableValueMap;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceProvider;
-import
org.apache.sling.nosql.generic.simple.SimpleNoSqlResourceProviderFactory;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
@@ -45,70 +40,62 @@ import com.google.common.collect.Immutab
/**
* Test basic ResourceResolver and ValueMap with different data types.
*/
-public class NoSqlResourceProviderTransactionalTest {
+public abstract class AbstractNoSqlResourceProviderTransactionalTest {
@Rule
public SlingContext context = new
SlingContext(ResourceResolverType.JCR_MOCK);
- private Resource testRoot;
+ protected abstract void registerResourceProviderFactory();
+
+ protected abstract Resource testRoot();
@Before
public void setUp() throws Exception {
- context.registerInjectActivateService(new
SimpleNoSqlResourceProviderFactory(), ImmutableMap.<String, Object>builder()
- .put(ResourceProvider.ROOTS, "/nosql-simple")
- .build());
-
- // prepare some test data using Sling CRUD API
- Map<String, Object> props = new HashMap<String, Object>();
- props.put(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED);
- final Resource root = context.resourceResolver().getResource("/");
- Resource noSqlRoot = context.resourceResolver().create(root,
"nosql-simple", props);
- this.testRoot = context.resourceResolver().create(noSqlRoot, "test",
props);
- context.resourceResolver().commit();
+ registerResourceProviderFactory();
}
-
+
@Test
public void testRootNode() {
- assertTrue(testRoot instanceof NoSqlResource);
+ assertTrue(testRoot() instanceof NoSqlResource);
}
@Test
public void testGetInvalidPath() {
- assertNull(context.resourceResolver().getResource(testRoot.getPath() +
"/invalid/1"));
+ assertNull(context.resourceResolver().getResource(testRoot().getPath()
+ "/invalid/1"));
}
@Test(expected = PersistenceException.class)
public void testCreateInvalidPath() throws PersistenceException {
- context.resourceResolver().create(testRoot, "invalid",
ImmutableMap.<String, Object>of());
+ context.resourceResolver().create(testRoot(), "invalid",
ImmutableMap.<String, Object>of());
}
@Test
public void testAddDeleteNodesPartialCommit() throws PersistenceException {
- context.resourceResolver().create(testRoot, "node0",
ImmutableMap.<String, Object>of());
- context.resourceResolver().create(testRoot, "node1",
ImmutableMap.<String, Object>of());
+ context.resourceResolver().create(testRoot(), "node0",
ImmutableMap.<String, Object>of());
+ context.resourceResolver().create(testRoot(), "node1",
ImmutableMap.<String, Object>of());
context.resourceResolver().commit();
assertFalse(context.resourceResolver().hasChanges());
- context.resourceResolver().create(testRoot, "node2",
ImmutableMap.<String, Object>of());
- context.resourceResolver().create(testRoot, "node3",
ImmutableMap.<String, Object>of());
+ context.resourceResolver().create(testRoot(), "node2",
ImmutableMap.<String, Object>of());
+ context.resourceResolver().create(testRoot(), "node3",
ImmutableMap.<String, Object>of());
assertTrue(context.resourceResolver().hasChanges());
- assertNotNull(testRoot.getChild("node0"));
- assertNotNull(testRoot.getChild("node1"));
- assertNotNull(testRoot.getChild("node2"));
- assertNotNull(testRoot.getChild("node3"));
-
- context.resourceResolver().delete(testRoot.getChild("node0"));
- context.resourceResolver().delete(testRoot.getChild("node2"));
-
- assertNull(testRoot.getChild("node0"));
- assertNotNull(testRoot.getChild("node1"));
- assertNull(testRoot.getChild("node2"));
- assertNotNull(testRoot.getChild("node3"));
+ assertNotNull(testRoot().getChild("node0"));
+ assertNotNull(testRoot().getChild("node1"));
+ assertNotNull(testRoot().getChild("node2"));
+ assertNotNull(testRoot().getChild("node3"));
+
+ context.resourceResolver().delete(testRoot().getChild("node0"));
+ context.resourceResolver().delete(testRoot().getChild("node2"));
+
+ assertNull(testRoot().getChild("node0"));
+ assertNotNull(testRoot().getChild("node1"));
+ assertNull(testRoot().getChild("node2"));
+ assertNotNull(testRoot().getChild("node3"));
- Iterator<Resource> children = testRoot.listChildren();
+ Iterator<Resource> children = testRoot().listChildren();
assertEquals("node1", children.next().getName());
assertEquals("node3", children.next().getName());
assertFalse(children.hasNext());
@@ -119,11 +106,11 @@ public class NoSqlResourceProviderTransa
assertFalse(context.resourceResolver().hasChanges());
- assertNotNull(testRoot.getChild("node1"));
- assertNull(testRoot.getChild("node2"));
- assertNull(testRoot.getChild("node3"));
+ assertNotNull(testRoot().getChild("node1"));
+ assertNull(testRoot().getChild("node2"));
+ assertNull(testRoot().getChild("node3"));
- children = testRoot.listChildren();
+ children = testRoot().listChildren();
assertEquals("node0", children.next().getName());
assertEquals("node1", children.next().getName());
assertFalse(children.hasNext());
@@ -131,24 +118,24 @@ public class NoSqlResourceProviderTransa
@Test
public void testRecursiveDeleteWithoutCommit() throws PersistenceException
{
- Resource node1 = context.resourceResolver().create(testRoot, "node1",
ImmutableMap.<String, Object>of());
+ Resource node1 = context.resourceResolver().create(testRoot(),
"node1", ImmutableMap.<String, Object>of());
Resource node11 = context.resourceResolver().create(node1, "node11",
ImmutableMap.<String, Object>of());
context.resourceResolver().create(node11, "node111",
ImmutableMap.<String, Object>of());
- assertNotNull(testRoot.getChild("node1"));
- assertNotNull(testRoot.getChild("node1/node11"));
- assertNotNull(testRoot.getChild("node1/node11/node111"));
+ assertNotNull(testRoot().getChild("node1"));
+ assertNotNull(testRoot().getChild("node1/node11"));
+ assertNotNull(testRoot().getChild("node1/node11/node111"));
context.resourceResolver().delete(node1);
- assertNull(testRoot.getChild("node1"));
- assertNull(testRoot.getChild("node1/node11"));
- assertNull(testRoot.getChild("node1/node11/node111"));
+ assertNull(testRoot().getChild("node1"));
+ assertNull(testRoot().getChild("node1/node11"));
+ assertNull(testRoot().getChild("node1/node11/node111"));
}
@Test
public void testRecursiveDeleteWithCommit() throws PersistenceException {
- Resource node1 = context.resourceResolver().create(testRoot, "node1",
ImmutableMap.<String, Object>of());
+ Resource node1 = context.resourceResolver().create(testRoot(),
"node1", ImmutableMap.<String, Object>of());
Resource node11 = context.resourceResolver().create(node1, "node11",
ImmutableMap.<String, Object>of());
context.resourceResolver().create(node11, "node111",
ImmutableMap.<String, Object>of());
@@ -158,15 +145,15 @@ public class NoSqlResourceProviderTransa
assertFalse(context.resourceResolver().hasChanges());
- assertNotNull(testRoot.getChild("node1"));
- assertNotNull(testRoot.getChild("node1/node11"));
- assertNotNull(testRoot.getChild("node1/node11/node111"));
+ assertNotNull(testRoot().getChild("node1"));
+ assertNotNull(testRoot().getChild("node1/node11"));
+ assertNotNull(testRoot().getChild("node1/node11/node111"));
context.resourceResolver().delete(node1);
- assertNull(testRoot.getChild("node1"));
- assertNull(testRoot.getChild("node1/node11"));
- assertNull(testRoot.getChild("node1/node11/node111"));
+ assertNull(testRoot().getChild("node1"));
+ assertNull(testRoot().getChild("node1/node11"));
+ assertNull(testRoot().getChild("node1/node11/node111"));
assertTrue(context.resourceResolver().hasChanges());
@@ -174,55 +161,55 @@ public class NoSqlResourceProviderTransa
assertFalse(context.resourceResolver().hasChanges());
- assertNull(testRoot.getChild("node1"));
- assertNull(testRoot.getChild("node1/node11"));
- assertNull(testRoot.getChild("node1/node11/node111"));
+ assertNull(testRoot().getChild("node1"));
+ assertNull(testRoot().getChild("node1/node11"));
+ assertNull(testRoot().getChild("node1/node11/node111"));
}
@Test(expected = PersistenceException.class)
public void testCreateAlreadyExistWithoutCommit() throws
PersistenceException {
- context.resourceResolver().create(testRoot, "node1",
ImmutableMap.<String, Object>of());
- context.resourceResolver().create(testRoot, "node1",
ImmutableMap.<String, Object>of());
+ context.resourceResolver().create(testRoot(), "node1",
ImmutableMap.<String, Object>of());
+ context.resourceResolver().create(testRoot(), "node1",
ImmutableMap.<String, Object>of());
}
@Test(expected = PersistenceException.class)
public void testCreateAlreadyExistWithCommit() throws PersistenceException
{
- context.resourceResolver().create(testRoot, "node1",
ImmutableMap.<String, Object>of());
+ context.resourceResolver().create(testRoot(), "node1",
ImmutableMap.<String, Object>of());
context.resourceResolver().commit();
- context.resourceResolver().create(testRoot, "node1",
ImmutableMap.<String, Object>of());
+ context.resourceResolver().create(testRoot(), "node1",
ImmutableMap.<String, Object>of());
}
@Test
public void testCreateAlreadyExistDeletedWithoutCommit() throws
PersistenceException {
- context.resourceResolver().create(testRoot, "node1",
ImmutableMap.<String, Object>of());
- context.resourceResolver().delete(testRoot.getChild("node1"));
- context.resourceResolver().create(testRoot, "node1",
ImmutableMap.<String, Object>of());
+ context.resourceResolver().create(testRoot(), "node1",
ImmutableMap.<String, Object>of());
+ context.resourceResolver().delete(testRoot().getChild("node1"));
+ context.resourceResolver().create(testRoot(), "node1",
ImmutableMap.<String, Object>of());
}
@Test
public void testCreateAlreadyExistDeletedWithCommit() throws
PersistenceException {
- context.resourceResolver().create(testRoot, "node1",
ImmutableMap.<String, Object>of());
+ context.resourceResolver().create(testRoot(), "node1",
ImmutableMap.<String, Object>of());
context.resourceResolver().commit();
- context.resourceResolver().delete(testRoot.getChild("node1"));
+ context.resourceResolver().delete(testRoot().getChild("node1"));
context.resourceResolver().commit();
- context.resourceResolver().create(testRoot, "node1",
ImmutableMap.<String, Object>of());
+ context.resourceResolver().create(testRoot(), "node1",
ImmutableMap.<String, Object>of());
}
@Test
public void testUpdateWithoutCommit() throws PersistenceException {
- Resource node1 = context.resourceResolver().create(testRoot, "node1",
ImmutableMap.<String, Object>of("prop1", "value1"));
+ Resource node1 = context.resourceResolver().create(testRoot(),
"node1", ImmutableMap.<String, Object>of("prop1", "value1"));
assertEquals("value1", node1.getValueMap().get("prop1", String.class));
ModifiableValueMap props = node1.adaptTo(ModifiableValueMap.class);
props.put("prop1", "value2");
- node1 = testRoot.getChild("node1");
+ node1 = testRoot().getChild("node1");
assertEquals("value2", node1.getValueMap().get("prop1", String.class));
}
@Test
public void testUpdateWithCommit() throws PersistenceException {
- Resource node1 = context.resourceResolver().create(testRoot, "node1",
ImmutableMap.<String, Object>of("prop1", "value1"));
+ Resource node1 = context.resourceResolver().create(testRoot(),
"node1", ImmutableMap.<String, Object>of("prop1", "value1"));
assertEquals("value1", node1.getValueMap().get("prop1", String.class));
context.resourceResolver().commit();
@@ -230,7 +217,7 @@ public class NoSqlResourceProviderTransa
props.put("prop1", "value2");
context.resourceResolver().commit();
- node1 = testRoot.getChild("node1");
+ node1 = testRoot().getChild("node1");
assertEquals("value2", node1.getValueMap().get("prop1", String.class));
}
Added:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderQueryTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderQueryTest.java?rev=1680397&view=auto
==============================================================================
---
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderQueryTest.java
(added)
+++
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderQueryTest.java
Tue May 19 21:31:21 2015
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.nosql.generic.simple;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.jackrabbit.JcrConstants;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceProvider;
+import
org.apache.sling.nosql.generic.simple.provider.SimpleNoSqlResourceProviderFactory;
+import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.junit.SlingContext;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.google.common.collect.ImmutableMap;
+
+/**
+ * Test basic ResourceResolver and ValueMap with different data types.
+ */
+public class SimpleNoSqlResourceProviderQueryTest {
+
+ @Rule
+ public SlingContext context = new
SlingContext(ResourceResolverType.JCR_MOCK);
+
+ private Resource testRoot;
+
+ @Before
+ public void setUp() throws Exception {
+ context.registerInjectActivateService(new
SimpleNoSqlResourceProviderFactory(), ImmutableMap.<String, Object>builder()
+ .put(ResourceProvider.ROOTS, "/nosql-simple")
+ .build());
+
+ // prepare some test data using Sling CRUD API
+ Map<String, Object> props = new HashMap<String, Object>();
+ props.put(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED);
+ final Resource root = context.resourceResolver().getResource("/");
+ Resource noSqlRoot = context.resourceResolver().create(root,
"nosql-simple", props);
+ this.testRoot = context.resourceResolver().create(noSqlRoot, "test",
props);
+
+ context.resourceResolver().create(testRoot, "node1",
ImmutableMap.<String, Object>of("prop1", "value1"));
+ context.resourceResolver().create(testRoot, "node2",
ImmutableMap.<String, Object>of("prop1", "value2"));
+
+ context.resourceResolver().commit();
+ }
+
+ @Test
+ public void testFindResources_ValidQuery() {
+ Iterator<Resource> result =
context.resourceResolver().findResources("all", "simple");
+ assertEquals("/nosql-simple", result.next().getPath());
+ assertEquals("/nosql-simple/test", result.next().getPath());
+ assertEquals("/nosql-simple/test/node1", result.next().getPath());
+ assertEquals("/nosql-simple/test/node2", result.next().getPath());
+ assertFalse(result.hasNext());
+ }
+
+ @Test
+ public void testFindResources_InvalidQuery() {
+ Iterator<Resource> result =
context.resourceResolver().findResources("all", "invalid");
+ assertFalse(result.hasNext());
+ }
+
+ @Test
+ public void testQueryResources_ValidQuery() {
+ Iterator<Map<String, Object>> result =
context.resourceResolver().queryResources("all", "simple");
+ assertNull(result.next().get("prop1"));
+ assertNull(result.next().get("prop1"));
+ assertEquals("value1", result.next().get("prop1"));
+ assertEquals("value2", result.next().get("prop1"));
+ assertFalse(result.hasNext());
+ }
+
+ @Test
+ public void testQueryResources_InvalidQuery() {
+ Iterator<Map<String, Object>> result =
context.resourceResolver().queryResources("all", "invalid");
+ assertFalse(result.hasNext());
+ }
+
+}
Propchange:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderQueryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderQueryTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue May 19 21:31:21 2015
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderQueryTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTest.java?rev=1680397&view=auto
==============================================================================
---
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTest.java
(added)
+++
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTest.java
Tue May 19 21:31:21 2015
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.nosql.generic.simple;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.jackrabbit.JcrConstants;
+import org.apache.sling.api.resource.PersistenceException;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceProvider;
+import
org.apache.sling.nosql.generic.resource.impl.AbstractNoSqlResourceProviderTest;
+import
org.apache.sling.nosql.generic.simple.provider.SimpleNoSqlResourceProviderFactory;
+
+import com.google.common.collect.ImmutableMap;
+
+/**
+ * Test basic ResourceResolver and ValueMap with different data types.
+ */
+public class SimpleNoSqlResourceProviderTest extends
AbstractNoSqlResourceProviderTest {
+
+ private Resource testRoot;
+
+ @Override
+ protected void registerResourceProviderFactory() {
+ context.registerInjectActivateService(new
SimpleNoSqlResourceProviderFactory(), ImmutableMap.<String, Object>builder()
+ .put(ResourceProvider.ROOTS, "/nosql-simple")
+ .build());
+ }
+
+ @Override
+ protected Resource testRoot() {
+ if (this.testRoot == null) {
+ try {
+ Map<String, Object> props = new HashMap<String, Object>();
+ props.put(JcrConstants.JCR_PRIMARYTYPE,
JcrConstants.NT_UNSTRUCTURED);
+ final Resource root =
context.resourceResolver().getResource("/");
+ Resource noSqlRoot = context.resourceResolver().create(root,
"nosql-simple", props);
+ this.testRoot = context.resourceResolver().create(noSqlRoot,
"test", props);
+ }
+ catch (PersistenceException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+ return this.testRoot;
+ }
+
+}
Propchange:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue May 19 21:31:21 2015
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTransactionalTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTransactionalTest.java?rev=1680397&view=auto
==============================================================================
---
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTransactionalTest.java
(added)
+++
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTransactionalTest.java
Tue May 19 21:31:21 2015
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.nosql.generic.simple;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.jackrabbit.JcrConstants;
+import org.apache.sling.api.resource.PersistenceException;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceProvider;
+import
org.apache.sling.nosql.generic.resource.impl.AbstractNoSqlResourceProviderTransactionalTest;
+import
org.apache.sling.nosql.generic.simple.provider.SimpleNoSqlResourceProviderFactory;
+
+import com.google.common.collect.ImmutableMap;
+
+/**
+ * Test basic ResourceResolver and ValueMap with different data types.
+ */
+public class SimpleNoSqlResourceProviderTransactionalTest extends
AbstractNoSqlResourceProviderTransactionalTest {
+
+ private Resource testRoot;
+
+ @Override
+ protected void registerResourceProviderFactory() {
+ context.registerInjectActivateService(new
SimpleNoSqlResourceProviderFactory(), ImmutableMap.<String, Object>builder()
+ .put(ResourceProvider.ROOTS, "/nosql-simple")
+ .build());
+ }
+
+ @Override
+ protected Resource testRoot() {
+ if (this.testRoot == null) {
+ try {
+ Map<String, Object> props = new HashMap<String, Object>();
+ props.put(JcrConstants.JCR_PRIMARYTYPE,
JcrConstants.NT_UNSTRUCTURED);
+ final Resource root =
context.resourceResolver().getResource("/");
+ Resource noSqlRoot = context.resourceResolver().create(root,
"nosql-simple", props);
+ this.testRoot = context.resourceResolver().create(noSqlRoot,
"test", props);
+ context.resourceResolver().commit();
+ }
+ catch (PersistenceException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+ return this.testRoot;
+ }
+
+}
Propchange:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTransactionalTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTransactionalTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue May 19 21:31:21 2015
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderTransactionalTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/provider/SimpleNoSqlAdapter.java
(from r1680116,
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlAdapter.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/provider/SimpleNoSqlAdapter.java?p2=sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/provider/SimpleNoSqlAdapter.java&p1=sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlAdapter.java&r1=1680116&r2=1680397&rev=1680397&view=diff
==============================================================================
---
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlAdapter.java
(original)
+++
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/provider/SimpleNoSqlAdapter.java
Tue May 19 21:31:21 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.nosql.generic.simple;
+package org.apache.sling.nosql.generic.simple.provider;
import java.util.Collections;
import java.util.HashMap;
Copied:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/provider/SimpleNoSqlResourceProviderFactory.java
(from r1680116,
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderFactory.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/provider/SimpleNoSqlResourceProviderFactory.java?p2=sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/provider/SimpleNoSqlResourceProviderFactory.java&p1=sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderFactory.java&r1=1680116&r2=1680397&rev=1680397&view=diff
==============================================================================
---
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/SimpleNoSqlResourceProviderFactory.java
(original)
+++
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/java/org/apache/sling/nosql/generic/simple/provider/SimpleNoSqlResourceProviderFactory.java
Tue May 19 21:31:21 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.nosql.generic.simple;
+package org.apache.sling.nosql.generic.simple.provider;
import java.util.Map;
Copied:
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/resources/OSGI-INF/org.apache.sling.nosql.generic.simple.provider.SimpleNoSqlResourceProviderFactory.xml
(from r1680116,
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/resources/OSGI-INF/org.apache.sling.nosql.generic.simple.SimpleNoSqlResourceProviderFactory.xml)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/resources/OSGI-INF/org.apache.sling.nosql.generic.simple.provider.SimpleNoSqlResourceProviderFactory.xml?p2=sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/resources/OSGI-INF/org.apache.sling.nosql.generic.simple.provider.SimpleNoSqlResourceProviderFactory.xml&p1=sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/resources/OSGI-INF/org.apache.sling.nosql.generic.simple.SimpleNoSqlResourceProviderFactory.xml&r1=1680116&r2=1680397&rev=1680397&view=diff
==============================================================================
---
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/resources/OSGI-INF/org.apache.sling.nosql.generic.simple.SimpleNoSqlResourceProviderFactory.xml
(original)
+++
sling/whiteboard/sseifert/SLING-4381_nosql/nosql-generic/src/test/resources/OSGI-INF/org.apache.sling.nosql.generic.simple.provider.SimpleNoSqlResourceProviderFactory.xml
Tue May 19 21:31:21 2015
@@ -19,14 +19,14 @@
-->
<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0";>
<scr:component
name="org.apache.sling.nosql.generic.simple.SimpleNoSqlResourceProviderFactory"
configuration-policy="require" activate="activate">
- <implementation
class="org.apache.sling.nosql.generic.simple.SimpleNoSqlResourceProviderFactory"/>
+ <implementation
class="org.apache.sling.nosql.generic.simple.provider.SimpleNoSqlResourceProviderFactory"/>
<service servicefactory="false">
<provide
interface="org.apache.sling.api.resource.ResourceProviderFactory"/>
</service>
<property name="provider.roots" value=""/>
<property name="provider.query.languages" value="simple"/>
<property name="service.vendor" value="The Apache Software
Foundation"/>
- <property name="service.pid"
value="org.apache.sling.nosql.generic.simple.SimpleNoSqlResourceProviderFactory"/>
+ <property name="service.pid"
value="org.apache.sling.nosql.generic.simple.provider.SimpleNoSqlResourceProviderFactory"/>
<reference name="eventAdmin"
interface="org.osgi.service.event.EventAdmin" cardinality="1..1"
policy="static" bind="bindEventAdmin" unbind="unbindEventAdmin"/>
</scr:component>
</components>
