X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2Frepository-postgresql.xml;h=96778282039c2b2281e1bd7ce517601629f587bd;hb=277bb126a4b8523b93c2cd9abd345833a8387eba;hp=811f0c6bc1a2b316d66392e9ada579ad6cc8011e;hpb=63446804f4954bfedd50d8c692bde0fab13aa1ec;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-postgresql.xml b/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-postgresql.xml
index 811f0c6bc..967782820 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-postgresql.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-postgresql.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
-                            "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<!DOCTYPE Repository PUBLIC "Jackrabbit 2.6" "http://jackrabbit.apache.org/dtd/repository-2.6.dtd">
 <Repository>
 	<!-- Shared datasource -->
 	<DataSources>
 		<DataSource name="dataSource">
 			<param name="driver" value="org.postgresql.Driver" />
-			<param name="url" value="${argeo.node.repo.dburl}" />
-			<param name="user" value="${argeo.node.repo.dbuser}" />
-			<param name="password" value="${argeo.node.repo.dbpassword}" />
+			<param name="url" value="${dburl}" />
+			<param name="user" value="${dbuser}" />
+			<param name="password" value="${dbpassword}" />
 			<param name="databaseType" value="postgresql" />
-			<param name="maxPoolSize" value="${argeo.node.repo.maxPoolSize}" />
+			<param name="maxPoolSize" value="${maxPoolSize}" />
 		</DataSource>
 	</DataSources>
 
@@ -20,13 +19,10 @@
 		<param name="schema" value="postgresql" />
 		<param name="schemaObjectPrefix" value="fs_" />
 	</FileSystem>
-	<DataStore class="org.apache.jackrabbit.core.data.FileDataStore">
-		<param name="path" value="${rep.home}/datastore" />
-	</DataStore>
 
 	<!-- Workspace templates -->
 	<Workspaces rootPath="${rep.home}/workspaces"
-		defaultWorkspace="${argeo.node.repo.defaultWorkspace}" />
+		defaultWorkspace="${defaultWorkspace}" />
 	<Workspace name="${wsp.name}">
 		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 			<param name="dataSourceName" value="dataSource" />
@@ -37,10 +33,18 @@
 			class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
+			<param name="bundleCacheSize" value="${bundleCacheMB}" />
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 			<param name="path" value="${wsp.home}/index" />
+			<param name="extractorPoolSize" value="${extractorPoolSize}" />
+			<param name="cacheSize" value="${searchCacheSize}" />
+			<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
 		</SearchIndex>
+		<WorkspaceSecurity>
+			<AccessControlProvider
+				class="org.argeo.security.jackrabbit.ArgeoAccessControlProvider" />
+		</WorkspaceSecurity>
 	</Workspace>
 
 	<!-- Versioning -->
@@ -54,24 +58,22 @@
 			class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schemaObjectPrefix" value="pm_ver_" />
+			<param name="bundleCacheSize" value="${bundleCacheMB}" />
 		</PersistenceManager>
 	</Versioning>
 
 	<!-- Indexing -->
 	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 		<param name="path" value="${rep.home}/index" />
-		<param name="extractorPoolSize" value="2" />
-		<param name="supportHighlighting" value="true" />
+		<param name="extractorPoolSize" value="${extractorPoolSize}" />
+		<param name="cacheSize" value="${searchCacheSize}" />
+		<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
 	</SearchIndex>
 
 	<!-- Security -->
 	<Security appName="Jackrabbit">
 		<SecurityManager class="org.argeo.security.jackrabbit.ArgeoSecurityManager"
-			workspaceName="security">
-		</SecurityManager>
-		<AccessManager class="org.argeo.security.jackrabbit.ArgeoAccessManager">
-		</AccessManager>
-		<LoginModule class="org.argeo.security.jackrabbit.ArgeoLoginModule">
-		</LoginModule>
+			workspaceName="security" />
+		<AccessManager class="org.argeo.security.jackrabbit.ArgeoAccessManager" />
 	</Security>
 </Repository>
\ No newline at end of file