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 2023/09/19 20:30:29 UTC

[sling-org-apache-sling-feature-extension-content] 02/02: SLING-12028 - Content Deployment Extension tests fail on Windows

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch issue/SLING-12028
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-extension-content.git

commit 307aa087a90299e86dc28202cc4ac24fbdc4da76
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 19 22:27:13 2023 +0200

    SLING-12028 - Content Deployment Extension tests fail on Windows
    
    Use a File.separator instead of hardcoding '/' . The assumption of the content extension is that
    generated plans will pe processed on the same operating system, so we don't care too much about now
    about cross-platform compatiblity, i.e. run the extension on Windows and then deploy on Linux.
---
 .../java/org/apache/sling/feature/extension/content/ContentHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/feature/extension/content/ContentHandler.java b/src/main/java/org/apache/sling/feature/extension/content/ContentHandler.java
index 80e2553..87c952d 100644
--- a/src/main/java/org/apache/sling/feature/extension/content/ContentHandler.java
+++ b/src/main/java/org/apache/sling/feature/extension/content/ContentHandler.java
@@ -120,7 +120,7 @@ public class ContentHandler implements ExtensionHandler {
             // Workaround for too bold relocation mechanism - corresponding details at https://issues.apache.org/jira/browse/MSHADE-156
             final Configuration initcfg = new Configuration("org.apache.sling.jcr.packageinit.impl.ExecutionPlanRepoInitializer");
             initcfg.getProperties().put("executionplans", executionPlans.toArray(new String[executionPlans.size()]));
-            initcfg.getProperties().put("statusfilepath", registryHome.getAbsolutePath() + "/executedplans.file");
+            initcfg.getProperties().put("statusfilepath", registryHome.getAbsolutePath() + File.separator + "executedplans.file");
             context.addConfiguration(initcfg.getPid(), null, initcfg.getProperties());
             // Workaround for too bold relocation mechanism - corresponding details at https://issues.apache.org/jira/browse/MSHADE-156
             final Configuration registrycfg = new Configuration("org.UNSHADE.apache.jackrabbit.vault.packaging.registry.impl.FSPackageRegistry");