Author: cziegeler
Date: Tue Feb 9 17:34:52 2016
New Revision: 1729420
URL: http://svn.apache.org/viewvc?rev=1729420&view=rev
Log:
SLING-5501 : Adjust resource merger for latest API changes. Apply patch from
Joel Richard
Modified:
sling/trunk/contrib/extensions/resourcemerger/pom.xml
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/BasicResolveContext.java
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
Modified: sling/trunk/contrib/extensions/resourcemerger/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/pom.xml?rev=1729420&r1=1729419&r2=1729420&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/pom.xml (original)
+++ sling/trunk/contrib/extensions/resourcemerger/pom.xml Tue Feb 9 17:34:52
2016
@@ -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>
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java?rev=1729420&r1=1729419&r2=1729420&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java
(original)
+++
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java
Tue Feb 9 17:34:52 2016
@@ -30,7 +30,7 @@ import org.apache.sling.api.resource.Res
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;
}
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java?rev=1729420&r1=1729419&r2=1729420&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
(original)
+++
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
Tue Feb 9 17:34:52 2016
@@ -57,6 +57,7 @@ public class MergedResourcePickerWhitebo
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 MergedResourcePickerWhitebo
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);
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java?rev=1729420&r1=1729419&r2=1729420&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
(original)
+++
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
Tue Feb 9 17:34:52 2016
@@ -27,7 +27,7 @@ import org.apache.sling.api.resource.Res
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 ext
}
@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 ext
* {@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 ext
* {@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());
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/BasicResolveContext.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/BasicResolveContext.java?rev=1729420&r1=1729419&r2=1729420&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/BasicResolveContext.java
(original)
+++
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/BasicResolveContext.java
Tue Feb 9 17:34:52 2016
@@ -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> impl
}
@Override
- public ResolverContext<?> getParentResolveContext() {
+ public ResolveContext<?> getParentResolveContext() {
return null;
}
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java?rev=1729420&r1=1729419&r2=1729420&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
(original)
+++
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
Tue Feb 9 17:34:52 2016
@@ -36,7 +36,7 @@ import org.apache.sling.api.resource.Res
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();
