svn commit: r1786368 - in /sling/branches/fsresource-1.x/src: main/java/org/apache/sling/fsprovider/internal/FsMode.java main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java test/java/org/apache/sling/fsprovider/internal/TestUtils.java

[ss...@apache.org]

Author: sseifert
Date: Fri Mar 10 15:42:23 2017
New Revision: 1786368

URL: http://svn.apache.org/viewvc?rev=1786368&view=rev
Log:
SLING-6630 rename INITIAL_CONTENT_FILES_FOLDERS to FILES_FOLDERS

Modified:
    sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java
    sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
    sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/TestUtils.java

Modified: sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java
URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java?rev=1786368&r1=1786367&r2=1786368&view=diff
==============================================================================
--- sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java (original)
+++ sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java Fri Mar 10 15:42:23 2017
@@ -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).

Modified: sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java?rev=1786368&r1=1786367&r2=1786368&view=diff
==============================================================================
--- sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java (original)
+++ sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java Fri Mar 10 15:42:23 2017
@@ -117,9 +117,9 @@ public final class FsResourceProvider im
                 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)"),
                 })

Modified: sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/TestUtils.java
URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/TestUtils.java?rev=1786368&r1=1786367&r2=1786368&view=diff
==============================================================================
--- sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/TestUtils.java (original)
+++ sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/TestUtils.java Fri Mar 10 15:42:23 2017
@@ -59,7 +59,7 @@ class TestUtils {
             config.put("provider.file", "src/test/resources/fs-test");
             config.put("provider.roots", "/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);
         }