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 8d9d081634417674b7b75e7c0871e4110ec7276b Author: Stefan Seifert <[email protected]> AuthorDate: Tue Mar 7 21:56:10 2017 +0000 SLING-6537 FileVault XML support git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1785892 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/sling/fsprovider/internal/FileMonitor.java | 4 ++-- .../org/apache/sling/fsprovider/internal/FsResourceProvider.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java b/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java index 319e712..d8f7795 100644 --- a/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java +++ b/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java @@ -166,7 +166,7 @@ public final class FileMonitor extends TimerTask { // removed file and update status sendEvents(monitorable, ChangeType.REMOVED, reporter); monitorable.status = NonExistingStatus.SINGLETON; - contentFileCache.remove(monitorable.path); + contentFileCache.remove(transformPath(monitorable.path)); } else { // check for changes final FileStatus fs = (FileStatus)monitorable.status; @@ -176,7 +176,7 @@ public final class FileMonitor extends TimerTask { // changed sendEvents(monitorable, ChangeType.CHANGED, reporter); changed = true; - contentFileCache.remove(monitorable.path); + contentFileCache.remove(transformPath(monitorable.path)); } if ( fs instanceof DirStatus ) { // directory 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 2b55028..2c8384e 100644 --- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java +++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java @@ -114,11 +114,11 @@ public final class FsResourceProvider extends ResourceProvider<Object> { 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."), + + "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, support only files and folders (classic mode)"), @Option(value="FILEVAULT_XML", label="FILEVAULT_XML - " - + "FileVault XML format (expanded content package)."), + + "FileVault XML format (expanded content package)"), }) FsMode provider_fs_mode() default FsMode.INITIAL_CONTENT; @@ -133,7 +133,7 @@ public final class FsResourceProvider extends ResourceProvider<Object> { /** * Internal Name hint for web console. */ - String webconsole_configurationFactory_nameHint() default "Root path: {" + ResourceProvider.PROPERTY_ROOT + "}"; + String webconsole_configurationFactory_nameHint() default "{provider.fs.mode}: {" + ResourceProvider.PROPERTY_ROOT + "}"; } // The location in the resource tree where the resources are mapped -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
