X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fjcr%2FRepositoryBuilder.java;h=bc6a82626cc70b0a92c3e1839a0dfa662af37c99;hb=a5041ede454d2cb851aa2908f75e25fce43e639a;hp=872d8ae531e977d3ea58a16859f184e3692813f7;hpb=c5e7dfede43f8b53710baa406b334792a7603d45;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java b/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java
index 872d8ae53..bc6a82626 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java
@@ -58,7 +58,21 @@ public class RepositoryBuilder {
 				throw new ArgeoJcrException("Repository configuration not found");
 			InputSource config = new InputSource(in);
 			Properties jackrabbitVars = getConfigurationProperties(type, properties);
-			RepositoryConfig repositoryConfig = RepositoryConfig.create(config, jackrabbitVars);
+			// RepositoryConfig repositoryConfig = RepositoryConfig.create(config,
+			// jackrabbitVars);
+
+			// custom configuration parser
+			CustomRepositoryConfigurationParser parser = new CustomRepositoryConfigurationParser(jackrabbitVars);
+			parser.setAccessControlProviderClassLoader(cl);
+			RepositoryConfig repositoryConfig = parser.parseRepositoryConfig(config);
+			repositoryConfig.init();
+
+			// set the proper classloaders
+			repositoryConfig.getSecurityConfig().getSecurityManagerConfig().setClassLoader(cl);
+			repositoryConfig.getSecurityConfig().getAccessManagerConfig().setClassLoader(cl);
+//			for (WorkspaceConfig workspaceConfig : repositoryConfig.getWorkspaceConfigs()) {
+//				workspaceConfig.getSecurityConfig().getAccessControlProviderConfig().setClassLoader(cl);
+//			}
 			return repositoryConfig;
 		}
 	}