Work on JCR remoting

[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 6bddeefd2d30c9d1cfb964aba9716e4fc3306981..6ec6065a542b7f2f3d8f422b9c6bfb9c7bef3609 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
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 
 import javax.jcr.Credentials;
 import javax.jcr.LoginException;
@@ -42,12 +43,14 @@ import org.apache.jackrabbit.commons.cnd.CndImporter;
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.TransientRepository;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
+import org.apache.jackrabbit.core.config.RepositoryConfigurationParser;
 import org.argeo.ArgeoException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
+import org.xml.sax.InputSource;
 
 /**
  * Wrapper around a Jackrabbit repository which allows to configure it in Spring
@@ -59,6 +62,7 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 
        private Resource configuration;
        private File homeDirectory;
+       private Resource variables;
 
        private Boolean inMemory = false;
 
@@ -73,6 +77,8 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
        /** Namespaces to register: key is prefix, value namespace */
        private Map<String, String> namespaces = new HashMap<String, String>();
 
+       private Boolean autocreateWorkspaces = false;
+
        public void afterPropertiesSet() throws Exception {
                // Load cnds as resources
                for (String resUrl : cndFiles) {
@@ -89,13 +95,23 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 
                RepositoryConfig config;
                InputStream in = configuration.getInputStream();
+               InputStream propsIn = null;
                try {
-                       config = RepositoryConfig.create(in,
+                       Properties vars = new Properties();
+                       if (variables != null) {
+                               propsIn = variables.getInputStream();
+                               vars.load(propsIn);
+                       }
+                       // override with system properties
+                       vars.putAll(System.getProperties());
+                       vars.put(RepositoryConfigurationParser.REPOSITORY_HOME_VARIABLE,
                                        homeDirectory.getCanonicalPath());
+                       config = RepositoryConfig.create(new InputSource(in), vars);
                } catch (Exception e) {
                        throw new RuntimeException("Cannot read configuration", e);
                } finally {
                        IOUtils.closeQuietly(in);
+                       IOUtils.closeQuietly(propsIn);
                }
 
                if (inMemory)
@@ -144,7 +160,15 @@ 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) {
+                       if (autocreateWorkspaces)
+                               session = createWorkspaceAndLogsIn(credentials, workspaceName);
+                       else
+                               throw e;
+               }
                processNewSession(session);
                return session;
        }
@@ -158,7 +182,15 @@ 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) {
+                       if (autocreateWorkspaces)
+                               session = createWorkspaceAndLogsIn(null, workspaceName);
+                       else
+                               throw e;
+               }
                processNewSession(session);
                return session;
        }
@@ -176,6 +208,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;
        }
@@ -217,4 +263,8 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
                this.cndFiles = cndFiles;
        }
 
+       public void setVariables(Resource variables) {
+               this.variables = variables;
+       }
+
 }