From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 24 Feb 2014 08:55:27 +0000 (+0000)
Subject: Use file-based datastore for PostgreSQL
X-Git-Tag: argeo-slc-2.1.7~247
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=bc1831943cad811b8d73567072351d670cde83f8;p=gpl%2Fargeo-slc.git

Use file-based datastore for PostgreSQL

git-svn-id: https://svn.argeo.org/slc/trunk@6848 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/modules/org.argeo.slc.server.repo/repository-pg-dist.xml b/modules/org.argeo.slc.server.repo/repository-pg-dist.xml
index b4adf4013..f140d20f8 100644
--- a/modules/org.argeo.slc.server.repo/repository-pg-dist.xml
+++ b/modules/org.argeo.slc.server.repo/repository-pg-dist.xml
@@ -18,7 +18,7 @@
 	<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 		<param name="dataSourceName" value="dataSource" />
 		<param name="schema" value="postgresql" />
-		<param name="schemaObjectPrefix" value="fs_" />
+		<param name="schemaObjectPrefix" value="_fs_" />
 	</FileSystem>
 	<DataStore class="org.apache.jackrabbit.core.data.FileDataStore">
 		<param name="path" value="${rep.home}/datastore" />
@@ -31,12 +31,12 @@
 		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schema" value="postgresql" />
-			<param name="schemaObjectPrefix" value="${wsp.name}_fs_" />
+			<param name="schemaObjectPrefix" value="${wsp.name}_" />
 		</FileSystem>
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
-			<param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
+			<param name="schemaObjectPrefix" value="${wsp.name}_" />
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 			<param name="path" value="${rep.home}/indexes/workspaces/${wsp.name}" />
@@ -48,12 +48,12 @@
 		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schema" value="postgresql" />
-			<param name="schemaObjectPrefix" value="fs_ver_" />
+			<param name="schemaObjectPrefix" value="_versioning_" />
 		</FileSystem>
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
-			<param name="schemaObjectPrefix" value="pm_ver_" />
+			<param name="schemaObjectPrefix" value="_versioning_" />
 		</PersistenceManager>
 	</Versioning>
 
diff --git a/modules/org.argeo.slc.server.repo/repository-pg-docs.xml b/modules/org.argeo.slc.server.repo/repository-pg-docs.xml
index 9eff12861..b59162d01 100644
--- a/modules/org.argeo.slc.server.repo/repository-pg-docs.xml
+++ b/modules/org.argeo.slc.server.repo/repository-pg-docs.xml
@@ -18,12 +18,12 @@
 	<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 		<param name="dataSourceName" value="dataSource" />
 		<param name="schema" value="postgresql" />
-		<param name="schemaObjectPrefix" value="fs_" />
+		<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="main" />
@@ -31,12 +31,12 @@
 		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schema" value="postgresql" />
-			<param name="schemaObjectPrefix" value="${wsp.name}_fs_" />
+			<param name="schemaObjectPrefix" value="${wsp.name}_" />
 		</FileSystem>
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
-			<param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
+			<param name="schemaObjectPrefix" value="${wsp.name}_" />
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 			<param name="path" value="${rep.home}/indexes/workspaces/${wsp.name}" />
@@ -48,12 +48,12 @@
 		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schema" value="postgresql" />
-			<param name="schemaObjectPrefix" value="fs_ver_" />
+			<param name="schemaObjectPrefix" value="_versioning_" />
 		</FileSystem>
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
-			<param name="schemaObjectPrefix" value="pm_ver_" />
+			<param name="schemaObjectPrefix" value="_versioning_" />
 		</PersistenceManager>
 	</Versioning>
 
diff --git a/modules/org.argeo.slc.server.repo/repository-pg-java.xml b/modules/org.argeo.slc.server.repo/repository-pg-java.xml
index 0af8de07e..ff600c99a 100644
--- a/modules/org.argeo.slc.server.repo/repository-pg-java.xml
+++ b/modules/org.argeo.slc.server.repo/repository-pg-java.xml
@@ -18,12 +18,12 @@
 	<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 		<param name="dataSourceName" value="dataSource" />
 		<param name="schema" value="postgresql" />
-		<param name="schemaObjectPrefix" value="fs_" />
+		<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="main" />
@@ -31,12 +31,12 @@
 		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schema" value="postgresql" />
-			<param name="schemaObjectPrefix" value="${wsp.name}_fs_" />
+			<param name="schemaObjectPrefix" value="${wsp.name}_" />
 		</FileSystem>
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
-			<param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
+			<param name="schemaObjectPrefix" value="${wsp.name}_" />
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 			<param name="path" value="${rep.home}/indexes/workspaces/${wsp.name}" />
@@ -48,12 +48,12 @@
 		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schema" value="postgresql" />
-			<param name="schemaObjectPrefix" value="fs_ver_" />
+			<param name="schemaObjectPrefix" value="_versioning_" />
 		</FileSystem>
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
-			<param name="schemaObjectPrefix" value="pm_ver_" />
+			<param name="schemaObjectPrefix" value="_versioning_" />
 		</PersistenceManager>
 	</Versioning>
 
diff --git a/modules/org.argeo.slc.server.repo/repository-pg-rpm.xml b/modules/org.argeo.slc.server.repo/repository-pg-rpm.xml
index 817b549ab..b9f6d84d2 100644
--- a/modules/org.argeo.slc.server.repo/repository-pg-rpm.xml
+++ b/modules/org.argeo.slc.server.repo/repository-pg-rpm.xml
@@ -18,7 +18,7 @@
 	<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 		<param name="dataSourceName" value="dataSource" />
 		<param name="schema" value="postgresql" />
-		<param name="schemaObjectPrefix" value="fs_" />
+		<param name="schemaObjectPrefix" value="_fs_" />
 	</FileSystem>
 	<DataStore class="org.apache.jackrabbit.core.data.FileDataStore">
 		<param name="path" value="${rep.home}/datastore" />
@@ -31,12 +31,12 @@
 		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schema" value="postgresql" />
-			<param name="schemaObjectPrefix" value="${wsp.name}_fs_" />
+			<param name="schemaObjectPrefix" value="${wsp.name}_" />
 		</FileSystem>
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
-			<param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
+			<param name="schemaObjectPrefix" value="${wsp.name}_" />
 		</PersistenceManager>
 		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
 			<param name="path" value="${rep.home}/indexes/workspaces/${wsp.name}" />
@@ -48,12 +48,12 @@
 		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
 			<param name="dataSourceName" value="dataSource" />
 			<param name="schema" value="postgresql" />
-			<param name="schemaObjectPrefix" value="fs_ver_" />
+			<param name="schemaObjectPrefix" value="_versioning_" />
 		</FileSystem>
 		<PersistenceManager
 			class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
 			<param name="dataSourceName" value="dataSource" />
-			<param name="schemaObjectPrefix" value="pm_ver_" />
+			<param name="schemaObjectPrefix" value="_versioning_" />
 		</PersistenceManager>
 	</Versioning>