X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FArgeoJcrUtils.java;h=dccb06cf4446b942c7bbef9618d4808564f7b4c3;hb=cd50e3711d3b86921f11d9e021fc6a43bef0d400;hp=b0d775779a7f5fa4053077c8480cbee551900c4d;hpb=2c4852dcd20d4cde88776c527ae935f242ae1e77;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrUtils.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrUtils.java
index b0d775779..dccb06cf4 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrUtils.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrUtils.java
@@ -1,66 +1,31 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * 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.jcr;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.RepositoryFactory;
-import javax.jcr.Session;
 
 import org.argeo.ArgeoException;
 
 /** Utilities related to Argeo model in JCR */
 public class ArgeoJcrUtils implements ArgeoJcrConstants {
-	/**
-	 * Returns the home node of the session user or null if none was found.
-	 * 
-	 * @param session
-	 *            the session to use in order to perform the search, this can be
-	 *            a session with a different user ID than the one searched,
-	 *            typically when a system or admin session is used.
-	 * @param username
-	 *            the username of the user
-	 */
-	public static Node getUserHome(Session session, String username) {
-		try {
-			String homePath = ArgeoJcrUtils.getUserHomePath(username);
-			return session.itemExists(homePath) ? session.getNode(homePath)
-					: null;
-			// kept for example of QOM queries
-			// QueryObjectModelFactory qomf = session.getWorkspace()
-			// .getQueryManager().getQOMFactory();
-			// Selector userHomeSel = qomf.selector(ArgeoTypes.ARGEO_USER_HOME,
-			// "userHome");
-			// DynamicOperand userIdDop = qomf.propertyValue("userHome",
-			// ArgeoNames.ARGEO_USER_ID);
-			// StaticOperand userIdSop = qomf.literal(session.getValueFactory()
-			// .createValue(username));
-			// Constraint constraint = qomf.comparison(userIdDop,
-			// QueryObjectModelFactory.JCR_OPERATOR_EQUAL_TO, userIdSop);
-			// Query query = qomf.createQuery(userHomeSel, constraint, null,
-			// null);
-			// Node userHome = JcrUtils.querySingleNode(query);
-		} catch (RepositoryException e) {
-			throw new ArgeoException("Cannot find home for user " + username, e);
-		}
-	}
-
-	/** Returns the home node of the session user or null if none was found. */
-	public static Node getUserHome(Session session) {
-		String userID = session.getUserID();
-		return getUserHome(session, userID);
-	}
-
-	/** @deprecated Use {@link #getUserHome(Session, String)} directly */
-	@Deprecated
-	public static String getUserHomePath(String username) {
-		String homeBasePath = DEFAULT_HOME_BASE_PATH;
-		return homeBasePath + '/' + JcrUtils.firstCharsToPath(username, 2)
-				+ '/' + username;
-	}
-
 	/**
 	 * Wraps the call to the repository factory based on parameter
 	 * {@link ArgeoJcrConstants#JCR_REPOSITORY_ALIAS} in order to simplify it
@@ -86,9 +51,21 @@ public class ArgeoJcrUtils implements ArgeoJcrConstants {
 	 */
 	public static Repository getRepositoryByUri(
 			RepositoryFactory repositoryFactory, String uri) {
+		return getRepositoryByUri(repositoryFactory, uri, null);
+	}
+
+	/**
+	 * Wraps the call to the repository factory based on parameter
+	 * {@link ArgeoJcrConstants#JCR_REPOSITORY_URI} in order to simplify it and
+	 * protect against future API changes.
+	 */
+	public static Repository getRepositoryByUri(
+			RepositoryFactory repositoryFactory, String uri, String alias) {
 		try {
 			Map<String, String> parameters = new HashMap<String, String>();
 			parameters.put(JCR_REPOSITORY_URI, uri);
+			if (alias != null)
+				parameters.put(JCR_REPOSITORY_ALIAS, alias);
 			return repositoryFactory.getRepository(parameters);
 		} catch (RepositoryException e) {
 			throw new ArgeoException(