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;
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();
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);
}
}
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;
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 (?)
// 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());
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:
case localfs:
break;
default:
- throw new ArgeoJcrException("Unsupported node type " + type);
+ throw new IllegalArgumentException("Unsupported node type " + type);
}
return props;
}
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;