From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 23 Feb 2016 14:06:28 +0000 (+0000)
Subject: Fix PostgreSQL Jackrabbit configs
X-Git-Tag: argeo-commons-2.1.33~4
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=39d2a8a4c4f292eded654dc58bdef5f649df1732;p=lgpl%2Fargeo-commons.git

Fix PostgreSQL Jackrabbit configs

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

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-postgresql-ds.xml b/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-postgresql-ds.xml
index 1e894a2e6..c8e077e21 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-postgresql-ds.xml
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/repository-postgresql-ds.xml
@@ -44,6 +44,10 @@
 			<param name="cacheSize" value="${argeo.node.repo.searchCacheSize}" />
 			<param name="maxVolatileIndexSize" value="${argeo.node.repo.maxVolatileIndexSize}" />
 		</SearchIndex>
+		<WorkspaceSecurity>
+			<AccessControlProvider
+				class="org.argeo.security.jackrabbit.ArgeoAccessControlProvider" />
+		</WorkspaceSecurity>
 	</Workspace>
 
 	<!-- Versioning -->
@@ -72,11 +76,7 @@
 	<!-- 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
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 1f61ea342..5d4b60fba 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
@@ -41,6 +41,10 @@
 			<param name="cacheSize" value="${argeo.node.repo.searchCacheSize}" />
 			<param name="maxVolatileIndexSize" value="${argeo.node.repo.maxVolatileIndexSize}" />
 		</SearchIndex>
+		<WorkspaceSecurity>
+			<AccessControlProvider
+				class="org.argeo.security.jackrabbit.ArgeoAccessControlProvider" />
+		</WorkspaceSecurity>
 	</Workspace>
 
 	<!-- Versioning -->
@@ -69,11 +73,7 @@
 	<!-- 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