Author: rombert
Date: Thu Sep 5 13:40:04 2013
New Revision: 1520304
URL: http://svn.apache.org/r1520304
Log:
SLING-2989 - [Tooling] integrate with vlt once available
VaultFsLocator: use vault constants
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java?rev=1520304&r1=1520303&r2=1520304&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
Thu Sep 5 13:40:04 2013
@@ -29,6 +29,7 @@ import org.apache.jackrabbit.vault.fs.ap
import org.apache.jackrabbit.vault.fs.config.AbstractVaultFsConfig;
import org.apache.jackrabbit.vault.fs.config.ConfigurationException;
import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
+import org.apache.jackrabbit.vault.util.Constants;
public class VaultFsLocatorImpl implements VaultFsLocator {
@@ -45,13 +46,13 @@ public class VaultFsLocatorImpl implemen
filter.load(filterFile);
}
- File metaInfDir = new File(contentSyncRoot.getParent(), "META-INF");
+ File metaInfDir = new File(contentSyncRoot.getParent(),
Constants.META_INF);
if (metaInfDir.isDirectory()) {
- File vaultDir = new File(metaInfDir, "vault");
+ File vaultDir = new File(metaInfDir, Constants.VAULT_DIR);
if (vaultDir.isDirectory()) {
- File configFile = new File(vaultDir, "config.xml");
+ File configFile = new File(vaultDir, Constants.CONFIG_XML);
config = AbstractVaultFsConfig.load(configFile);
}
}
@@ -62,16 +63,16 @@ public class VaultFsLocatorImpl implemen
@Override
public File findFilterFile(File contentSyncRoot) {
- File metaInfDir = new File(contentSyncRoot.getParent(), "META-INF");
+ File metaInfDir = new File(contentSyncRoot.getParent(),
Constants.META_INF);
if (metaInfDir.isDirectory()) {
- File vaultDir = new File(metaInfDir, "vault");
+ File vaultDir = new File(metaInfDir, Constants.VAULT_DIR);
if (vaultDir.isDirectory()) {
- File filterFile = new File(vaultDir, "filter-vlt.xml");
+ File filterFile = new File(vaultDir, Constants.FILTER_VLT_XML);
if (filterFile.isFile()) {
return filterFile;
} else {
- filterFile = new File(vaultDir, "filter.xml");
+ filterFile = new File(vaultDir, Constants.FILTER_XML);
if (filterFile.isFile()) {
return filterFile;
}
