X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fjcr%2FRepositoryBuilder.java;h=bc6a82626cc70b0a92c3e1839a0dfa662af37c99;hb=b5644c1dac96afe8b9bdcd68068c054a9f780926;hp=b3ab11a3357f0c4d0ff3e1c38590f511dc6919e1;hpb=163d57530b5cddc5df72e6e5985224cccd9e2232;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 b3ab11a33..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
@@ -21,10 +21,10 @@ import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.cache.CacheManager;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
 import org.apache.jackrabbit.core.config.RepositoryConfigurationParser;
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.internal.kernel.CmsPaths;
 import org.argeo.jcr.ArgeoJcrException;
-import org.argeo.node.NodeConstants;
 import org.xml.sax.InputSource;
 
 /** Can interpret properties in order to create an actual JCR repository. */
@@ -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;
 		}
 	}