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 429a51a589cc604fd2282589756876d4633b71b7..c453dcb520457e755066947e176fb56c6efa6975 100644 (file)
--- 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 fab39fd5fcec8457ccd52824d53bdc25316bc8fb..ca5dfccb836924e33013c6913fe235cbcda2132d 100644 (file)
--- 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 05267621f7d951046b16a70fd7399821bd986ff5..11a1a523a2c2883869526a923b145c44deda0c97 100644 (file)
--- 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 3d2470863760e372474549dcf3f014f32e7959d1..b889079194b0d4da5cf29a0dd0ccc7f759457060 100644 (file)
--- 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 ecee5bdad02607fe429c46b526b2511935074709..738ed5bbd601e3a9edcb0cc6af28afb42b24e97a 100644 (file)
--- 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 96778282039c2b2281e1bd7ce517601629f587bd..de2f245ad42ae1eaedfa26cfe3e678b062a697fc 100644 (file)
--- 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 d8c23e7337c00cd2c1d73b72ea2c12d923e60bff..488ad6b72c3dd9dc05720f7907eb7d3c1d178923 100644 (file)
--- 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 07a0d042811cadea7f297df9360fbedf74808ad9..5229d166034dd7c53fb361b4cecb55c9a62aabd2 100644 (file)
--- 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 d4dbc816339026c27dc3514491399e9f791e4ca9..452edc9cb555b88a0be7af0353f98ab8a4fac99c 100644 (file)
--- 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 168b199bac8b28e9cc3a85d695891b6a09a57ca6..7983ea771428e740f771ec3b6f9b5cbba00c7e6c 100644 (file)
--- 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 c3cf0d1bfcdb05df299549619be83e61e115807a..941fdb27540522611d81ffcabcd23f70a5b13a8f 100644 (file)
--- 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";