[sling-org-apache-sling-fsresource] 20/29: SLING-6440 rename INITIAL_CONTENT_FILES_FOLDERS to FILES_FOLDERS

[ro...@apache.org]

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

rombert pushed a commit to annotated tag org.apache.sling.fsresource-2.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git

commit 3fb8decc77907a4dea71e463e5f62e5617e9b555
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Fri Mar 10 15:36:30 2017 +0000

    SLING-6440 rename INITIAL_CONTENT_FILES_FOLDERS to FILES_FOLDERS
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1786366 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/fsprovider/internal/FsMode.java    | 8 ++++----
 .../org/apache/sling/fsprovider/internal/FsResourceProvider.java  | 8 ++++----
 src/test/java/org/apache/sling/fsprovider/internal/TestUtils.java | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java b/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java
index 15af91f..66f1af7 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java
@@ -19,19 +19,19 @@
 package org.apache.sling.fsprovider.internal;
 
 /**
- * Different modes for Filesystem provider support and filesystem layouts.
+ * Different modes for File system provider support and file system layouts.
  */
 public enum FsMode {
     
     /**
-     * Sling-Initial-Content filesystem layout, with full support for JSON and jcr.xml content files.
+     * Sling-Initial-Content filesystem layout, supports file and folders ant content files in JSON and jcr.xml format.
      */
     INITIAL_CONTENT,
     
     /**
-     * Sling-Initial-Content filesystem layout, support only files and folders (classic mode).
+     * Support only files and folders (classic mode).
      */
-    INITIAL_CONTENT_FILES_FOLDERS,
+    FILES_FOLDERS,
 
     /**
      * FileVault XML format (expanded content package).
diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
index 2fa1e3e..47af999 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
@@ -115,9 +115,9 @@ public final class FsResourceProvider extends ResourceProvider<Object> {
                 description = "Filesystem layout mode for files, folders and content.",
                 options={
                         @Option(value="INITIAL_CONTENT", label="INITIAL_CONTENT - "
-                                + "Sling-Initial-Content filesystem layout, with full support for JSON and jcr.xml content files"),
-                        @Option(value="INITIAL_CONTENT_FILES_FOLDERS", label="INITIAL_CONTENT_FILES_FOLDERS - "
-                                + "Sling-Initial-Content filesystem layout, support only files and folders (classic mode)"),
+                                + "Sling-Initial-Content filesystem layout, supports file and folders ant content files in JSON and jcr.xml format"),
+                        @Option(value="FILES_FOLDERS", label="FILES_FOLDERS - "
+                                + "Support only files and folders (classic mode)"),
                         @Option(value="FILEVAULT_XML", label="FILEVAULT_XML - "
                                 + "FileVault XML format (expanded content package)"),
                 })
@@ -325,7 +325,7 @@ public final class FsResourceProvider extends ResourceProvider<Object> {
                 filterXmlFile = new File(config.provider_filevault_filterxml_path());
             }
         }
-        else if (fsMode == FsMode.INITIAL_CONTENT_FILES_FOLDERS) {
+        else if (fsMode == FsMode.FILES_FOLDERS) {
             overlayParentResourceProvider = true;
         }
         else if (fsMode == FsMode.INITIAL_CONTENT) {
diff --git a/src/test/java/org/apache/sling/fsprovider/internal/TestUtils.java b/src/test/java/org/apache/sling/fsprovider/internal/TestUtils.java
index 6fed2b2..edfbc68 100644
--- a/src/test/java/org/apache/sling/fsprovider/internal/TestUtils.java
+++ b/src/test/java/org/apache/sling/fsprovider/internal/TestUtils.java
@@ -58,7 +58,7 @@ class TestUtils {
             config.put("provider.file", "src/test/resources/fs-test");
             config.put("provider.root", "/fs-test");
             config.put("provider.checkinterval", 0);
-            config.put("provider.fs.mode", FsMode.INITIAL_CONTENT_FILES_FOLDERS.name());
+            config.put("provider.fs.mode", FsMode.FILES_FOLDERS.name());
             config.putAll(props);
             context.registerInjectActivateService(new FsResourceProvider(), config);
         }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.