Improve DTD definitions in Jackrabbit repository configurations.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / jcr / repository-memory.xml

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..4f57362379dcb395a703565147540ff7b116923b 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
@@ -1,5 +1,14 @@
 <?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+<!DOCTYPE Repository [
+       <!ENTITY % repository-elements
+               PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6 Elements//EN"
+               "http://jackrabbit.apache.org/dtd/repository-2.6-elements.dtd">
+       %repository-elements;
+       <!ENTITY % repository
+               PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.6//EN"
+               "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
+       %repository;
+]>
 <Repository>
        <!-- File system and datastore -->
        <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem" />
@@ -15,7 +24,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}" />
@@ -23,6 +32,10 @@
                        <param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
                        <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem" />
                </SearchIndex>
+               <WorkspaceSecurity>
+                       <AccessControlProvider
+                               class="org.argeo.security.jackrabbit.ArgeoAccessControlProvider" />
+               </WorkspaceSecurity>
        </Workspace>
 
        <!-- Versioning -->
@@ -37,7 +50,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}" />