Use internal classloader for reading Jackrabbit configurations.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / jcr / RepositoryBuilder.java

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 d4a42fdcc8dff434c11447d28fb3b3a6730372b6..fbb1e4f7a03f1a380f549b07da5fc952498ba84a 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java
@@ -61,7 +61,7 @@ public class RepositoryBuilder {
 
                        // custom configuration parser
                        CustomRepositoryConfigurationParser parser = new CustomRepositoryConfigurationParser(jackrabbitVars);
-                       parser.setAccessControlProviderClassLoader(cl);
+                       parser.setClassLoader(cl);
                        RepositoryConfig repositoryConfig = parser.parseRepositoryConfig(config);
                        repositoryConfig.init();
 
@@ -155,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: