You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:38:51 UTC
[sling-org-apache-sling-fsresource] 18/29: SLING-6537 FileVault XML
support
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 37acacbc7e8c0db696b4ff830bd860df99b73ce7
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Mar 9 17:25:36 2017 +0000
SLING-6537 FileVault XML support
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1786206 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/fsprovider/internal/FileMonitor.java | 4 +---
.../fsprovider/internal/FsResourceProvider.java | 10 +++++++++-
.../internal/mapper/FileVaultResourceMapper.java | 22 ++++++++++------------
.../fsprovider/internal/FileVaultContentTest.java | 6 ++++--
.../internal/FileVaultFileMonitorTest.java | 6 ++++--
5 files changed, 28 insertions(+), 20 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 d8f7795..dc1e65d 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
@@ -18,8 +18,6 @@
*/
package org.apache.sling.fsprovider.internal;
-import static org.apache.jackrabbit.vault.util.Constants.ROOT_DIR;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -71,7 +69,7 @@ public final class FileMonitor extends TimerTask {
File rootFile = this.provider.getRootFile();
if (fsMode == FsMode.FILEVAULT_XML) {
- rootFile = new File(this.provider.getRootFile(), ROOT_DIR + PlatformNameFormat.getPlatformPath(this.provider.getProviderRoot()));
+ rootFile = new File(this.provider.getRootFile(), "." + PlatformNameFormat.getPlatformPath(this.provider.getProviderRoot()));
}
this.root = new Monitorable(this.provider.getProviderRoot(), rootFile, null);
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 2c8384e..1e2c53b 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
@@ -126,6 +126,10 @@ public final class FsResourceProvider extends ResourceProvider<Object> {
description = "Import options for Sling-Initial-Content filesystem layout. Supported options: overwrite, ignoreImportProviders.")
String provider_initial_content_import_options();
+ @AttributeDefinition(name = "FileVault Filter",
+ description = "Path to META-INF/vault/filter.xml when using FileVault XML filesystem layout.")
+ String provider_filevault_filterxml_path();
+
@AttributeDefinition(name = "Cache Size",
description = "Max. number of content files cached in memory.")
int provider_cache_size() default 10000;
@@ -311,10 +315,14 @@ public final class FsResourceProvider extends ResourceProvider<Object> {
this.overlayParentResourceProvider = false;
InitialContentImportOptions options = new InitialContentImportOptions(config.provider_initial_content_import_options());
+ File filterXmlFile = null;
List<String> contentFileSuffixes = new ArrayList<>();
if (fsMode == FsMode.FILEVAULT_XML) {
contentFileSuffixes.add("/" + DOT_CONTENT_XML);
+ if (StringUtils.isNotBlank(config.provider_filevault_filterxml_path())) {
+ filterXmlFile = new File(config.provider_filevault_filterxml_path());
+ }
}
else if (fsMode == FsMode.INITIAL_CONTENT_FILES_FOLDERS) {
overlayParentResourceProvider = true;
@@ -332,7 +340,7 @@ public final class FsResourceProvider extends ResourceProvider<Object> {
this.contentFileCache = new ContentFileCache(config.provider_cache_size());
if (fsMode == FsMode.FILEVAULT_XML) {
- this.fileVaultMapper = new FileVaultResourceMapper(this.providerFile, this.contentFileCache);
+ this.fileVaultMapper = new FileVaultResourceMapper(this.providerFile, filterXmlFile, this.contentFileCache);
}
else {
this.fileMapper = new FileResourceMapper(this.providerRoot, this.providerFile, contentFileExtensions);
diff --git a/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileVaultResourceMapper.java b/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileVaultResourceMapper.java
index 88e001e..cb25230 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileVaultResourceMapper.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileVaultResourceMapper.java
@@ -19,9 +19,6 @@
package org.apache.sling.fsprovider.internal.mapper;
import static org.apache.jackrabbit.vault.util.Constants.DOT_CONTENT_XML;
-import static org.apache.jackrabbit.vault.util.Constants.FILTER_XML;
-import static org.apache.jackrabbit.vault.util.Constants.META_DIR;
-import static org.apache.jackrabbit.vault.util.Constants.ROOT_DIR;
import java.io.File;
import java.io.IOException;
@@ -51,13 +48,15 @@ public final class FileVaultResourceMapper implements FsResourceMapper {
private static final String DOT_DIR_SUFFIX = "/.dir";
private final File providerFile;
+ private final File filterXmlFile;
private final ContentFileCache contentFileCache;
private final WorkspaceFilter workspaceFilter;
private static final Logger log = LoggerFactory.getLogger(FileVaultResourceMapper.class);
- public FileVaultResourceMapper(File providerFile, ContentFileCache contentFileCache) {
+ public FileVaultResourceMapper(File providerFile, File filterXmlFile, ContentFileCache contentFileCache) {
this.providerFile = providerFile;
+ this.filterXmlFile = filterXmlFile;
this.contentFileCache = contentFileCache;
this.workspaceFilter = getWorkspaceFilter();
}
@@ -134,18 +133,17 @@ public final class FileVaultResourceMapper implements FsResourceMapper {
* @return Workspace filter or null if none found.
*/
private WorkspaceFilter getWorkspaceFilter() {
- File filter = new File(providerFile, META_DIR + "/" + FILTER_XML);
- if (filter.exists()) {
+ if (filterXmlFile != null && filterXmlFile.exists()) {
try {
DefaultWorkspaceFilter workspaceFilter = new DefaultWorkspaceFilter();
- workspaceFilter.load(filter);
+ workspaceFilter.load(filterXmlFile);
return workspaceFilter;
} catch (IOException | ConfigurationException ex) {
- log.error("Unable to parse workspace filter: " + filter.getPath(), ex);
+ log.error("Unable to parse workspace filter: " + filterXmlFile.getPath(), ex);
}
}
else {
- log.warn("Workspace filter not found: " + filter.getPath());
+ log.debug("Workspace filter not found: " + filterXmlFile.getPath());
}
return null;
}
@@ -161,7 +159,7 @@ public final class FileVaultResourceMapper implements FsResourceMapper {
return false;
}
if (workspaceFilter == null) {
- return false;
+ return true;
}
else {
return workspaceFilter.contains(path);
@@ -172,7 +170,7 @@ public final class FileVaultResourceMapper implements FsResourceMapper {
if (StringUtils.endsWith(path, DOT_CONTENT_XML_SUFFIX)) {
return null;
}
- File file = new File(providerFile, ROOT_DIR + PlatformNameFormat.getPlatformPath(path));
+ File file = new File(providerFile, "." + PlatformNameFormat.getPlatformPath(path));
if (file.exists()) {
return file;
}
@@ -180,7 +178,7 @@ public final class FileVaultResourceMapper implements FsResourceMapper {
}
private ContentFile getContentFile(String path, String subPath) {
- File file = new File(providerFile, ROOT_DIR + PlatformNameFormat.getPlatformPath(path) + DOT_CONTENT_XML_SUFFIX);
+ File file = new File(providerFile, "." + PlatformNameFormat.getPlatformPath(path) + DOT_CONTENT_XML_SUFFIX);
if (file.exists()) {
ContentFile contentFile = new ContentFile(file, path, subPath, contentFileCache);
if (contentFile.hasContent()) {
diff --git a/src/test/java/org/apache/sling/fsprovider/internal/FileVaultContentTest.java b/src/test/java/org/apache/sling/fsprovider/internal/FileVaultContentTest.java
index a6f6744..b2f1514 100644
--- a/src/test/java/org/apache/sling/fsprovider/internal/FileVaultContentTest.java
+++ b/src/test/java/org/apache/sling/fsprovider/internal/FileVaultContentTest.java
@@ -57,12 +57,14 @@ public class FileVaultContentTest {
public SlingContext context = new SlingContextBuilder(ResourceResolverType.JCR_MOCK)
.plugin(new RegisterFsResourcePlugin(
"provider.fs.mode", FsMode.FILEVAULT_XML.name(),
- "provider.file", "src/test/resources/vaultfs-test",
+ "provider.file", "src/test/resources/vaultfs-test/jcr_root",
+ "provider.filevault.filterxml.path", "src/test/resources/vaultfs-test/META-INF/vault/filter.xml",
"provider.root", "/content/dam/talk.png"
))
.plugin(new RegisterFsResourcePlugin(
"provider.fs.mode", FsMode.FILEVAULT_XML.name(),
- "provider.file", "src/test/resources/vaultfs-test",
+ "provider.file", "src/test/resources/vaultfs-test/jcr_root",
+ "provider.filevault.filterxml.path", "src/test/resources/vaultfs-test/META-INF/vault/filter.xml",
"provider.root", "/content/samples"
))
.build();
diff --git a/src/test/java/org/apache/sling/fsprovider/internal/FileVaultFileMonitorTest.java b/src/test/java/org/apache/sling/fsprovider/internal/FileVaultFileMonitorTest.java
index 8fe5f3b..9743027 100644
--- a/src/test/java/org/apache/sling/fsprovider/internal/FileVaultFileMonitorTest.java
+++ b/src/test/java/org/apache/sling/fsprovider/internal/FileVaultFileMonitorTest.java
@@ -65,12 +65,14 @@ public class FileVaultFileMonitorTest {
// mount temp. directory
context.registerInjectActivateService(new FsResourceProvider(),
- "provider.file", tempDir.getPath(),
+ "provider.file", tempDir.getPath() + "/jcr_root",
+ "provider.filevault.filterxml.path", tempDir.getPath() + "/META-INF/vault/filter.xml",
"provider.root", "/content/dam/talk.png",
"provider.checkinterval", CHECK_INTERVAL,
"provider.fs.mode", FsMode.FILEVAULT_XML.name());
context.registerInjectActivateService(new FsResourceProvider(),
- "provider.file", tempDir.getPath(),
+ "provider.file", tempDir.getPath() + "/jcr_root",
+ "provider.filevault.filterxml.path", tempDir.getPath() + "/META-INF/vault/filter.xml",
"provider.root", "/content/samples",
"provider.checkinterval", CHECK_INTERVAL,
"provider.fs.mode", FsMode.FILEVAULT_XML.name());
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.