X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=08dad56b803c28bedf147e9e055ffa214e247e21;hb=bedec814b105c1cc53f2beadfe36d76e42c9a02e;hp=189dd08d769b14f602391c14961caa98308e07fa;hpb=e91af5c65a42b3ff98400caa552965cdb3f730e6;p=lgpl%2Fargeo-commons.git 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 189dd08d7..08dad56b8 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java @@ -84,14 +84,6 @@ final class Kernel implements ServiceListener { try { // Transaction transactionManager = new SimpleTransactionManager(); - bundleContext.registerService(TransactionManager.class, - transactionManager, null); - bundleContext.registerService(UserTransaction.class, - transactionManager, null); - bundleContext.registerService( - TransactionSynchronizationRegistry.class, - transactionManager.getTransactionSynchronizationRegistry(), - null); // Jackrabbit node node = new JackrabbitNode(bundleContext); @@ -105,7 +97,7 @@ final class Kernel implements ServiceListener { // Equinox dependency ExtendedHttpService httpService = waitForHttpService(); - nodeHttp = new NodeHttp(httpService, node, nodeSecurity); + nodeHttp = new NodeHttp(httpService, node); // Kernel thread kernelThread = new KernelThread(this); @@ -113,6 +105,14 @@ final class Kernel implements ServiceListener { kernelThread.start(); // Publish services to OSGi + bundleContext.registerService(TransactionManager.class, + transactionManager, null); + bundleContext.registerService(UserTransaction.class, + transactionManager, null); + bundleContext.registerService( + TransactionSynchronizationRegistry.class, + transactionManager.getTransactionSynchronizationRegistry(), + null); nodeSecurity.publish(); node.publish(repositoryFactory); bundleContext.registerService(RepositoryFactory.class,