X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjackrabbit%2FJackrabbitRepositoryFactory.java;h=1f2ec2ae2c16716ad020af4cb576be50bc043b1d;hb=d911416648a69f8140e03aa7248c4eb38e96e90f;hp=6fe5bf3406bcde3bcb3b5d6de7649d2209e40bb5;hpb=8b8ee149b20e2578a55e17413fa5f7399ff7ba14;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java
index 6fe5bf340..1f2ec2ae2 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java
@@ -1,7 +1,25 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.jackrabbit;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -15,35 +33,80 @@ import org.argeo.ArgeoException;
 import org.argeo.jcr.ArgeoJcrConstants;
 import org.argeo.jcr.DefaultRepositoryFactory;
 
-/** Repository factory which can access remote Jackrabbit repositories */
+/**
+ * Repository factory which can create new repositories and access remote
+ * Jackrabbit repositories
+ */
 public class JackrabbitRepositoryFactory extends DefaultRepositoryFactory
 		implements RepositoryFactory, ArgeoJcrConstants {
 	private final static Log log = LogFactory
 			.getLog(JackrabbitRepositoryFactory.class);
 
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public Repository getRepository(Map parameters) throws RepositoryException {
+		// check if can be found by alias
 		Repository repository = super.getRepository(parameters);
 		if (repository != null)
 			return repository;
 
-		String uri;
+		// check if remote
+		String uri = null;
 		if (parameters.containsKey(JCR_REPOSITORY_URI))
 			uri = parameters.get(JCR_REPOSITORY_URI).toString();
 		else if (parameters.containsKey(JcrUtils.REPOSITORY_URI))
 			uri = parameters.get(JcrUtils.REPOSITORY_URI).toString();
-		else
-			return null;
 
+		if (uri != null) {
+			if (uri.startsWith("http"))// http, https
+				repository = createRemoteRepository(uri);
+			else if (uri.startsWith("vm")) {
+				try {
+					URI uriObj = new URI(uri);
+					String alias = uriObj.getPath();
+					if (alias.charAt(0) == '/')
+						alias = alias.substring(1);
+					if (alias.charAt(alias.length() - 1) == '/')
+						alias = alias.substring(0, alias.length() - 1);
+					repository = getRepositoryByAlias(alias);
+				} catch (URISyntaxException e) {
+					throw new ArgeoException("Cannot interpret URI " + uri, e);
+				}
+			}
+		}
+
+		// publish under alias
+		if (parameters.containsKey(JCR_REPOSITORY_ALIAS)) {
+			Properties properties = new Properties();
+			properties.putAll(parameters);
+			String alias = parameters.get(JCR_REPOSITORY_ALIAS).toString();
+			publish(alias, repository, properties);
+			log.info("Registered JCR repository under alias '" + alias
+					+ "' with properties " + properties);
+		}
+
+		return repository;
+	}
+
+	protected Repository createRemoteRepository(String uri)
+			throws RepositoryException {
 		Map<String, String> params = new HashMap<String, String>();
 		params.put(JcrUtils.REPOSITORY_URI, uri);
-		repository = new Jcr2davRepositoryFactory().getRepository(params);
+		Repository repository = new Jcr2davRepositoryFactory()
+				.getRepository(params);
 		if (repository == null)
 			throw new ArgeoException("Remote Davex repository " + uri
 					+ " not found");
-		log.info("Initialized remote Jackrabbit repository " + repository
-				+ " from uri " + uri);
-
+		log.info("Initialized remote Jackrabbit repository from uri " + uri);
 		return repository;
 	}
+
+	/**
+	 * Called after the repository has been initialised. Does nothing by
+	 * default.
+	 */
+	@SuppressWarnings("rawtypes")
+	protected void postInitialization(Repository repository, Map parameters) {
+
+	}
+
 }