X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FJcrUtils.java;h=b32e4404e61b260b74d4c6c6c78a8612d6b8b034;hb=43179ae5b61ba2dad93b2f74241f0b09572cee54;hp=e2f5b54279ad424ce3aec09248f695d2f1c7ab1c;hpb=9deb8897400020bb4677c6c810e88aaf8079e366;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
index e2f5b5427..b32e4404e 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
@@ -36,6 +36,7 @@ import java.util.TreeMap;
 
 import javax.jcr.Binary;
 import javax.jcr.NamespaceRegistry;
+import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.Property;
@@ -966,6 +967,29 @@ public class JcrUtils implements ArgeoJcrConstants {
 		}
 	}
 
+	/**
+	 * Login to a workspace with implicit credentials, creates the workspace
+	 * with these credentials if it does not already exist.
+	 */
+	public static Session loginOrCreateWorkspace(Repository repository,
+			String workspaceName) throws RepositoryException {
+		Session workspaceSession = null;
+		Session defaultSession = null;
+		try {
+			try {
+				workspaceSession = repository.login(workspaceName);
+			} catch (NoSuchWorkspaceException e) {
+				// try to create workspace
+				defaultSession = repository.login();
+				defaultSession.getWorkspace().createWorkspace(workspaceName);
+				workspaceSession = repository.login(workspaceName);
+			}
+			return workspaceSession;
+		} finally {
+			logoutQuietly(defaultSession);
+		}
+	}
+
 	/** Logs out the session, not throwing any exception, even if it is null. */
 	public static void logoutQuietly(Session session) {
 		try {