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/07 21:56:10 UTC
svn commit: r1785892 - in
/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal:
FileMonitor.java FsResourceProvider.java
Author: sseifert
Date: Tue Mar 7 21:56:10 2017
New Revision: 1785892
URL: http://svn.apache.org/viewvc?rev=1785892&view=rev
Log:
SLING-6537 FileVault XML support
Modified:
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.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/FileMonitor.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java?rev=1785892&r1=1785891&r2=1785892&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java (original)
+++ sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java Tue Mar 7 21:56:10 2017
@@ -166,7 +166,7 @@ public final class FileMonitor extends T
// 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 T
// changed
sendEvents(monitorable, ChangeType.CHANGED, reporter);
changed = true;
- contentFileCache.remove(monitorable.path);
+ contentFileCache.remove(transformPath(monitorable.path));
}
if ( fs instanceof DirStatus ) {
// directory
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=1785892&r1=1785891&r2=1785892&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 Tue Mar 7 21:56:10 2017
@@ -114,11 +114,11 @@ public final class FsResourceProvider ex
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 ex
/**
* 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