From commits-return-89155-archive-asf-public=cust-asf.ponee.io@sling.apache.org Tue Sep 1 16:32:56 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-ec2-va.apache.org (mxout1-ec2-va.apache.org [3.227.148.255]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 1135318079A for ; Tue, 1 Sep 2020 18:32:56 +0200 (CEST) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-ec2-va.apache.org (ASF Mail Server at mxout1-ec2-va.apache.org) with SMTP id 490EF4541D for ; Tue, 1 Sep 2020 16:32:55 +0000 (UTC) Received: (qmail 92695 invoked by uid 500); 1 Sep 2020 16:32:53 -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 92255 invoked by uid 99); 1 Sep 2020 16:32:52 -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, 01 Sep 2020 16:32:52 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id D9DBC8F151; Tue, 1 Sep 2020 16:32:51 +0000 (UTC) Date: Tue, 01 Sep 2020 16:33:06 +0000 To: "commits@sling.apache.org" Subject: [sling-org-apache-sling-installer-factory-feature] 15/32: Correctly configure caching directory MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: davidb@apache.org In-Reply-To: <159897797137.20020.3732797846861799911@gitbox.apache.org> References: <159897797137.20020.3732797846861799911@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: sling-org-apache-sling-installer-factory-feature X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 542240c4b230d78d27926119db053b288186f20e X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20200901163251.D9DBC8F151@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. davidb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-feature.git commit 542240c4b230d78d27926119db053b288186f20e Author: Carsten Ziegeler AuthorDate: Wed Apr 29 17:41:32 2020 +0200 Correctly configure caching directory --- .../installer/factory/model/impl/FeatureModelInstallerPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/sling/installer/factory/model/impl/FeatureModelInstallerPlugin.java b/src/main/java/org/apache/sling/installer/factory/model/impl/FeatureModelInstallerPlugin.java index 3c1b870..cc86f97 100644 --- a/src/main/java/org/apache/sling/installer/factory/model/impl/FeatureModelInstallerPlugin.java +++ b/src/main/java/org/apache/sling/installer/factory/model/impl/FeatureModelInstallerPlugin.java @@ -108,10 +108,10 @@ public class FeatureModelInstallerPlugin implements InstallTaskFactory, Resource this.storageDirectory = this.bundleContext.getDataFile("repository"); final ArtifactManagerConfig amCfg = new ArtifactManagerConfig(); amCfg.setUseMvn(config.useMvn()); - final List repos = new ArrayList<>(Arrays.asList(amCfg.getRepositoryUrls())); if (this.storageDirectory != null) { - repos.add(this.storageDirectory.toURI().toURL().toExternalForm()); + amCfg.setCacheDirectory(storageDirectory); } + final List repos = new ArrayList<>(Arrays.asList(amCfg.getRepositoryUrls())); if (config.repositories() != null && config.repositories().length > 0) { for (final String r : config.repositories()) { if (!r.trim().isEmpty()) {