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 1d1096048d56209d1152f17518c60a5b6374db95 Author: David Bosschaert <[email protected]> AuthorDate: Mon Nov 26 14:24:34 2018 +0000 Update to Feature Model 0.8.0 The configurations are not factory configuration, so remove handling code for that. --- .../feature/extension/content/ContentHandler.java | 21 ++--------------- .../extension/content/ContentHandlerTest.java | 26 ---------------------- 2 files changed, 2 insertions(+), 45 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 ab4d5a6..ddc7682 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 @@ -121,11 +121,11 @@ 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()])); - installationContext.addConfiguration(getPid(initcfg), getFactoryPid(initcfg), initcfg.getProperties()); + 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"); registrycfg.getProperties().put("homePath", registryHome.getPath()); - installationContext.addConfiguration(getPid(registrycfg), getFactoryPid(registrycfg), registrycfg.getProperties()); + installationContext.addConfiguration(registrycfg.getPid(), null, registrycfg.getProperties()); return true; } @@ -156,21 +156,4 @@ public class ContentHandler implements ExtensionHandler { } return registryHome; } - - static String getPid(Configuration cfg) { - String pid = cfg.getPid(); - int idx = pid.indexOf(FACTORY_CONFIG_SEPARATOR); - if (idx > 0) - return pid.substring(0, idx); - else - return pid; - } - - static String getFactoryPid(Configuration cfg) { - String pid = cfg.getPid(); - if (pid.indexOf(FACTORY_CONFIG_SEPARATOR) > 0) - return pid; - else - return null; - } } 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 49347a6..662dfb7 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 @@ -18,7 +18,6 @@ package org.apache.sling.feature.extension.content; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.mockito.Mockito.any; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; @@ -31,7 +30,6 @@ import java.util.Iterator; import org.apache.sling.feature.Artifact; import org.apache.sling.feature.ArtifactId; -import org.apache.sling.feature.Configuration; import org.apache.sling.feature.Extension; import org.apache.sling.feature.ExtensionType; import org.apache.sling.feature.launcher.spi.LauncherPrepareContext; @@ -128,28 +126,4 @@ public class ContentHandlerTest { assertEquals(expected_1, executionplans[1]); assertFalse(dictIt.hasNext()); } - - @Test - public void testGetConfigPidNormal() { - Configuration cfg = new Configuration("a.b.c"); - assertEquals("a.b.c", ContentHandler.getPid(cfg)); - } - - @Test - public void testGetConfigPidFactory() { - Configuration cfg = new Configuration("a.b.c~d"); - assertEquals("a.b.c", ContentHandler.getPid(cfg)); - } - - @Test - public void testGetFactoryPidNormal() { - Configuration cfg = new Configuration("a.b.c"); - assertNull(ContentHandler.getFactoryPid(cfg)); - } - - @Test - public void testGetFactoryPidFactory() { - Configuration cfg = new Configuration("a.b.c~d"); - assertEquals("a.b.c~d", ContentHandler.getFactoryPid(cfg)); - } }
