Rather take the first found image than the last one.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / NodeRepository.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepository.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepository.java
index a139289be58a75dfa00906c87d98f4e54aa19f8c..37ed7babb29a7db5715e1da2cf7677a0577bc975 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepository.java
@@ -24,7 +24,6 @@ import org.argeo.ArgeoException;
 import org.argeo.cms.CmsException;
 import org.argeo.jackrabbit.JackrabbitWrapper;
 import org.argeo.jcr.ArgeoJcrConstants;
-import org.osgi.framework.BundleContext;
 import org.xml.sax.InputSource;
 
 /** Jacrabbit based data layer */
@@ -34,8 +33,8 @@ class NodeRepository extends JackrabbitWrapper implements KernelConstants,
 
        private RepositoryContext repositoryContext;
 
-       public NodeRepository(BundleContext bundleContext) {
-               setBundleContext(bundleContext);
+       public NodeRepository() {
+               setBundleContext(Activator.getBundleContext());
                JackrabbitNodeType type = JackrabbitNodeType.valueOf(prop(REPO_TYPE,
                                h2.name()));
                try {
@@ -72,6 +71,9 @@ class NodeRepository extends JackrabbitWrapper implements KernelConstants,
                        case memory:
                                in = cl.getResourceAsStream(base + "/repository-memory.xml");
                                break;
+                       case localfs:
+                               in = cl.getResourceAsStream(base + "/repository-localfs.xml");
+                               break;
                        default:
                                throw new CmsException("Unsupported node type " + type);
                        }
@@ -96,7 +98,7 @@ class NodeRepository extends JackrabbitWrapper implements KernelConstants,
 
                // home
                File osgiInstanceDir = KernelUtils.getOsgiInstanceDir();
-               File homeDir = new File(osgiInstanceDir, "node");
+               File homeDir = new File(osgiInstanceDir, DIR_NODE);
                // home cannot be overridden
                defaults.put(RepositoryConfigurationParser.REPOSITORY_HOME_VARIABLE,
                                homeDir.getAbsolutePath());
@@ -128,6 +130,8 @@ class NodeRepository extends JackrabbitWrapper implements KernelConstants,
                        break;
                case memory:
                        break;
+               case localfs:
+                       break;
                default:
                        throw new CmsException("Unsupported node type " + type);
                }
@@ -168,7 +172,6 @@ class NodeRepository extends JackrabbitWrapper implements KernelConstants,
 
        private RepositoryContext createJackrabbitRepository(
                        RepositoryConfig repositoryConfig) throws RepositoryException {
-               File homeDirectory = null;
                long begin = System.currentTimeMillis();
                //
                // Actual repository creation
@@ -179,7 +182,7 @@ class NodeRepository extends JackrabbitWrapper implements KernelConstants,
                double duration = ((double) (System.currentTimeMillis() - begin)) / 1000;
                if (log.isTraceEnabled())
                        log.trace("Created Jackrabbit repository in " + duration
-                                       + " s, home: " + homeDirectory);
+                                       + " s, home: " + repositoryConfig.getHomeDir());
 
                return repositoryContext;
        }