[sling-org-apache-sling-fsresource] 15/23: SLING-6630 make FILES_FOLDERS default

[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-1.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git

commit 16babc30085967a7eb5dbed84a9319b70735ace6
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Fri Mar 10 15:50:59 2017 +0000

    SLING-6630 make FILES_FOLDERS default
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/branches/fsresource-1.x@1786371 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/fsprovider/internal/FsMode.java | 10 +++++-----
 .../apache/sling/fsprovider/internal/FsResourceProvider.java   |  6 +++---
 2 files changed, 8 insertions(+), 8 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 66f1af7..50eeebd 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java
@@ -24,16 +24,16 @@ package org.apache.sling.fsprovider.internal;
 public enum FsMode {
     
     /**
-     * Sling-Initial-Content filesystem layout, supports file and folders ant content files in JSON and jcr.xml format.
-     */
-    INITIAL_CONTENT,
-    
-    /**
      * Support only files and folders (classic mode).
      */
     FILES_FOLDERS,
 
     /**
+     * Sling-Initial-Content filesystem layout, supports file and folders ant content files in JSON and jcr.xml format.
+     */
+    INITIAL_CONTENT,
+    
+    /**
      * FileVault XML format (expanded content package).
      */
     FILEVAULT_XML
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 eafbfda..3745107 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
@@ -116,14 +116,14 @@ public final class FsResourceProvider implements ResourceProvider {
         @AttributeDefinition(name = "Filesystem layout",
                 description = "Filesystem layout mode for files, folders and content.",
                 options={
-                        @Option(value="INITIAL_CONTENT", label="INITIAL_CONTENT - "
-                                + "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="INITIAL_CONTENT", label="INITIAL_CONTENT - "
+                                + "Sling-Initial-Content filesystem layout, supports file and folders ant content files in JSON and jcr.xml format"),
                         @Option(value="FILEVAULT_XML", label="FILEVAULT_XML - "
                                 + "FileVault XML format (expanded content package)"),
                 })
-        FsMode provider_fs_mode() default FsMode.INITIAL_CONTENT;
+        FsMode provider_fs_mode() default FsMode.FILES_FOLDERS;
         
         @AttributeDefinition(name = "Init. Content Options",
                 description = "Import options for Sling-Initial-Content filesystem layout. Supported options: overwrite, ignoreImportProviders.")

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