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 1e894a2e60c5786cbca8d219b53c89272c4e2b46..c8e077e2122562a33c4a7a849357ce17eeaaa6f7 100644 (file)
--- 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 1f61ea34222d9e40606b16d6b30b412d949963a6..5d4b60fba034b090e20a184480880fdd67b14aaf 100644 (file)
--- 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