sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sseif...@apache.org
Subject svn commit: r1786371 - in /sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal: FsMode.java FsResourceProvider.java
Date Fri, 10 Mar 2017 15:50:59 GMT
Author: sseifert
Date: Fri Mar 10 15:50:59 2017
New Revision: 1786371

URL: http://svn.apache.org/viewvc?rev=1786371&view=rev
Log:
SLING-6630 make FILES_FOLDERS default

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

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=1786371&r1=1786370&r2=1786371&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:50:59 2017
@@ -24,16 +24,16 @@ package org.apache.sling.fsprovider.inte
 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

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=1786371&r1=1786370&r2=1786371&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:50:59 2017
@@ -116,14 +116,14 @@ public final class FsResourceProvider im
         @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.")



Mime
View raw message