Rename packages in order to make future stable documentation clearer.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / jcr / RepositoryBuilder.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java b/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java
index d5f3a20cd5b6a0c8650d8c0dc999d5cd05fefb52..872d8ae531e977d3ea58a16859f184e3692813f7 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java
@@ -14,7 +14,6 @@ import java.util.UUID;
 
 import javax.jcr.RepositoryException;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.core.RepositoryContext;
@@ -22,17 +21,18 @@ import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.cache.CacheManager;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
 import org.apache.jackrabbit.core.config.RepositoryConfigurationParser;
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.internal.kernel.CmsPaths;
 import org.argeo.jcr.ArgeoJcrException;
-import org.argeo.node.NodeConstants;
 import org.xml.sax.InputSource;
 
 /** Can interpret properties in order to create an actual JCR repository. */
 public class RepositoryBuilder {
        private final static Log log = LogFactory.getLog(RepositoryBuilder.class);
 
-       public RepositoryContext createRepositoryContext(Dictionary<String, ?> properties) throws RepositoryException {
+       public RepositoryContext createRepositoryContext(Dictionary<String, ?> properties)
+                       throws RepositoryException, IOException {
                RepositoryConfig repositoryConfig = createRepositoryConfig(properties);
                RepositoryContext repositoryContext = createJackrabbitRepository(repositoryConfig);
                RepositoryImpl repository = repositoryContext.getRepository();
@@ -49,22 +49,17 @@ public class RepositoryBuilder {
                return repositoryContext;
        }
 
-       RepositoryConfig createRepositoryConfig(Dictionary<String, ?> properties) throws RepositoryException {
+       RepositoryConfig createRepositoryConfig(Dictionary<String, ?> properties) throws RepositoryException, IOException {
                JackrabbitType type = JackrabbitType.valueOf(prop(properties, RepoConf.type).toString());
                ClassLoader cl = getClass().getClassLoader();
-               InputStream in = null;
-               try {
-                       final String base = "/org/argeo/cms/internal/jcr";
-                       in = cl.getResourceAsStream(base + "/repository-" + type.name() + ".xml");
-
+               final String base = "/org/argeo/cms/internal/jcr";
+               try (InputStream in = cl.getResourceAsStream(base + "/repository-" + type.name() + ".xml")) {
                        if (in == null)
                                throw new ArgeoJcrException("Repository configuration not found");
                        InputSource config = new InputSource(in);
                        Properties jackrabbitVars = getConfigurationProperties(type, properties);
                        RepositoryConfig repositoryConfig = RepositoryConfig.create(config, jackrabbitVars);
                        return repositoryConfig;
-               } finally {
-                       IOUtils.closeQuietly(in);
                }
        }
 
@@ -200,8 +195,8 @@ public class RepositoryBuilder {
                        RepositoryContext repositoryContext = RepositoryContext.create(repositoryConfig);
 
                        double duration = ((double) (System.currentTimeMillis() - begin)) / 1000;
-                       if (log.isTraceEnabled())
-                               log.trace(
+                       if (log.isDebugEnabled())
+                               log.debug(
                                                "Created Jackrabbit repository in " + duration + " s, home: " + repositoryConfig.getHomeDir());
 
                        return repositoryContext;