You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2017/03/10 15:47:54 UTC
svn commit: r1786369 - in
/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal:
FsMode.java FsResourceProvider.java
Author: sseifert
Date: Fri Mar 10 15:47:54 2017
New Revision: 1786369
URL: http://svn.apache.org/viewvc?rev=1786369&view=rev
Log:
SLING-6630 make FILES_FOLDERS default
Modified:
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
Modified: sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java?rev=1786369&r1=1786368&r2=1786369&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java (original)
+++ sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsMode.java Fri Mar 10 15:47:54 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/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java?rev=1786369&r1=1786368&r2=1786369&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java (original)
+++ sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java Fri Mar 10 15:47:54 2017
@@ -114,14 +114,14 @@ public final class FsResourceProvider ex
@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.")