commit f5ecaebce3c4f7bfcee2e75b9069de1d8f584277
author Konrad Windszus <kwin@apache.org> Mon Jan 06 17:56:12 2020 +0100
committer Konrad Windszus <kwin@apache.org> Mon Jan 06 17:56:12 2020 +0100
tree 38b8f45ec71005363f18491503937ad43f6d330d
parent e7d61a9cb2be300f8c99416551594650628a24a3

SLING-8419 write back with correct extension

src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java

diff --git a/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java b/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
index f16c567..a6879f5 100644
--- a/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
+++ b/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
@@ -105,6 +105,8 @@
     private static final String PROP_MIME = "jcr:mimeType";
     private static final String MIME_TXT = "text/plain";
     private static final String ENCODING = "UTF-8";
+    
+    private static final String CONFIG_FILE_EXTENSION = ".cfg.json";
 
     /** Default regexp for watched folders */
     public static final String DEFAULT_FOLDER_NAME_REGEXP = ".*/(install|config)$";
@@ -750,14 +752,14 @@
                     } else {
                         name = url.substring(lastSlash + 1, lastPos);
                     }
-                    nodePath = getPathWithHighestPrio(cfg, cfg.getNewConfigPath() + name + ".config");
+                    nodePath = getPathWithHighestPrio(cfg, cfg.getNewConfigPath() + name + CONFIG_FILE_EXTENSION);
                 }
                 // ensure extension 'config'
-                if ( !nodePath.endsWith(".config") ) {
+                if ( !nodePath.endsWith(CONFIG_FILE_EXTENSION) ) {
                     if ( session.itemExists(nodePath) ) {
                         session.getItem(nodePath).remove();
                     }
-                    path = nodePath + ".config";
+                    path = nodePath + CONFIG_FILE_EXTENSION;
                 } else {
                     path = nodePath;
                 }
@@ -772,7 +774,7 @@
                 } else {
                     name = id;
                 }
-                path = cfg.getNewConfigPath() + name + ".config";
+                path = cfg.getNewConfigPath() + name + CONFIG_FILE_EXTENSION;
                 logger.debug("Add of {} at {}", resourceType, path);
             }