From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 9 Feb 2017 17:05:00 +0000 (+0100)
Subject: Changes indexes base
X-Git-Tag: argeo-commons-2.1.60~6
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=5f71a84cb6ad1383c97f16a1aa6fd63f9464509a;p=lgpl%2Fargeo-commons.git

Changes indexes base
---

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepoConf.java b/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepoConf.java
index 429a51a58..c453dcb52 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepoConf.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepoConf.java
@@ -8,7 +8,7 @@ public enum RepoConf implements EnumAD {
 	/** Repository type */
 	type("localfs"),
 	/** Default workspace */
-	@Deprecated defaultWorkspace("main"),
+	defaultWorkspace("main"),
 	/** Database URL */
 	dburl(null),
 	/** Database user */
@@ -24,7 +24,7 @@ public enum RepoConf implements EnumAD {
 	/** Maximum database pool size */
 	maxPoolSize(10),
 	/** Maximum cache size in MB */
-	@Deprecated maxCacheMB(null),
+	maxCacheMB(null),
 	/** Bundle cache size in MB */
 	bundleCacheMB(8),
 	/** Extractor pool size */
@@ -34,7 +34,9 @@ public enum RepoConf implements EnumAD {
 	/** Max volatile index size */
 	maxVolatileIndexSize(1048576),
 	/** Cluster id (if appropriate configuration) */
-	clusterId("default");
+	clusterId("default"),
+	/** Indexes base path */
+	indexesBase(null);
 
 	/** The default value. */
 	private Object def;
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java b/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java
index fab39fd5f..ca5dfccb8 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java
@@ -103,10 +103,8 @@ public class RepositoryBuilder {
 		homeDir.mkdirs();
 		// home cannot be overridden
 		props.put(RepositoryConfigurationParser.REPOSITORY_HOME_VARIABLE, homePath.toString());
-		
-		Path indexBase = CmsPaths.getRepoIndexBase();
-		props.put("indexBase", indexBase.toString());
 
+		setProp(props, RepoConf.indexesBase, CmsPaths.getRepoIndexesBase().toString());
 		// common
 		setProp(props, RepoConf.defaultWorkspace);
 		setProp(props, RepoConf.maxPoolSize);
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-h2.xml b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-h2.xml
index 05267621f..11a1a523a 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-h2.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-h2.xml
@@ -39,7 +39,7 @@
 			<param name="bundleCacheSize" value="${bundleCacheMB}" />
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-			<param name="path" value="${wsp.home}/index" />
+			<param name="path" value="${indexesBase}/${cn}/${wsp.name}/index" />
 			<param name="extractorPoolSize" value="${extractorPoolSize}" />
 			<param name="cacheSize" value="${searchCacheSize}" />
 			<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
@@ -67,7 +67,7 @@
 
 	<!-- Indexing -->
 	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-		<param name="path" value="${rep.home}/index" />
+		<param name="path" value="${indexesBase}/${cn}/index" />
 		<param name="extractorPoolSize" value="${extractorPoolSize}" />
 		<param name="cacheSize" value="${searchCacheSize}" />
 		<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-localfs.xml b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-localfs.xml
index 3d2470863..b88907919 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-localfs.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-localfs.xml
@@ -21,7 +21,7 @@
 			<param name="bundleCacheSize" value="${bundleCacheMB}" />
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-			<param name="path" value="${wsp.home}/index" />
+			<param name="path" value="${indexesBase}/${cn}/${wsp.name}/index" />
 			<param name="extractorPoolSize" value="${extractorPoolSize}" />
 			<param name="cacheSize" value="${searchCacheSize}" />
 			<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
@@ -45,7 +45,7 @@
 
 	<!-- Indexing -->
 	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-		<param name="path" value="${rep.home}/index" />
+		<param name="path" value="${indexesBase}/${cn}/index" />
 		<param name="extractorPoolSize" value="${extractorPoolSize}" />
 		<param name="cacheSize" value="${searchCacheSize}" />
 		<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-memory.xml b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-memory.xml
index ecee5bdad..738ed5bbd 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-memory.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-memory.xml
@@ -15,7 +15,7 @@
 			<param name="bundleCacheSize" value="${bundleCacheMB}" />
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-			<param name="path" value="${wsp.home}/index" />
+			<param name="path" value="${indexesBase}/${cn}/${wsp.name}/index" />
 			<param name="directoryManagerClass"
 				value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
 			<param name="extractorPoolSize" value="${extractorPoolSize}" />
@@ -37,7 +37,7 @@
 
 	<!-- Indexing -->
 	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-		<param name="path" value="${rep.home}/index" />
+		<param name="path" value="${indexesBase}/${cn}/index" />
 		<param name="directoryManagerClass"
 			value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
 		<param name="extractorPoolSize" value="${extractorPoolSize}" />
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql.xml b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql.xml
index 967782820..de2f245ad 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql.xml
@@ -36,7 +36,7 @@
 			<param name="bundleCacheSize" value="${bundleCacheMB}" />
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-			<param name="path" value="${wsp.home}/index" />
+			<param name="path" value="${indexesBase}/${cn}/${wsp.name}/index" />
 			<param name="extractorPoolSize" value="${extractorPoolSize}" />
 			<param name="cacheSize" value="${searchCacheSize}" />
 			<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
@@ -64,7 +64,7 @@
 
 	<!-- Indexing -->
 	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-		<param name="path" value="${rep.home}/index" />
+		<param name="path" value="${indexesBase}/${cn}/index" />
 		<param name="extractorPoolSize" value="${extractorPoolSize}" />
 		<param name="cacheSize" value="${searchCacheSize}" />
 		<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_cluster.xml b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_cluster.xml
index d8c23e733..488ad6b72 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_cluster.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_cluster.xml
@@ -36,7 +36,7 @@
 			<param name="bundleCacheSize" value="${bundleCacheMB}" />
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-			<param name="path" value="${wsp.home}/index" />
+			<param name="path" value="${indexesBase}/${cn}/${wsp.name}/index" />
 			<param name="extractorPoolSize" value="${extractorPoolSize}" />
 			<param name="cacheSize" value="${searchCacheSize}" />
 			<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
@@ -64,7 +64,7 @@
 
 	<!-- Indexing -->
 	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-		<param name="path" value="${rep.home}/index" />
+		<param name="path" value="${indexesBase}/${cn}/index" />
 		<param name="extractorPoolSize" value="${extractorPoolSize}" />
 		<param name="cacheSize" value="${searchCacheSize}" />
 		<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_ds.xml b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_ds.xml
index 07a0d0428..5229d1660 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_ds.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/repository-postgresql_ds.xml
@@ -39,7 +39,7 @@
 			<param name="bundleCacheSize" value="${bundleCacheMB}" />
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-			<param name="path" value="${wsp.home}/index" />
+			<param name="path" value="${indexesBase}/${cn}/${wsp.name}/index" />
 			<param name="extractorPoolSize" value="${extractorPoolSize}" />
 			<param name="cacheSize" value="${searchCacheSize}" />
 			<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
@@ -67,7 +67,7 @@
 
 	<!-- Indexing -->
 	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-		<param name="path" value="${rep.home}/index" />
+		<param name="path" value="${indexesBase}/${cn}/index" />
 		<param name="extractorPoolSize" value="${extractorPoolSize}" />
 		<param name="cacheSize" value="${searchCacheSize}" />
 		<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsPaths.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsPaths.java
index d4dbc8163..452edc9cb 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsPaths.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsPaths.java
@@ -7,8 +7,8 @@ public class CmsPaths {
 		return KernelUtils.getOsgiInstancePath(KernelConstants.DIR_REPOS + '/' + cn);
 	}
 
-	public static Path getRepoIndexBase() {
-		return KernelUtils.getOsgiInstancePath(KernelConstants.DIR_REPOS);
+	public static Path getRepoIndexesBase() {
+		return KernelUtils.getOsgiInstancePath(KernelConstants.DIR_INDEXES);
 	}
 
 	private CmsPaths() {
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsSecurity.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsSecurity.java
index 168b199ba..7983ea771 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsSecurity.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsSecurity.java
@@ -59,7 +59,7 @@ class CmsSecurity implements KernelConstants {
 	private String service = null;
 	private GSSCredential acceptorCredentials;
 
-	private Path nodeKeyTab = KernelUtils.getOsgiInstancePath("node/krb5.keytab");
+	private Path nodeKeyTab = KernelUtils.getOsgiInstancePath(KernelConstants.NODE_KEY_TAB_PATH);
 
 	public CmsSecurity() {
 		if (!DeployConfig.isInitialized()) // first init
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
index c3cf0d1bf..941fdb275 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
@@ -8,28 +8,17 @@ public interface KernelConstants {
 	// Directories
 	String DIR_NODE = "node";
 	String DIR_REPOS = "repos";
+	String DIR_INDEXES = "indexes";
 	String DIR_TRANSACTIONS = "transactions";
-	// String DIR_PKI = "pki";
-	// String DIR_PKI_PRIVATE = DIR_PKI + "/private";
 
 	// Files
 	String DEPLOY_CONFIG_PATH = DIR_NODE + '/' + NodeConstants.DEPLOY_BASEDN + ".ldif";
 	String DEFAULT_KEYSTORE_PATH = DIR_NODE + '/' + NodeConstants.NODE + ".p12";
+	String NODE_KEY_TAB_PATH = DIR_NODE + "/krb5.keytab";
 
 	// Security
-	// String DEFAULT_SECURITY_KEY = "argeo";
 	String JAAS_CONFIG = "/org/argeo/cms/internal/kernel/jaas.cfg";
 	String JAAS_CONFIG_IPA = "/org/argeo/cms/internal/kernel/jaas-ipa.cfg";
-	// String LOGIN_CONTEXT_KERNEL = "KERNEL";
-	// String LOGIN_CONTEXT_HARDENED_KERNEL = "HARDENED_KERNEL";
-
-	// DAV
-//	String WEBDAV_CONFIG = "/org/argeo/cms/internal/http/webdav-config.xml";
-	// String PATH_DATA = "/data";
-	// String WEBDAV_PUBLIC = PATH_DATA + "/public";
-	// String WEBDAV_PRIVATE = PATH_DATA + "/files";
-	// String REMOTING_PUBLIC = PATH_DATA + "/pub";
-	// String REMOTING_PRIVATE = PATH_DATA + "/jcr";
 
 	// Java
 	String JAAS_CONFIG_PROP = "java.security.auth.login.config";