X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2Frepository-h2.xml;h=05267621f7d951046b16a70fd7399821bd986ff5;hb=ba8f8a6fb8ad9649dd03b2ac4670d194f0e1be79;hp=ae6367418fde0f3325ec5c7079253f600e2633a5;hpb=bedec814b105c1cc53f2beadfe36d76e42c9a02e;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-h2.xml b/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-h2.xml
index ae6367418..05267621f 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-h2.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-h2.xml
@@ -5,11 +5,11 @@
 	<DataSources>
 		<DataSource name="dataSource">
 			<param name="driver" value="org.h2.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="h2" />
-			<param name="maxPoolSize" value="${argeo.node.repo.maxPoolSize}" />
+			<param name="maxPoolSize" value="${maxPoolSize}" />
 		</DataSource>
 	</DataSources>
 
@@ -25,7 +25,7 @@
 
 	<!-- 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" />
@@ -36,13 +36,13 @@
 			class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
-			<param name="bundleCacheSize" value="${argeo.node.repo.bundleCacheMB}" />
+			<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="${argeo.node.repo.extractorPoolSize}" />
-			<param name="cacheSize" value="${argeo.node.repo.searchCacheSize}" />
-			<param name="maxVolatileIndexSize" value="${argeo.node.repo.maxVolatileIndexSize}" />
+			<param name="extractorPoolSize" value="${extractorPoolSize}" />
+			<param name="cacheSize" value="${searchCacheSize}" />
+			<param name="maxVolatileIndexSize" value="${maxVolatileIndexSize}" />
 		</SearchIndex>
 		<WorkspaceSecurity>
 			<AccessControlProvider
@@ -61,26 +61,22 @@
 			class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schemaObjectPrefix" value="pm_ver_" />
-			<param name="bundleCacheSize" value="${argeo.node.repo.bundleCacheMB}" />
+			<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="${argeo.node.repo.extractorPoolSize}" />
-		<param name="cacheSize" value="${argeo.node.repo.searchCacheSize}" />
-		<param name="maxVolatileIndexSize" value="${argeo.node.repo.maxVolatileIndexSize}" />
+		<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