Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B1540200D35 for ; Tue, 7 Nov 2017 10:58:53 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id AFFB1160C06; Tue, 7 Nov 2017 09:58:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id ED400160C09 for ; Tue, 7 Nov 2017 10:58:51 +0100 (CET) Received: (qmail 70774 invoked by uid 500); 7 Nov 2017 09:58:51 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 70759 invoked by uid 99); 7 Nov 2017 09:58:51 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Nov 2017 09:58:51 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 3927987B08; Tue, 7 Nov 2017 09:58:50 +0000 (UTC) Date: Tue, 07 Nov 2017 10:00:28 +0000 To: "commits@sling.apache.org" Subject: [sling-org-apache-sling-resourcemerger] 07/15: SLING-5204 : Implement provider lifecycle methods MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: rombert@apache.org In-Reply-To: <151004872068.21803.15024167529339291075@gitbox.apache.org> References: <151004872068.21803.15024167529339291075@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: sling-org-apache-sling-resourcemerger X-Git-Refname: refs/tags/org.apache.sling.resourcemerger-1.3.0 X-Git-Reftype: annotated tag X-Git-Rev: 09731a51fe29ea60c1b9ee111e7bf9ff28fb3568 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20171107095850.3927987B08@gitbox.apache.org> archived-at: Tue, 07 Nov 2017 09:58:53 -0000 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 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" .