Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D94DE17D09 for ; Thu, 5 Feb 2015 14:35:19 +0000 (UTC) Received: (qmail 67783 invoked by uid 500); 5 Feb 2015 14:35:19 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 67728 invoked by uid 500); 5 Feb 2015 14:35:19 -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 67718 invoked by uid 99); 5 Feb 2015 14:35:19 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Feb 2015 14:35:19 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 884CBAC0044; Thu, 5 Feb 2015 14:35:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1657585 - /sling/whiteboard/bdelacretaz/multisling2015/cdtenants/src/main/java/org/apache/sling/ms2015/cdtenants/impl/ContentDrivenTenantImpl.java Date: Thu, 05 Feb 2015 14:35:19 -0000 To: commits@sling.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150205143519.884CBAC0044@hades.apache.org> Author: bdelacretaz Date: Thu Feb 5 14:35:18 2015 New Revision: 1657585 URL: http://svn.apache.org/r1657585 Log: SLING-4386 - put tenant search path in front Modified: sling/whiteboard/bdelacretaz/multisling2015/cdtenants/src/main/java/org/apache/sling/ms2015/cdtenants/impl/ContentDrivenTenantImpl.java Modified: sling/whiteboard/bdelacretaz/multisling2015/cdtenants/src/main/java/org/apache/sling/ms2015/cdtenants/impl/ContentDrivenTenantImpl.java URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/multisling2015/cdtenants/src/main/java/org/apache/sling/ms2015/cdtenants/impl/ContentDrivenTenantImpl.java?rev=1657585&r1=1657584&r2=1657585&view=diff ============================================================================== --- sling/whiteboard/bdelacretaz/multisling2015/cdtenants/src/main/java/org/apache/sling/ms2015/cdtenants/impl/ContentDrivenTenantImpl.java (original) +++ sling/whiteboard/bdelacretaz/multisling2015/cdtenants/src/main/java/org/apache/sling/ms2015/cdtenants/impl/ContentDrivenTenantImpl.java Thu Feb 5 14:35:18 2015 @@ -18,9 +18,9 @@ */ package org.apache.sling.ms2015.cdtenants.impl; +import java.util.ArrayList; import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; +import java.util.List; import org.apache.sling.api.SlingException; import org.apache.sling.api.resource.Resource; @@ -83,8 +83,14 @@ public class ContentDrivenTenantImpl imp } // Compute search + exec path based on the tenant's list of modules - final Set sp = new HashSet(); - final Set ep = new HashSet(); + final List sp = new ArrayList(); + final List ep = new ArrayList(); + + // Add this tenant's custom scripts location to the search + exec path, + // before other paths so scripts found there override modules scripts + final String tenantSearchPath = tenantPath + SCRIPTS_PATH_SUFFIX; + sp.add(tenantSearchPath); + ep.add(tenantSearchPath); for(String m : modules) { final String modulePath = MODULES_ROOT_PATH + "/" + m; @@ -110,10 +116,8 @@ public class ContentDrivenTenantImpl imp } } - // Add this tenant's custom scripts location to the search + exec path - final String tenantSearchPath = tenantPath + SCRIPTS_PATH_SUFFIX; - sp.add(tenantSearchPath); - ep.add(tenantSearchPath); + // TODO sp and ep might have duplicates at this point, we should remove + // them for efficiency this.searchPath = normalizePath(sp.toArray(EMPTY_STRING_ARRAY)); this.executionPath = normalizePath(ep.toArray(EMPTY_STRING_ARRAY));