Make Jackrabbit node type configurable

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

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
index 62efa364de3d470cd48b26b976f7be9033375efd..ad6ca084a345b20fa4f621b0bca45e719edf4cce 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
@@ -41,6 +41,12 @@ final class Kernel {
        }
 
        void init() {
+               ClassLoader currentContextCl = Thread.currentThread()
+                               .getContextClassLoader();
+               // We use the CMS bundle classloader during initialization
+               Thread.currentThread().setContextClassLoader(
+                               Kernel.class.getClassLoader());
+
                long begin = System.currentTimeMillis();
                InternalAuthentication initAuth = new InternalAuthentication(
                                KernelConstants.DEFAULT_SECURITY_KEY);
@@ -61,6 +67,8 @@ final class Kernel {
                } catch (Exception e) {
                        log.error("Cannot initialize Argeo CMS", e);
                        throw new ArgeoException("Cannot initialize", e);
+               } finally {
+                       Thread.currentThread().setContextClassLoader(currentContextCl);
                }
 
                long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime();