X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjackrabbit%2FJackrabbitContainer.java;h=6ec6065a542b7f2f3d8f422b9c6bfb9c7bef3609;hb=fea161ce3d77b81ae6ee0a7895f7bd64b4cb618e;hp=1be03827a914aba67432d86df4d7a63729ca096f;hpb=5f82a67c8c2b70c4140c41e45e31d96acc25a401;p=lgpl%2Fargeo-commons.git 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 1be03827a..6ec6065a5 100644 --- 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 @@ -77,6 +77,8 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, /** Namespaces to register: key is prefix, value namespace */ private Map namespaces = new HashMap(); + private Boolean autocreateWorkspaces = false; + public void afterPropertiesSet() throws Exception { // Load cnds as resources for (String resUrl : cndFiles) { @@ -162,7 +164,10 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, try { session = repository.login(credentials, workspaceName); } catch (NoSuchWorkspaceException e) { - session = createWorkspaceAndLogsIn(credentials, workspaceName); + if (autocreateWorkspaces) + session = createWorkspaceAndLogsIn(credentials, workspaceName); + else + throw e; } processNewSession(session); return session; @@ -181,7 +186,10 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, try { session = repository.login(workspaceName); } catch (NoSuchWorkspaceException e) { - session = createWorkspaceAndLogsIn(null, workspaceName); + if (autocreateWorkspaces) + session = createWorkspaceAndLogsIn(null, workspaceName); + else + throw e; } processNewSession(session); return session;