X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Fmodules%2Forg.argeo.jackrabbit.localrepo%2Frepository-h2.xml;h=e6e8ac5fa72b3c2125cae7d655581c56776488e2;hb=a9e4e6bdc775333bc89ca1c9a5bcb0a199c5e7ca;hp=7b1d3bf24ece42599b06c6f1bb675d7cd95e34fa;hpb=057d80065bad948930426f87b9a2eb1d4cab3e14;p=lgpl%2Fargeo-commons.git

diff --git a/server/modules/org.argeo.jackrabbit.localrepo/repository-h2.xml b/server/modules/org.argeo.jackrabbit.localrepo/repository-h2.xml
index 7b1d3bf24..e6e8ac5fa 100644
--- a/server/modules/org.argeo.jackrabbit.localrepo/repository-h2.xml
+++ b/server/modules/org.argeo.jackrabbit.localrepo/repository-h2.xml
@@ -2,63 +2,80 @@
 <!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
                             "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
 <Repository>
-	<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-		<param name="path" value="${rep.home}/repository" />
-	</FileSystem>
+	<!-- Shared datasource -->
+	<DataSources>
+		<DataSource name="dataSource">
+			<param name="driver" value="org.h2.Driver" />
+			<param name="url" value="${argeo.localrepo.dburl}" />
+			<param name="user" value="${argeo.localrepo.dbuser}" />
+			<param name="password" value="${argeo.localrepo.dbpassword}" />
+			<param name="databaseType" value="h2" />
+			<param name="maxPoolSize" value="${argeo.localrepo.maxPoolSize}" />
+		</DataSource>
+	</DataSources>
 
-	<Security appName="Jackrabbit">
-		<SecurityManager
-			class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
-			workspaceName="security">
-		</SecurityManager>
-		<AccessManager
-			class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
-			<!-- <param name="config" value="${rep.home}/access.xml"/> -->
-		</AccessManager>
-
-		<LoginModule
-			class="org.springframework.security.providers.jaas.SecurityContextLoginModule">
-		</LoginModule>
-<!--		<LoginModule-->
-<!--			class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">-->
-<!--			<param name="anonymousId" value="anonymous" />-->
-<!--			<param name="adminId" value="admin" />-->
-<!--		</LoginModule>-->
-	</Security>
+	<!-- 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_" />
+	</FileSystem>
+	<DataStore class="org.apache.jackrabbit.core.data.db.DbDataStore">
+		<param name="dataSourceName" value="dataSource" />
+		<param name="schemaObjectPrefix" value="ds_" />
+	</DataStore>
 
+	<!-- Workspace templates -->
 	<Workspaces rootPath="${rep.home}/workspaces"
-		defaultWorkspace="default" />
-
+		defaultWorkspace="prod" />
 	<Workspace name="${wsp.name}">
-		<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-			<param name="path" value="${wsp.home}" />
+		<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>
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
-			<param name="url" value="jdbc:h2:file:${rep.home}/h2/sebi_db" />
-			<param name="schemaObjectPrefix" value="${wsp.name}_" />
+			<param name="dataSourceName" value="dataSource" />
+			<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="extractorPoolSize" value="2" />
-			<param name="supportHighlighting" value="true" />
 		</SearchIndex>
 	</Workspace>
 
+	<!-- Versioning -->
 	<Versioning rootPath="${rep.home}/version">
-		<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-			<param name="path" value="${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>
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
-			<param name="url" value="jdbc:h2:file:${rep.home}/h2/sebi_version" />
-			<param name="schemaObjectPrefix" value="version_" />
+			<param name="dataSourceName" value="dataSource" />
+			<param name="schemaObjectPrefix" value="pm_ver_" />
 		</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>
-</Repository>
+
+	<!-- Security -->
+	<Security appName="Jackrabbit">
+		<SecurityManager
+			class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
+			workspaceName="security">
+		</SecurityManager>
+		<AccessManager
+			class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
+		</AccessManager>
+		<LoginModule
+			class="org.springframework.security.providers.jaas.SecurityContextLoginModule">
+		</LoginModule>
+	</Security>
+</Repository>
\ No newline at end of file