This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.3.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git
commit 505dd43de494aca122cb8c8df47294702084d26e
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Tue Feb 9 17:34:52 2016 +0000
SLING-5501 : Adjust resource merger for latest API changes. Apply patch
from Joel Richard
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1729420
13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
.../resourcemerger/impl/CRUDMergingResourceProvider.java | 12 ++++++------
.../resourcemerger/impl/MergedResourcePickerWhiteboard.java | 3 +++
.../sling/resourcemerger/impl/MergingResourceProvider.java | 8 ++++----
.../sling/resourcemerger/impl/BasicResolveContext.java | 6 +++---
.../resourcemerger/impl/MergedResourceProviderTest.java | 4 ++--
6 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index bca9385..23a6458 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.9.1-SNAPSHOT</version>
+ <version>2.11.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -107,7 +107,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.resourceresolver</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.4.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java
b/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java
index 723e354..f36a433 100644
---
a/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java
+++
b/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java
@@ -30,7 +30,7 @@ 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.resourcemerger.spi.MergedResourcePicker;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
/**
@@ -91,7 +91,7 @@ public class CRUDMergingResourceProvider
}
@Override
- public Resource create(final ResolverContext<Void> ctx, final String path,
final Map<String, Object> properties) throws PersistenceException {
+ public Resource create(final ResolveContext<Void> ctx, final String path,
final Map<String, Object> properties) throws PersistenceException {
final ResourceResolver resolver = ctx.getResourceResolver();
// check if the resource exists
@@ -128,7 +128,7 @@ public class CRUDMergingResourceProvider
}
@Override
- public void delete(final ResolverContext<Void> ctx, final Resource
resource) throws PersistenceException {
+ public void delete(final ResolveContext<Void> ctx, final Resource
resource) throws PersistenceException {
final ResourceResolver resolver = ctx.getResourceResolver();
final String path = resource.getPath();
@@ -158,17 +158,17 @@ public class CRUDMergingResourceProvider
}
@Override
- public void revert(final ResolverContext<Void> ctx) {
+ public void revert(final ResolveContext<Void> ctx) {
// the provider for the merged resources will revert
}
@Override
- public void commit(final ResolverContext<Void> ctx) throws
PersistenceException {
+ public void commit(final ResolveContext<Void> ctx) throws
PersistenceException {
// the provider for the merged resources will commit
}
@Override
- public boolean hasChanges(final ResolverContext<Void> ctx) {
+ public boolean hasChanges(final ResolveContext<Void> ctx) {
// the provider for the merged resources will return changes
return false;
}
diff --git
a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
index cb65afe..301051e 100644
---
a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
+++
b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
@@ -57,6 +57,7 @@ public class MergedResourcePickerWhiteboard implements
ServiceTrackerCustomizer
tracker.close();
}
+ @Override
public Object addingService(final ServiceReference reference) {
final MergedResourcePicker picker = (MergedResourcePicker)
bundleContext.getService(reference);
if ( picker != null ) {
@@ -85,11 +86,13 @@ public class MergedResourcePickerWhiteboard implements
ServiceTrackerCustomizer
return null;
}
+ @Override
public void modifiedService(final ServiceReference reference, final Object
service) {
removedService(reference, service);
addingService(reference);
}
+ @Override
public void removedService(final ServiceReference reference, final Object
service) {
final Long key = (Long) reference.getProperty(Constants.SERVICE_ID);
final ServiceRegistration reg = serviceRegistrations.get(key);
diff --git
a/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
b/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
index 95aa4a9..c691c05 100644
---
a/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
+++
b/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
@@ -27,7 +27,7 @@ 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.resourcemerger.spi.MergedResourcePicker;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
@@ -203,7 +203,7 @@ public class MergingResourceProvider extends
ResourceProvider<Void> {
}
@Override
- public Resource getParent(ResolverContext<Void> ctx, Resource child) {
+ public Resource getParent(ResolveContext<Void> ctx, Resource child) {
final String parentPath = ResourceUtil.getParent(child.getPath());
if (parentPath == null) {
return null;
@@ -215,7 +215,7 @@ public class MergingResourceProvider extends
ResourceProvider<Void> {
* {@inheritDoc}
*/
@Override
- public Resource getResource(final ResolverContext<Void> ctx, final String
path, final ResourceContext rCtx, final Resource parent) {
+ public Resource getResource(final ResolveContext<Void> ctx, final String
path, final ResourceContext rCtx, final Resource parent) {
final String relativePath = getRelativePath(path);
if (relativePath != null) {
@@ -261,7 +261,7 @@ public class MergingResourceProvider extends
ResourceProvider<Void> {
* {@inheritDoc}
*/
@Override
- public Iterator<Resource> listChildren(final ResolverContext<Void> ctx,
final Resource parent) {
+ public Iterator<Resource> listChildren(final ResolveContext<Void> ctx,
final Resource parent) {
final ResourceResolver resolver = parent.getResourceResolver();
final String relativePath = getRelativePath(parent.getPath());
diff --git
a/src/test/java/org/apache/sling/resourcemerger/impl/BasicResolveContext.java
b/src/test/java/org/apache/sling/resourcemerger/impl/BasicResolveContext.java
index 59660b6..3472480 100644
---
a/src/test/java/org/apache/sling/resourcemerger/impl/BasicResolveContext.java
+++
b/src/test/java/org/apache/sling/resourcemerger/impl/BasicResolveContext.java
@@ -19,10 +19,10 @@
package org.apache.sling.resourcemerger.impl;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
-public class BasicResolveContext<T> implements ResolverContext<T> {
+public class BasicResolveContext<T> implements ResolveContext<T> {
private final ResourceResolver resourceResolver;
@@ -41,7 +41,7 @@ public class BasicResolveContext<T> implements
ResolverContext<T> {
}
@Override
- public ResolverContext<?> getParentResolveContext() {
+ public ResolveContext<?> getParentResolveContext() {
return null;
}
diff --git
a/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
b/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
index 6d4326d..e22fd1f 100644
---
a/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
+++
b/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
@@ -36,7 +36,7 @@ import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.resourcemerger.impl.picker.MergingResourcePicker;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.testing.resourceresolver.MockHelper;
import org.apache.sling.testing.resourceresolver.MockResourceResolverFactory;
@@ -49,7 +49,7 @@ public class MergedResourceProviderTest {
private ResourceResolver resolver;
private CRUDMergingResourceProvider provider;
- private ResolverContext<Void> ctx;
+ private ResolveContext<Void> ctx;
@Before public void setup() throws Exception {
final MockResourceResolverFactoryOptions options = new
MockResourceResolverFactoryOptions();
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
