X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjackrabbit%2FJackrabbitContainer.java;h=a708aadd1d67a6eada7401b8bcf94d3cf95ff8ad;hb=22365726e2fdcb12e76c3d78060960ae7161628e;hp=294fdd5a3ec6d01f667bb1e360f73a7d868e6ca0;hpb=f8ac1d82b627f2048ba8a21646b9d903004f1504;p=lgpl%2Fargeo-commons.git diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java index 294fdd5a3..a708aadd1 100644 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java @@ -24,14 +24,19 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; +import java.util.TreeSet; +import java.util.UUID; import java.util.concurrent.Executor; import javax.jcr.Credentials; import javax.jcr.LoginException; import javax.jcr.NoSuchWorkspaceException; +import javax.jcr.Node; import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; @@ -50,9 +55,8 @@ 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.argeo.jcr.ArgeoNames; import org.argeo.jcr.JcrUtils; -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; @@ -63,8 +67,7 @@ import org.xml.sax.InputSource; * Wrapper around a Jackrabbit repository which allows to configure it in Spring * and expose it as a {@link Repository}. */ -public class JackrabbitContainer implements InitializingBean, DisposableBean, - Repository, ResourceLoaderAware { +public class JackrabbitContainer implements Repository, ResourceLoaderAware { private Log log = LogFactory.getLog(JackrabbitContainer.class); private Resource configuration; @@ -74,111 +77,189 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, private Boolean inMemory = false; private String uri = null; + // wrapped repository private Repository repository; + private RepositoryConfig repositoryConfig; + // CND private ResourceLoader resourceLoader; /** Node type definitions in CND format */ private List cndFiles = new ArrayList(); + /** Migrations to execute (if not already done) */ + private Set dataModelMigrations = new HashSet(); + /** Namespaces to register: key is prefix, value namespace */ private Map namespaces = new HashMap(); private Boolean autocreateWorkspaces = false; private Executor systemExecutor; - private Credentials adminCredentials; - - // transition from legacy spring approach - private Boolean alreadyInitialized = false; - private Boolean alreadyDisposed = false; - - /** @deprecated explicitly declare {@link #init()} as init-method instead. */ - public void afterPropertiesSet() throws Exception { - if (!alreadyInitialized) { - log.warn("## If not already done," - + " declare init-method=\"init\"."); - initImpl(); - } - } public void init() throws Exception { - initImpl(); - alreadyInitialized = true; - } - - protected void initImpl() throws Exception { if (repository != null) { // we are just wrapping another repository importNodeTypeDefinitions(repository); return; } - // remote repository - if (uri != null && !uri.trim().equals("")) { - Map params = new HashMap(); - params.put(org.apache.jackrabbit.commons.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); - // do not perform further initialization since we assume that the - // remote repository has been properly configured - return; - } + createJackrabbitRepository(); + + // migrate if needed + migrate(); + + // apply new CND files after migration + if (cndFiles != null && cndFiles.size() > 0) + importNodeTypeDefinitions(repository); + } - // local repository - if (inMemory && homeDirectory.exists()) { - FileUtils.deleteDirectory(homeDirectory); - log.warn("Deleted Jackrabbit home directory " + homeDirectory); + /** Actually creates a new repository. */ + protected void createJackrabbitRepository() { + long begin = System.currentTimeMillis(); + try { + // remote repository + if (uri != null && !uri.trim().equals("")) { + Map params = new HashMap(); + params.put( + org.apache.jackrabbit.commons.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); + // do not perform further initialization since we assume that + // the + // remote repository has been properly configured + return; + } + + // local repository + if (inMemory && getHomeDirectory().exists()) { + FileUtils.deleteDirectory(getHomeDirectory()); + log.warn("Deleted Jackrabbit home directory " + + getHomeDirectory()); + } + + Properties vars = getConfigurationProperties(); + InputStream in = configuration.getInputStream(); + try { + vars.put( + RepositoryConfigurationParser.REPOSITORY_HOME_VARIABLE, + getHomeDirectory().getCanonicalPath()); + repositoryConfig = RepositoryConfig.create(new InputSource(in), + vars); + } catch (Exception e) { + throw new RuntimeException("Cannot read configuration", e); + } finally { + IOUtils.closeQuietly(in); + } + + if (inMemory) + repository = new TransientRepository(repositoryConfig); + else + repository = RepositoryImpl.create(repositoryConfig); + + double duration = ((double) (System.currentTimeMillis() - begin)) / 1000; + log.info("Initialized Jackrabbit repository in " + duration + + " s, home: " + getHomeDirectory() + ", config: " + + configuration); + } catch (Exception e) { + throw new ArgeoException("Cannot create Jackrabbit repository " + + getHomeDirectory(), e); } + } + + /** Executes migrations, if needed. */ + protected void migrate() { + // No migration to perform + if (dataModelMigrations.size() == 0) + return; + + Boolean restartAndClearCaches = false; - RepositoryConfig config; - Properties vars = getConfigurationProperties(); - InputStream in = configuration.getInputStream(); + // migrate data + Session session = null; try { - vars.put(RepositoryConfigurationParser.REPOSITORY_HOME_VARIABLE, - homeDirectory.getCanonicalPath()); - config = RepositoryConfig.create(new InputSource(in), vars); + session = login(); + for (JackrabbitDataModelMigration dataModelMigration : new TreeSet( + dataModelMigrations)) { + if (dataModelMigration.migrate(session)) { + restartAndClearCaches = true; + } + } + } catch (ArgeoException e) { + throw e; } catch (Exception e) { - throw new RuntimeException("Cannot read configuration", e); + throw new ArgeoException("Cannot migrate", e); } finally { - IOUtils.closeQuietly(in); + JcrUtils.logoutQuietly(session); } - if (inMemory) - repository = new TransientRepository(config); - else - repository = RepositoryImpl.create(config); + // restart repository + if (restartAndClearCaches) { + JackrabbitDataModelMigration + .clearRepositoryCaches(repositoryConfig); + ((JackrabbitRepository) repository).shutdown(); + createJackrabbitRepository(); + } - if (cndFiles != null && cndFiles.size() > 0) - importNodeTypeDefinitions(repository); + // set data model version + try { + session = login(); + } catch (RepositoryException e) { + throw new ArgeoException("Cannot login to migrated repository", e); + } + + for (JackrabbitDataModelMigration dataModelMigration : new TreeSet( + dataModelMigrations)) { + try { + if (session.itemExists(dataModelMigration + .getDataModelNodePath())) { + Node dataModelNode = session.getNode(dataModelMigration + .getDataModelNodePath()); + dataModelNode.setProperty( + ArgeoNames.ARGEO_DATA_MODEL_VERSION, + dataModelMigration.getTargetVersion()); + session.save(); + } + } catch (Exception e) { + log.error("Cannot set model version", e); + } + } + JcrUtils.logoutQuietly(session); - log.info("Initialized Jackrabbit repository " + repository + " in " - + homeDirectory + " with config " + configuration); } - /** - * @deprecated explicitly declare {@link #dispose()} as destroy-method - * instead. - */ - public void destroy() throws Exception { - if (!alreadyDisposed) { - log.warn("## If not already done," - + " declare destroy-method=\"dispose\"."); - disposeImpl(); + /** Lazy init. */ + protected File getHomeDirectory() { + try { + if (homeDirectory == null) { + if (inMemory) { + homeDirectory = new File( + System.getProperty("java.io.tmpdir") + + File.separator + + System.getProperty("user.name") + + File.separator + "jackrabbit-" + + UUID.randomUUID()); + homeDirectory.mkdirs(); + // will it work if directory is not empty? + homeDirectory.deleteOnExit(); + } + } + + return homeDirectory.getCanonicalFile(); + } catch (IOException e) { + throw new ArgeoException("Cannot get canonical file for " + + homeDirectory, e); } } public void dispose() throws Exception { - disposeImpl(); - alreadyDisposed = true; - } - - protected void disposeImpl() throws Exception { + long begin = System.currentTimeMillis(); if (repository != null) { if (repository instanceof JackrabbitRepository) ((JackrabbitRepository) repository).shutdown(); @@ -189,18 +270,33 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, } if (inMemory) - if (homeDirectory.exists()) { - FileUtils.deleteDirectory(homeDirectory); + if (getHomeDirectory().exists()) { + FileUtils.deleteDirectory(getHomeDirectory()); if (log.isDebugEnabled()) log.debug("Deleted Jackrabbit home directory " - + homeDirectory); + + getHomeDirectory()); } + double duration = ((double) (System.currentTimeMillis() - begin)) / 1000; if (uri != null && !uri.trim().equals("")) log.info("Destroyed Jackrabbit repository with uri " + uri); else - log.info("Destroyed Jackrabbit repository " + repository + " in " - + homeDirectory + " with config " + configuration); + log.info("Destroyed Jackrabbit repository in " + duration + + " s, home: " + getHomeDirectory() + ", config " + + configuration); + } + + /** + * @deprecated explicitly declare {@link #dispose()} as destroy-method + * instead. + */ + public void destroy() throws Exception { + log.error("## Declare destroy-method=\"dispose\". in the Jackrabbit container bean"); + } + + /** @deprecated explicitly declare {@link #init()} as init-method instead. */ + public void afterPropertiesSet() throws Exception { + log.error("## Declare init-method=\"init\". in the Jackrabbit container bean"); } protected Properties getConfigurationProperties() { @@ -221,6 +317,13 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, } // override with system properties vars.putAll(System.getProperties()); + + if (log.isTraceEnabled()) { + log.trace("Jackrabbit config variables:"); + for (Object key : new TreeSet(vars.keySet())) + log.trace(key + "=" + vars.getProperty(key.toString())); + } + } catch (IOException e) { throw new ArgeoException("Cannot read configuration properties", e); } finally { @@ -235,24 +338,12 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, * will be thrown. */ protected void importNodeTypeDefinitions(final Repository repository) { - final Credentials credentialsToUse = null; - // if (systemExecutor == null) { - // if (adminCredentials == null) { - // log.error("No system executor or admin credentials found," - // + " cannot import node types"); - // return; - // } - // credentialsToUse = adminCredentials; - // } else { - // credentialsToUse = null; - // } - Runnable action = new Runnable() { public void run() { Reader reader = null; Session session = null; try { - session = repository.login(credentialsToUse); + session = repository.login(); processNewSession(session); // Load cnds as resources for (String resUrl : cndFiles) { @@ -283,15 +374,15 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, // JCR REPOSITORY (delegated) public String getDescriptor(String key) { - return repository.getDescriptor(key); + return getRepository().getDescriptor(key); } public String[] getDescriptorKeys() { - return repository.getDescriptorKeys(); + return getRepository().getDescriptorKeys(); } public Session login() throws LoginException, RepositoryException { - Session session = repository.login(); + Session session = getRepository().login(); processNewSession(session); return session; } @@ -301,7 +392,7 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, RepositoryException { Session session; try { - session = repository.login(credentials, workspaceName); + session = getRepository().login(credentials, workspaceName); } catch (NoSuchWorkspaceException e) { if (autocreateWorkspaces) session = createWorkspaceAndLogsIn(credentials, workspaceName); @@ -314,7 +405,7 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, public Session login(Credentials credentials) throws LoginException, RepositoryException { - Session session = repository.login(credentials); + Session session = getRepository().login(credentials); processNewSession(session); return session; } @@ -323,7 +414,7 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, NoSuchWorkspaceException, RepositoryException { Session session; try { - session = repository.login(workspaceName); + session = getRepository().login(workspaceName); } catch (NoSuchWorkspaceException e) { if (autocreateWorkspaces) session = createWorkspaceAndLogsIn(null, workspaceName); @@ -334,6 +425,17 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, return session; } + /** Wraps access to the repository, making sure it is available. */ + protected Repository getRepository() { + if (repository == null) { + throw new ArgeoException( + "No repository initialized." + + " Was the init() method called?" + + " The dispose() method should also be called on shutdown."); + } + return repository; + } + protected synchronized void processNewSession(Session session) { try { NamespaceHelper namespaceHelper = new NamespaceHelper(session); @@ -351,10 +453,10 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, String workspaceName) throws RepositoryException { if (workspaceName == null) throw new ArgeoException("No workspace specified."); - Session session = repository.login(credentials); + Session session = getRepository().login(credentials); session.getWorkspace().createWorkspace(workspaceName); session.logout(); - return repository.login(credentials, workspaceName); + return getRepository().login(credentials, workspaceName); } public void setResourceLoader(ResourceLoader resourceLoader) { @@ -362,19 +464,19 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, } public boolean isStandardDescriptor(String key) { - return repository.isStandardDescriptor(key); + return getRepository().isStandardDescriptor(key); } public boolean isSingleValueDescriptor(String key) { - return repository.isSingleValueDescriptor(key); + return getRepository().isSingleValueDescriptor(key); } public Value getDescriptorValue(String key) { - return repository.getDescriptorValue(key); + return getRepository().getDescriptorValue(key); } public Value[] getDescriptorValues(String key) { - return repository.getDescriptorValues(key); + return getRepository().getDescriptorValues(key); } // BEANS METHODS @@ -410,12 +512,13 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean, this.systemExecutor = systemExecutor; } - public void setAdminCredentials(Credentials adminCredentials) { - this.adminCredentials = adminCredentials; - } - public void setRepository(Repository repository) { this.repository = repository; } + public void setDataModelMigrations( + Set dataModelMigrations) { + this.dataModelMigrations = dataModelMigrations; + } + }