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 2017/11/07 10:00:28 UTC
[sling-org-apache-sling-resourcemerger] 07/15: SLING-5204 :
Implement provider lifecycle methods
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 09731a51fe29ea60c1b9ee111e7bf9ff28fb3568
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 28 17:13:19 2015 +0000
SLING-5204 : Implement provider lifecycle methods
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1711069 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/resourcemerger/impl/MergedResourceProviderTest.java | 2 +-
.../sling/resourcemerger/impl/OverridingResourceProviderTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 3bfae82..9340bb6 100644
--- a/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
+++ b/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
@@ -88,7 +88,7 @@ public class MergedResourceProviderTest {
.commit();
this.provider = new CRUDMergingResourceProvider("/merged", new MergingResourcePicker(), false);
- this.ctx = new BasicResolveContext(resolver, null);
+ this.ctx = new BasicResolveContext(resolver, null, "/");
}
@Test public void testHideChildren() {
diff --git a/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java b/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java
index aa5466b..2686dcc 100644
--- a/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java
+++ b/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java
@@ -101,7 +101,7 @@ public class OverridingResourceProviderTest {
.commit();
this.provider = new MergingResourceProvider("/override", new OverridingResourcePicker(), false, true);
- this.ctx = new BasicResolveContext(resolver, null);
+ this.ctx = new BasicResolveContext(resolver, null, "/");
}
@Test
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.