Improve DTD definitions in Jackrabbit repository configurations.

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

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..92dd88e511b1e9a29626a48abdfcce010c512d57 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
@@ -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>
        <!-- Shared datasource -->
        <DataSources>
@@ -39,7 +48,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 +76,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}" />