X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Forg.argeo.slc.server.repo%2Frepository-h2.xml;h=372045c8d3a7fadd5c4bf8f46bc1a33e9153c044;hb=d9c895a0468df66827e550bb7fec10b2f5a10981;hp=2f5c774d5954121838ebbb37fb4a7a27e542def4;hpb=651d33e13bfa9a7b46464be412023ee747e612e8;p=gpl%2Fargeo-slc.git

diff --git a/modules/org.argeo.slc.server.repo/repository-h2.xml b/modules/org.argeo.slc.server.repo/repository-h2.xml
index 2f5c774d5..372045c8d 100644
--- a/modules/org.argeo.slc.server.repo/repository-h2.xml
+++ b/modules/org.argeo.slc.server.repo/repository-h2.xml
@@ -7,32 +7,31 @@
 		<DataSource name="dataSource">
 			<param name="driver" value="org.h2.Driver" />
 			<param name="url" value="jdbc:h2:${rep.home}/h2/repository" />
-			<param name="user" value="sa" />
-			<param name="password" value="" />
+			<param name="user" value="${slc.repo.jcr.dbuser}" />
+			<param name="password" value="${slc.repo.jcr.dbpassword}" />
 			<param name="databaseType" value="h2" />
-			<param name="maxPoolSize" value="30" />
+			<param name="maxPoolSize" value="${slc.repo.jcr.maxPoolSize}" />
 		</DataSource>
 	</DataSources>
 
-	<!-- File system and datastore -->
-	<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
-		<param name="dataSourceName" value="dataSource" />
-		<param name="schema" value="default" />
-		<param name="schemaObjectPrefix" value="fs_" />
+	<!-- Repository wide -->
+	<DataStore class="org.apache.jackrabbit.core.data.FileDataStore">
+		<param name="path" value="${rep.home}/datastore" />
+		<param name="minRecordLength" value="10240" />
+	</DataStore>
+	<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+		<param name="path" value="${rep.home}/fs" />
 	</FileSystem>
-	<DataStore class="org.apache.jackrabbit.core.data.FileDataStore" />
-	<!-- <DataStore class="org.apache.jackrabbit.core.data.db.DbDataStore"> 
-		<param name="dataSourceName" value="dataSource" /> <param name="schemaObjectPrefix" 
-		value="ds_" /> </DataStore> -->
+	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+		<param name="path" value="${rep.home}/indexes/repository" />
+	</SearchIndex>
 
-	<!-- Workspace templates -->
+	<!-- Workspaces -->
 	<Workspaces rootPath="${rep.home}/workspaces"
 		defaultWorkspace="main" />
 	<Workspace name="${wsp.name}">
-		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
-			<param name="dataSourceName" value="dataSource" />
-			<param name="schema" value="default" />
-			<param name="schemaObjectPrefix" value="${wsp.name}_fs_" />
+		<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+			<param name="path" value="${wsp.home}/fs" />
 		</FileSystem>
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
@@ -40,16 +39,14 @@
 			<param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-			<param name="path" value="${wsp.home}/index" />
+			<param name="path" value="${rep.home}/indexes/workspaces/${wsp.name}" />
 		</SearchIndex>
 	</Workspace>
 
 	<!-- Versioning -->
 	<Versioning rootPath="${rep.home}/version">
-		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
-			<param name="dataSourceName" value="dataSource" />
-			<param name="schema" value="default" />
-			<param name="schemaObjectPrefix" value="fs_ver_" />
+		<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+			<param name="path" value="${rep.home}/version/fs" />
 		</FileSystem>
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
@@ -58,13 +55,6 @@
 		</PersistenceManager>
 	</Versioning>
 
-	<!-- Indexing -->
-	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-		<param name="path" value="${rep.home}/repository/index" />
-		<param name="extractorPoolSize" value="2" />
-		<param name="supportHighlighting" value="true" />
-	</SearchIndex>
-
 	<!-- Security -->
 	<Security appName="Jackrabbit">
 		<SecurityManager class="org.argeo.security.jackrabbit.ArgeoSecurityManager"