X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=a67900ca69873885e1bd551fbfcbd68c4444a0c5;hb=3d611c76cc8df95ab66d27307acf9521c3130556;hp=8a1cf8e96c5655442caef71be8cb84586f36a721;hpb=0af549d05ec45b5e31df9026b6627de9038d39eb;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 8a1cf8e96..a67900ca6 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
@@ -31,6 +31,7 @@ import javax.transaction.UserTransaction;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.jackrabbit.api.JackrabbitRepository;
 import org.apache.jackrabbit.util.TransientFileFactory;
 import org.argeo.ArgeoException;
 import org.argeo.ArgeoLogger;
@@ -79,7 +80,7 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener {
 	private ServiceRegistration<TransactionManager> tmReg;
 	private ServiceRegistration<UserTransaction> utReg;
 	private ServiceRegistration<TransactionSynchronizationRegistry> tsrReg;
-	private ServiceRegistration<Repository> repositoryReg;
+	private ServiceRegistration<? extends Repository> repositoryReg;
 	private ServiceRegistration<RepositoryFactory> repositoryFactoryReg;
 	private ServiceRegistration<UserAdmin> userAdminReg;
 
@@ -106,8 +107,6 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener {
 
 	public Kernel() {
 		nodeSecurity = new NodeSecurity();
-		// log.debug(bc.getDataFile(""));
-		// log.debug(bc.getDataFile("test"));
 	}
 
 	final void init() {
@@ -143,6 +142,8 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener {
 			logger = new NodeLogger(logReaderService.getService());
 			logReaderService.close();
 
+			// KernelUtils.logFrameworkProperties(log);
+
 			// Initialise services
 			initTransactionManager();
 			repository = new NodeRepository();
@@ -281,6 +282,7 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener {
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	private void publish() {
 		// Listen to service publication (also ours)
 		bc.addServiceListener(Kernel.this);
@@ -300,8 +302,10 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener {
 		// JCR
 		Hashtable<String, String> regProps = new Hashtable<String, String>();
 		regProps.put(JCR_REPOSITORY_ALIAS, ALIAS_NODE);
-		repositoryReg = bc.registerService(Repository.class, repository,
-				regProps);
+		repositoryReg = (ServiceRegistration<? extends Repository>) bc
+				.registerService(new String[] { Repository.class.getName(),
+						JackrabbitRepository.class.getName() }, repository,
+						regProps);
 		repositoryFactoryReg = bc.registerService(RepositoryFactory.class,
 				repositoryFactory, null);
 	}