Improve JCR

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.jackrabbit / src / main / java / org / argeo / server / jackrabbit / JackrabbitContainer.java

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java
index 87738a5cdc5dbb2b589652b502f6988136561488..1be03827a914aba67432d86df4d7a63729ca096f 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java
@@ -158,7 +158,12 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
        public Session login(Credentials credentials, String workspaceName)
                        throws LoginException, NoSuchWorkspaceException,
                        RepositoryException {
-               Session session = repository.login(credentials, workspaceName);
+               Session session;
+               try {
+                       session = repository.login(credentials, workspaceName);
+               } catch (NoSuchWorkspaceException e) {
+                       session = createWorkspaceAndLogsIn(credentials, workspaceName);
+               }
                processNewSession(session);
                return session;
        }
@@ -172,7 +177,12 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 
        public Session login(String workspaceName) throws LoginException,
                        NoSuchWorkspaceException, RepositoryException {
-               Session session = repository.login(workspaceName);
+               Session session;
+               try {
+                       session = repository.login(workspaceName);
+               } catch (NoSuchWorkspaceException e) {
+                       session = createWorkspaceAndLogsIn(null, workspaceName);
+               }
                processNewSession(session);
                return session;
        }
@@ -190,6 +200,20 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
                }
        }
 
+       /**
+        * Logs in to the default workspace, creates the required workspace, logs
+        * out, logs in to the required workspace.
+        */
+       protected Session createWorkspaceAndLogsIn(Credentials credentials,
+                       String workspaceName) throws RepositoryException {
+               if (workspaceName == null)
+                       throw new ArgeoException("No workspace specified.");
+               Session session = repository.login(credentials);
+               session.getWorkspace().createWorkspace(workspaceName);
+               session.logout();
+               return repository.login(credentials, workspaceName);
+       }
+
        public void setResourceLoader(ResourceLoader resourceLoader) {
                this.resourceLoader = resourceLoader;
        }