X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjackrabbit%2FJackrabbitContainer.java;h=c828d703a7daa6bd2a9ae320cf474e4f07dd1187;hb=24652d1f8e6e8293ebae76121f0369a262ba503a;hp=87738a5cdc5dbb2b589652b502f6988136561488;hpb=9ecac0dc0810a3cabf8eb75951f1b7a3c149ae94;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 87738a5cd..c828d703a 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 @@ -38,12 +38,16 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.jackrabbit.api.JackrabbitRepository; +import org.apache.jackrabbit.commons.JcrUtils; import org.apache.jackrabbit.commons.NamespaceHelper; import org.apache.jackrabbit.commons.cnd.CndImporter; +import org.apache.jackrabbit.core.RepositoryFactoryImpl; 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.apache.jackrabbit.jcr2dav.Jcr2davRepositoryFactory; import org.argeo.ArgeoException; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; @@ -65,6 +69,7 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, private Resource variables; private Boolean inMemory = false; + private String uri = null; private Repository repository; @@ -77,53 +82,71 @@ 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) { - Resource res = resourceLoader.getResource(resUrl); byte[] arr = IOUtils.toByteArray(res.getInputStream()); cnds.add(arr); } - if (inMemory && homeDirectory.exists()) { - FileUtils.deleteDirectory(homeDirectory); - log.warn("Deleted Jackrabbit home directory " + homeDirectory); - } + if (uri != null) { + // Thread.currentThread().setContextClassLoader( + // getClass().getClassLoader()); + // repository = JcrUtils.getRepository(uri); + Map params = new HashMap(); + params.put(JcrUtils.REPOSITORY_URI, uri); + repository = new Jcr2davRepositoryFactory().getRepository(params); + if (repository == null) + throw new ArgeoException("Remote Davex repository " + uri + + " not found"); + log.info("Initialized Jackrabbit repository " + repository + + " from uri " + uri); + } else { + if (inMemory && homeDirectory.exists()) { + FileUtils.deleteDirectory(homeDirectory); + log.warn("Deleted Jackrabbit home directory " + homeDirectory); + } - RepositoryConfig config; - InputStream in = configuration.getInputStream(); - InputStream propsIn = null; - try { - Properties vars = new Properties(); - if (variables != null) { - propsIn = variables.getInputStream(); - vars.load(propsIn); + RepositoryConfig config; + InputStream in = configuration.getInputStream(); + InputStream propsIn = null; + try { + 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); } - // 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) - repository = new TransientRepository(config); - else - repository = RepositoryImpl.create(config); + if (inMemory) + repository = new TransientRepository(config); + else + repository = RepositoryImpl.create(config); - log.info("Initialized Jackrabbit repository " + repository + " in " - + homeDirectory + " with config " + configuration); + log.info("Initialized Jackrabbit repository " + repository + " in " + + homeDirectory + " with config " + configuration); + } } public void destroy() throws Exception { if (repository != null) { - if (repository instanceof RepositoryImpl) + if (repository instanceof JackrabbitRepository) + ((JackrabbitRepository) repository).shutdown(); + else if (repository instanceof RepositoryImpl) ((RepositoryImpl) repository).shutdown(); else if (repository instanceof TransientRepository) ((TransientRepository) repository).shutdown(); @@ -136,8 +159,12 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, log.debug("Deleted Jackrabbit home directory " + homeDirectory); } - log.info("Destroyed Jackrabbit repository " + repository + " in " - + homeDirectory + " with config " + configuration); + + if (uri != null) + log.info("Destroyed Jackrabbit repository with uri " + uri); + else + log.info("Destroyed Jackrabbit repository " + repository + " in " + + homeDirectory + " with config " + configuration); } // JCR REPOSITORY (delegated) @@ -158,7 +185,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; } @@ -172,7 +207,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; } @@ -190,6 +233,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; } @@ -235,4 +292,8 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, this.variables = variables; } + public void setUri(String uri) { + this.uri = uri; + } + }