X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FRepositoryBuilder.java;h=f866c2b99a346c7884a72193d2eeaa5dd17db349;hb=18af628c072e386420f03261ab207a72341a0a1b;hp=abfb44642b137cfc8856732ae4da3553b5a66a0f;hpb=2d6b7c0c3badea29451c4d8e41ebb5aca2258806;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryBuilder.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryBuilder.java
index abfb44642..f866c2b99 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryBuilder.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryBuilder.java
@@ -24,12 +24,8 @@ 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.jcr.ArgeoJcrConstants;
 import org.argeo.jcr.ArgeoJcrException;
 import org.argeo.node.NodeConstants;
-import org.argeo.node.RepoConf;
-import org.osgi.framework.Constants;
-import org.osgi.service.cm.ConfigurationAdmin;
 import org.xml.sax.InputSource;
 
 /** Can interpret properties in order to create an actual JCR repository. */
@@ -59,25 +55,26 @@ class RepositoryBuilder {
 		InputStream in = null;
 		try {
 			final String base = "/org/argeo/cms/internal/kernel";
-			switch (type) {
-			case h2:
-				in = cl.getResourceAsStream(base + "/repository-h2.xml");
-				break;
-			case postgresql:
-				in = cl.getResourceAsStream(base + "/repository-postgresql.xml");
-				break;
-			case postgresql_ds:
-				in = cl.getResourceAsStream(base + "/repository-postgresql-ds.xml");
-				break;
-			case memory:
-				in = cl.getResourceAsStream(base + "/repository-memory.xml");
-				break;
-			case localfs:
-				in = cl.getResourceAsStream(base + "/repository-localfs.xml");
-				break;
-			default:
-				throw new ArgeoJcrException("Unsupported node type " + type);
-			}
+//			switch (type) {
+//			case h2:
+//				in = cl.getResourceAsStream(base + "/repository-h2.xml");
+//				break;
+//			case postgresql:
+//				in = cl.getResourceAsStream(base + "/repository-postgresql.xml");
+//				break;
+//			case postgresql_ds:
+//				in = cl.getResourceAsStream(base + "/repository-postgresql-ds.xml");
+//				break;
+//			case memory:
+//				in = cl.getResourceAsStream(base + "/repository-memory.xml");
+//				break;
+//			case localfs:
+//				in = cl.getResourceAsStream(base + "/repository-localfs.xml");
+//				break;
+//			default:
+//				throw new ArgeoJcrException("Unsupported node type " + type);
+//			}
+			in = cl.getResourceAsStream(base + "/repository-"+type.name()+".xml");
 
 			if (in == null)
 				throw new ArgeoJcrException("Repository configuration not found");
@@ -156,6 +153,8 @@ class RepositoryBuilder {
 			setProp(props, RepoConf.dbpassword, "");
 			break;
 		case postgresql:
+		case postgresql_ds:
+		case postgresql_cluster:
 			dburl = "jdbc:postgresql://localhost/demo";
 			setProp(props, RepoConf.dburl, dburl);
 			setProp(props, RepoConf.dbuser, "argeo");