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 2019/02/22 16:42:25 UTC
[sling-org-apache-sling-resourcecollection] branch master updated:
SLING-8284 - updating parent pom & eliminating dependency on
JcrResourceConstants
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcecollection.git
The following commit(s) were added to refs/heads/master by this push:
new f064097 SLING-8284 - updating parent pom & eliminating dependency on JcrResourceConstants
f064097 is described below
commit f064097bb8cf2d7741c41bac53d16178ea2ad3b9
Author: Dominik Suess <su...@adobe.com>
AuthorDate: Tue Feb 19 22:36:08 2019 +0100
SLING-8284 - updating parent pom & eliminating dependency on JcrResourceConstants
Closes #1
---
pom.xml | 30 ++++++++++++++++-----
.../collection/impl/ResourceCollectionImpl.java | 5 ++--
.../impl/ResourceCollectionManagerImpl.java | 10 +++----
.../impl/ResourceCollectionImplTest.java | 31 +++++++++++-----------
4 files changed, 47 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index a049bd9..7ed61c4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>31</version>
+ <version>34</version>
<relativePath/>
</parent>
@@ -61,6 +61,17 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>scr-metadata</id>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <exportScr>true</exportScr>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -89,12 +100,7 @@
<version>2.1.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>2.2.6</version>
- <scope>provided</scope>
- </dependency>
+ <!-- OSGI -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -108,6 +114,16 @@
<artifactId>osgi.core</artifactId>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
diff --git a/src/main/java/org/apache/sling/resource/collection/impl/ResourceCollectionImpl.java b/src/main/java/org/apache/sling/resource/collection/impl/ResourceCollectionImpl.java
index b1699c0..12cb05a 100755
--- a/src/main/java/org/apache/sling/resource/collection/impl/ResourceCollectionImpl.java
+++ b/src/main/java/org/apache/sling/resource/collection/impl/ResourceCollectionImpl.java
@@ -27,13 +27,14 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.ArrayUtils;
+import org.apache.sling.api.SlingConstants;
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.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.jcr.resource.JcrResourceConstants;
+
import org.apache.sling.resource.collection.ResourceCollection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,7 +51,7 @@ public class ResourceCollectionImpl implements
/**
* Defines the resource type property
*/
- private static final String RESOURCE_TYPE = JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY;
+ private static final String RESOURCE_TYPE = SlingConstants.NAMESPACE_PREFIX + ":" + SlingConstants.PROPERTY_RESOURCE_TYPE;
/**
* underlying resource
diff --git a/src/main/java/org/apache/sling/resource/collection/impl/ResourceCollectionManagerImpl.java b/src/main/java/org/apache/sling/resource/collection/impl/ResourceCollectionManagerImpl.java
index 293a42d..d86217c 100755
--- a/src/main/java/org/apache/sling/resource/collection/impl/ResourceCollectionManagerImpl.java
+++ b/src/main/java/org/apache/sling/resource/collection/impl/ResourceCollectionManagerImpl.java
@@ -22,10 +22,10 @@ package org.apache.sling.resource.collection.impl;
import java.util.HashMap;
import java.util.Map;
+import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.jcr.resource.JcrResourceConstants;
import org.apache.sling.resource.collection.ResourceCollection;
import org.apache.sling.resource.collection.ResourceCollectionManager;
import org.osgi.framework.Constants;
@@ -93,14 +93,14 @@ public class ResourceCollectionManagerImpl implements ResourceCollectionManager
properties = new HashMap<>();
}
- if (properties.get(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY) != null
- && !ResourceCollection.RESOURCE_TYPE.equals(properties.get(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY))) {
+ if (properties.get(SlingConstants.NAMESPACE_PREFIX + ":" + SlingConstants.PROPERTY_RESOURCE_TYPE) != null
+ && !ResourceCollection.RESOURCE_TYPE.equals(properties.get(SlingConstants.NAMESPACE_PREFIX + ":" + SlingConstants.PROPERTY_RESOURCE_TYPE))) {
properties.put(
- JcrResourceConstants.SLING_RESOURCE_SUPER_TYPE_PROPERTY,
+ SlingConstants.NAMESPACE_PREFIX + ":" + SlingConstants.PROPERTY_RESOURCE_SUPER_TYPE,
ResourceCollection.RESOURCE_TYPE);
} else {
properties.put(
- JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY,
+ SlingConstants.NAMESPACE_PREFIX + ":" + SlingConstants.PROPERTY_RESOURCE_TYPE,
ResourceCollection.RESOURCE_TYPE);
}
Resource collectionRes = parentResource.getResourceResolver().create(parentResource, name, properties);
diff --git a/src/test/java/org/apache/sling/resource/collection/impl/ResourceCollectionImplTest.java b/src/test/java/org/apache/sling/resource/collection/impl/ResourceCollectionImplTest.java
index 341d011..eb9624d 100755
--- a/src/test/java/org/apache/sling/resource/collection/impl/ResourceCollectionImplTest.java
+++ b/src/test/java/org/apache/sling/resource/collection/impl/ResourceCollectionImplTest.java
@@ -25,10 +25,10 @@ import java.util.Map;
import junit.framework.Assert;
+import org.apache.sling.api.SlingConstants;
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.jcr.resource.JcrResourceConstants;
import org.apache.sling.resource.collection.ResourceCollection;
import org.apache.sling.resource.collection.ResourceCollectionManager;
import org.apache.sling.testing.resourceresolver.MockResourceResolverFactory;
@@ -37,6 +37,7 @@ import org.junit.Test;
public class ResourceCollectionImplTest {
private ResourceResolver resResolver;
+ private static final String PROPERTY_RESOURCE_TYPE = SlingConstants.NAMESPACE_PREFIX + ":" + SlingConstants.PROPERTY_RESOURCE_TYPE;
private ResourceCollectionManager rcm;
@Before
@@ -50,10 +51,10 @@ public class ResourceCollectionImplTest {
final ResourceCollection collection = rcm.createCollection(resResolver.getResource("/"), "test1");
final Resource res1 = resResolver.create(resResolver.getResource("/"), "res1",
- Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)"type"));
+ Collections.singletonMap(PROPERTY_RESOURCE_TYPE, (Object)"type"));
collection.add(res1);
final Resource resource = resResolver.create(resResolver.getResource("/"), "res2",
- Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)"type"));
+ Collections.singletonMap(PROPERTY_RESOURCE_TYPE, (Object)"type"));
collection.add(resource);
Assert.assertEquals(true, collection.contains(resource));
@@ -66,10 +67,10 @@ public class ResourceCollectionImplTest {
public void testCreateCollection() throws Exception {
final ResourceCollection collection = rcm.createCollection(resResolver.getResource("/"), "test1");
final Resource res1 = resResolver.create(resResolver.getResource("/"), "res1",
- Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)"type"));
+ Collections.singletonMap(PROPERTY_RESOURCE_TYPE, (Object)"type"));
collection.add(res1, null);
final Resource resource = resResolver.create(resResolver.getResource("/"), "res2",
- Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)"type"));
+ Collections.singletonMap(PROPERTY_RESOURCE_TYPE, (Object)"type"));
collection.add(resource, null);
Assert.assertEquals(true, collection.contains(resource));
@@ -80,7 +81,7 @@ public class ResourceCollectionImplTest {
@Test
public void testCheckPath() throws Exception {
final Resource rootResource = resResolver.create(resResolver.getResource("/"), "root",
- Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)"type"));
+ Collections.singletonMap(PROPERTY_RESOURCE_TYPE, (Object)"type"));
final ResourceCollection collection = rcm.createCollection(rootResource, "test1");
@@ -92,10 +93,10 @@ public class ResourceCollectionImplTest {
public void testGetCollection() throws Exception {
ResourceCollection collection = rcm.createCollection(resResolver.getResource("/"), "test1");
final Resource res1 = resResolver.create(resResolver.getResource("/"), "res1",
- Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)"type"));
+ Collections.singletonMap(PROPERTY_RESOURCE_TYPE, (Object)"type"));
collection.add(res1, null);
final Resource resource = resResolver.create(resResolver.getResource("/"), "res2",
- Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)"type"));
+ Collections.singletonMap(PROPERTY_RESOURCE_TYPE, (Object)"type"));
collection.add(resource, null);
collection = rcm.getCollection(resResolver.getResource(collection.getPath()));
@@ -109,10 +110,10 @@ public class ResourceCollectionImplTest {
public void testListCollection() throws Exception {
final ResourceCollection collection = rcm.createCollection(resResolver.getResource("/"), "collection1");
final Resource res1 = resResolver.create(resResolver.getResource("/"), "res1",
- Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)"type"));
+ Collections.singletonMap(PROPERTY_RESOURCE_TYPE, (Object)"type"));
collection.add(res1, null);
final Resource resource = resResolver.create(resResolver.getResource("/"), "res2",
- Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)"type"));
+ Collections.singletonMap(PROPERTY_RESOURCE_TYPE, (Object)"type"));
collection.add(resource, null);
Assert.assertEquals(true, collection.contains(resource));
@@ -130,12 +131,12 @@ public class ResourceCollectionImplTest {
@Test
public void testCreateCollectionWithProperties() throws Exception {
final Map<String, Object> props = new HashMap<String, Object>();
- props.put(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY, "some/type");
+ props.put(PROPERTY_RESOURCE_TYPE, "some/type");
props.put("creator", "slingdev");
final ResourceCollection collection = rcm.createCollection(resResolver.getResource("/"), "collection3", props);
final Resource resource = resResolver.create(resResolver.getResource("/"), "res1",
- Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)"type"));
+ Collections.singletonMap(PROPERTY_RESOURCE_TYPE, (Object)"type"));
collection.add(resource, null);
final Resource collectionRes = resResolver.getResource("/collection3");
@@ -157,7 +158,7 @@ public class ResourceCollectionImplTest {
final ResourceCollection collection = rcm.createCollection(resResolver.getResource("/"), "collection3");
final Resource resource = resResolver.create(resResolver.getResource("/"), "res1",
- Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)"type"));
+ Collections.singletonMap(PROPERTY_RESOURCE_TYPE, (Object)"type"));
collection.add(resource, props);
final Resource collectionRes = resResolver.getResource("/collection3");
@@ -179,11 +180,11 @@ public class ResourceCollectionImplTest {
final ResourceCollection collection = rcm.createCollection(resResolver.getResource("/"), "test1");
String[] resPaths = {"/res1", "/res2"};
final Resource resource = resResolver.create(resResolver.getResource("/"), resPaths[0].substring(1),
- Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)"type"));
+ Collections.singletonMap(PROPERTY_RESOURCE_TYPE, (Object)"type"));
collection.add(resource, null);
final Resource resource2 = resResolver.create(resResolver.getResource("/"), resPaths[1].substring(1),
- Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)"type"));
+ Collections.singletonMap(PROPERTY_RESOURCE_TYPE, (Object)"type"));
collection.add(resource2, null);
Assert.assertEquals(true, collection.contains(resource2));