X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fjcr%2FRepositoryBuilder.java;h=fbb1e4f7a03f1a380f549b07da5fc952498ba84a;hb=0503cddd26f3795a640d74c0ebbbcf0625f24cae;hp=d5f3a20cd5b6a0c8650d8c0dc999d5cd05fefb52;hpb=12c44296992a48de65fe6864a6ed005f03264fcf;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 d5f3a20cd..fbb1e4f7a 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
@@ -14,7 +14,6 @@ import java.util.UUID;
 
 import javax.jcr.RepositoryException;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.core.RepositoryContext;
@@ -22,17 +21,16 @@ 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.cms.CmsException;
+import org.argeo.api.NodeConstants;
 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. */
 public class RepositoryBuilder {
 	private final static Log log = LogFactory.getLog(RepositoryBuilder.class);
 
-	public RepositoryContext createRepositoryContext(Dictionary<String, ?> properties) throws RepositoryException {
+	public RepositoryContext createRepositoryContext(Dictionary<String, ?> properties)
+			throws RepositoryException, IOException {
 		RepositoryConfig repositoryConfig = createRepositoryConfig(properties);
 		RepositoryContext repositoryContext = createJackrabbitRepository(repositoryConfig);
 		RepositoryImpl repository = repositoryContext.getRepository();
@@ -49,22 +47,31 @@ public class RepositoryBuilder {
 		return repositoryContext;
 	}
 
-	RepositoryConfig createRepositoryConfig(Dictionary<String, ?> properties) throws RepositoryException {
+	RepositoryConfig createRepositoryConfig(Dictionary<String, ?> properties) throws RepositoryException, IOException {
 		JackrabbitType type = JackrabbitType.valueOf(prop(properties, RepoConf.type).toString());
 		ClassLoader cl = getClass().getClassLoader();
-		InputStream in = null;
-		try {
-			final String base = "/org/argeo/cms/internal/jcr";
-			in = cl.getResourceAsStream(base + "/repository-" + type.name() + ".xml");
-
+		final String base = "/org/argeo/cms/internal/jcr";
+		try (InputStream in = cl.getResourceAsStream(base + "/repository-" + type.name() + ".xml")) {
 			if (in == null)
-				throw new ArgeoJcrException("Repository configuration not found");
+				throw new IllegalArgumentException("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.setClassLoader(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;
-		} finally {
-			IOUtils.closeQuietly(in);
 		}
 	}
 
@@ -82,7 +89,7 @@ public class RepositoryBuilder {
 		String clusterIdProp = props.getProperty(RepoConf.clusterId.name());
 		if (clusterId != null) {
 			if (clusterIdProp != null)
-				throw new CmsException("Cluster id defined as System properties and in deploy config");
+				throw new IllegalArgumentException("Cluster id defined as System properties and in deploy config");
 			props.put(RepoConf.clusterId.name(), clusterId);
 		} else {
 			clusterId = clusterIdProp;
@@ -110,7 +117,7 @@ public class RepositoryBuilder {
 					throw new IllegalArgumentException("Cannot manage repository path for host " + host);
 				}
 			} catch (URISyntaxException e) {
-				throw new CmsException("Invalid repository home URI", e);
+				throw new IllegalArgumentException("Invalid repository home URI", e);
 			}
 		}
 		// TODO use Jackrabbit API (?)
@@ -123,7 +130,7 @@ public class RepositoryBuilder {
 			// File homeDir = homePath.toFile();
 			// homeDir.mkdirs();
 		} catch (IOException e) {
-			throw new CmsException("Cannot set up repository  home " + homePath, e);
+			throw new RuntimeException("Cannot set up repository  home " + homePath, e);
 		}
 		// home cannot be overridden
 		props.put(RepositoryConfigurationParser.REPOSITORY_HOME_VARIABLE, homePath.toString());
@@ -148,6 +155,12 @@ public class RepositoryBuilder {
 			setProp(props, RepoConf.dbuser, "sa");
 			setProp(props, RepoConf.dbpassword, "");
 			break;
+		case h2_postgresql:
+			dburl = "jdbc:h2:" + homePath.toAbsolutePath() + "/h2/repository;MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE";
+			setProp(props, RepoConf.dburl, dburl);
+			setProp(props, RepoConf.dbuser, "sa");
+			setProp(props, RepoConf.dbpassword, "");
+			break;
 		case postgresql:
 		case postgresql_ds:
 		case postgresql_cluster:
@@ -162,7 +175,7 @@ public class RepositoryBuilder {
 		case localfs:
 			break;
 		default:
-			throw new ArgeoJcrException("Unsupported node type " + type);
+			throw new IllegalArgumentException("Unsupported node type " + type);
 		}
 		return props;
 	}
@@ -200,8 +213,8 @@ public class RepositoryBuilder {
 			RepositoryContext repositoryContext = RepositoryContext.create(repositoryConfig);
 
 			double duration = ((double) (System.currentTimeMillis() - begin)) / 1000;
-			if (log.isTraceEnabled())
-				log.trace(
+			if (log.isDebugEnabled())
+				log.debug(
 						"Created Jackrabbit repository in " + duration + " s, home: " + repositoryConfig.getHomeDir());
 
 			return repositoryContext;