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 a48dbbd35bbd8bbe64c0e403ee2a900ea6cd9d50 Author: Stefan Seifert <[email protected]> AuthorDate: Fri Mar 10 15:47:54 2017 +0000 SLING-6630 make FILES_FOLDERS default git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1786369 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 47af999..8863bdf 100644 --- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java +++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java @@ -114,14 +114,14 @@ public final class FsResourceProvider extends ResourceProvider<Object> { @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 "[email protected]" <[email protected]>.
