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-feature-extension-content.git
commit c76598d5b1f2d3e4fd893cef45ff66fac0dc60bc Author: Dominik Suess <[email protected]> AuthorDate: Fri Nov 16 14:50:54 2018 +0100 SLING-8113 - defining file in registryhome to capture executionplan status. --- .../org/apache/sling/feature/extension/content/ContentHandler.java | 3 +-- .../apache/sling/feature/extension/content/ContentHandlerTest.java | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) 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 ddc7682..673d626 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 @@ -44,8 +44,6 @@ import org.apache.sling.feature.launcher.spi.extensions.ExtensionInstallationCon public class ContentHandler implements ExtensionHandler { public static final String PACKAGEREGISTRY_HOME = "packageregistry.home"; - private static final char FACTORY_CONFIG_SEPARATOR = '~'; - private static final String REPOSITORY_HOME = "repository.home"; private static final String REGISTRY_FOLDER = "packageregistry"; @@ -121,6 +119,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.UNSHADE.apache.sling.jcr.packageinit.impl.ExecutionPlanRepoInitializer"); initcfg.getProperties().put("executionplans", executionPlans.toArray(new String[executionPlans.size()])); + initcfg.getProperties().put("statusfilepath", registryHome.getAbsolutePath() + "/executedplans.file"); installationContext.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"); diff --git a/src/test/java/org/apache/sling/feature/extension/content/ContentHandlerTest.java b/src/test/java/org/apache/sling/feature/extension/content/ContentHandlerTest.java index 662dfb7..5721457 100644 --- a/src/test/java/org/apache/sling/feature/extension/content/ContentHandlerTest.java +++ b/src/test/java/org/apache/sling/feature/extension/content/ContentHandlerTest.java @@ -108,7 +108,11 @@ public class ContentHandlerTest { verify(installationContext).addConfiguration(eq("org.UNSHADE.apache.sling.jcr.packageinit.impl.ExecutionPlanRepoInitializer"), any(), executionPlanCaptor.capture()); verify(installationContext).addConfiguration(eq("org.UNSHADE.apache.jackrabbit.vault.packaging.registry.impl.FSPackageRegistry"), any(), any()); Iterator<Dictionary<String, Object>> dictIt = executionPlanCaptor.getAllValues().iterator(); - final String[] executionplans = (String[]) dictIt.next().get("executionplans"); + Dictionary<String, Object> dict = dictIt.next(); + final String[] executionplans = (String[]) dict.get("executionplans"); + final String statusFileHome = (String)dict.get("statusfilepath"); + File executedPlansFile = new File(testFolder.getRoot(), "executedplans.file"); + assertEquals(executedPlansFile.getAbsolutePath(), statusFileHome); final String expected_0 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<executionPlan version=\"1.0\">\n" +
