[sling-whiteboard] branch master updated: Change name of runmodes in configuration

[davidb]

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-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 1febbd0  Change name of runmodes in configuration
1febbd0 is described below

commit 1febbd0dd340c34e8c599b85932e3816e99a358a
Author: David Bosschaert <david.bosscha...@gmail.com>
AuthorDate: Fri Mar 23 11:36:07 2018 +0000

    Change name of runmodes in configuration
---
 .../sling/feature/modelconverter/impl/FeatureToProvisioning.java      | 2 +-
 .../sling/feature/modelconverter/impl/ProvisioningToFeature.java      | 2 +-
 featuremodel/feature-modelconverter/src/test/resources/oak.json       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/FeatureToProvisioning.java
 
b/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/FeatureToProvisioning.java
index aded77c..3c904fe 100644
--- 
a/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/FeatureToProvisioning.java
+++ 
b/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/FeatureToProvisioning.java
@@ -163,7 +163,7 @@ public class FeatureToProvisioning {
             }
 
             String[] runModes = null;
-            Object rm = c.getProperties().remove(".runmodes.");
+            Object rm = c.getProperties().remove(".runmodes");
             if (rm instanceof String) {
                 runModes = ((String) rm).split(",");
             }
diff --git 
a/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/ProvisioningToFeature.java
 
b/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/ProvisioningToFeature.java
index 9f88aae..62a4f00 100644
--- 
a/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/ProvisioningToFeature.java
+++ 
b/featuremodel/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/ProvisioningToFeature.java
@@ -442,7 +442,7 @@ public class ProvisioningToFeature {
 
                 String[] runModeNames = runMode.getNames();
                 if (runModeNames != null) {
-                    newCfg.getProperties().put(".runmodes.", String.join(",", 
runModeNames));
+                    newCfg.getProperties().put(".runmodes", String.join(",", 
runModeNames));
                 }
 
                 configurations.add(newCfg);
diff --git a/featuremodel/feature-modelconverter/src/test/resources/oak.json 
b/featuremodel/feature-modelconverter/src/test/resources/oak.json
index 4ba64cb..d94aa8d 100644
--- a/featuremodel/feature-modelconverter/src/test/resources/oak.json
+++ b/featuremodel/feature-modelconverter/src/test/resources/oak.json
@@ -87,11 +87,11 @@
             "groupPrivilegeNames": ["jcr:read"]
         },
         "org.apache.jackrabbit.oak.segment.SegmentNodeStoreService": {
-            ".runmodes.": "oak_tar", 
+            ".runmodes": "oak_tar", 
             "name": "Default NodeStore"
         },
         "org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService": 
{
-            ".runmodes.": "oak_mongo", 
+            ".runmodes": "oak_mongo", 
             "mongouri": "mongodb://localhost:27017",
             "db": "sling"
         }

-- 
To stop receiving notification emails like this one, please contact
dav...@apache.org.