X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsState.java;h=eebf71ccbb4c3df4f0abbf2cf724b6681eb62874;hb=f73578bf6f1154b7a05c2996aa0e17e362e9c1bd;hp=87fae05cf2af4333c97078af43c6b3c48c6a3a6c;hpb=df8ecf06ff62ff3f31a7cbe7c992e183312563fd;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
index 87fae05cf..eebf71ccb 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
@@ -3,13 +3,12 @@ package org.argeo.cms.internal.kernel;
 import static bitronix.tm.TransactionManagerServices.getTransactionManager;
 import static bitronix.tm.TransactionManagerServices.getTransactionSynchronizationRegistry;
 import static java.util.Locale.ENGLISH;
-import static org.argeo.cms.internal.auth.LocaleChoice.asLocaleList;
 
 import java.io.File;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.nio.file.spi.FileSystemProvider;
 import java.util.ArrayList;
-import java.util.Dictionary;
 import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
@@ -21,18 +20,16 @@ import javax.transaction.UserTransaction;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.maintenance.MaintenanceUi;
+import org.argeo.cms.i18n.LocaleUtils;
 import org.argeo.node.NodeConstants;
 import org.argeo.node.NodeState;
 import org.argeo.util.LangUtils;
-import org.eclipse.rap.rwt.application.ApplicationConfiguration;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.cm.ManagedServiceFactory;
-import org.osgi.service.useradmin.UserAdmin;
 
 import bitronix.tm.BitronixTransactionManager;
 import bitronix.tm.BitronixTransactionSynchronizationRegistry;
@@ -64,7 +61,7 @@ public class CmsState implements NodeState {
 		try {
 			this.hostname = InetAddress.getLocalHost().getHostName();
 		} catch (UnknownHostException e) {
-			log.error("Cannot set hostname", e);
+			log.error("Cannot set hostname: " + e);
 		}
 
 		availableSince = System.currentTimeMillis();
@@ -84,38 +81,32 @@ public class CmsState implements NodeState {
 		Object defaultLocaleValue = KernelUtils.getFrameworkProp(NodeConstants.I18N_DEFAULT_LOCALE);
 		defaultLocale = defaultLocaleValue != null ? new Locale(defaultLocaleValue.toString())
 				: new Locale(ENGLISH.getLanguage());
-		locales = asLocaleList(KernelUtils.getFrameworkProp(NodeConstants.I18N_LOCALES));
+		locales = LocaleUtils.asLocaleList(KernelUtils.getFrameworkProp(NodeConstants.I18N_LOCALES));
 	}
 
 	private void initServices() {
+		// JTA
 		initTransactionManager();
 
 		// JCR
 		RepositoryServiceFactory repositoryServiceFactory = new RepositoryServiceFactory();
 		shutdownHooks.add(() -> repositoryServiceFactory.shutdown());
 		bc.registerService(ManagedServiceFactory.class, repositoryServiceFactory,
-				LangUtils.init(Constants.SERVICE_PID, NodeConstants.NODE_REPOS_FACTORY_PID));
+				LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_REPOS_FACTORY_PID));
 
 		NodeRepositoryFactory repositoryFactory = new NodeRepositoryFactory();
 		bc.registerService(RepositoryFactory.class, repositoryFactory, null);
 
 		// Security
-//		UserDirectoryServiceFactory userDirectoryServiceFactory = new UserDirectoryServiceFactory();
-//		shutdownHooks.add(() -> userDirectoryServiceFactory.shutdown());
-//		bc.registerService(ManagedServiceFactory.class, userDirectoryServiceFactory,
-//				LangUtils.init(Constants.SERVICE_PID, NodeConstants.NODE_USER_DIRECTORIES_FACTORY_PID));
-
-		NodeUserAdmin userAdmin = new NodeUserAdmin();
+		NodeUserAdmin userAdmin = new NodeUserAdmin(NodeConstants.ROLES_BASEDN);
 		shutdownHooks.add(() -> userAdmin.destroy());
-		Dictionary<String, Object> props = userAdmin.currentState();
-		props.put(Constants.SERVICE_PID, NodeConstants.NODE_USER_ADMIN_PID);
-		bc.registerService(ManagedServiceFactory.class, userAdmin, props);
-
-		// UI
-		bc.registerService(ApplicationConfiguration.class, new MaintenanceUi(),
-				LangUtils.init(KernelConstants.CONTEXT_NAME_PROP, "system"));
-		bc.registerService(ApplicationConfiguration.class, new UserUi(),
-				LangUtils.init(KernelConstants.CONTEXT_NAME_PROP, "user"));
+		bc.registerService(ManagedServiceFactory.class, userAdmin,
+				LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_USER_ADMIN_PID));
+
+		// File System
+		CmsFsProvider cmsFsProvider = new CmsFsProvider();
+		bc.registerService(FileSystemProvider.class, cmsFsProvider,
+				LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_FS_PROVIDER_PID));
 	}
 
 	private void initTransactionManager() {
@@ -124,19 +115,22 @@ public class CmsState implements NodeState {
 		if (existingTm != null) {
 			if (log.isDebugEnabled())
 				log.debug("Using provided transaction manager " + existingTm);
+			return;
 		}
-		bitronix.tm.Configuration tmConf = TransactionManagerServices.getConfiguration();
-		tmConf.setServerId(UUID.randomUUID().toString());
-
-		Bundle bitronixBundle = FrameworkUtil.getBundle(bitronix.tm.Configuration.class);
-		File tmBaseDir = bitronixBundle.getDataFile(KernelConstants.DIR_TRANSACTIONS);
-		File tmDir1 = new File(tmBaseDir, "btm1");
-		tmDir1.mkdirs();
-		tmConf.setLogPart1Filename(new File(tmDir1, tmDir1.getName() + ".tlog").getAbsolutePath());
-		File tmDir2 = new File(tmBaseDir, "btm2");
-		tmDir2.mkdirs();
-		tmConf.setLogPart2Filename(new File(tmDir2, tmDir2.getName() + ".tlog").getAbsolutePath());
 
+		if (!TransactionManagerServices.isTransactionManagerRunning()) {
+			bitronix.tm.Configuration tmConf = TransactionManagerServices.getConfiguration();
+			tmConf.setServerId(UUID.randomUUID().toString());
+
+			Bundle bitronixBundle = FrameworkUtil.getBundle(bitronix.tm.Configuration.class);
+			File tmBaseDir = bitronixBundle.getDataFile(KernelConstants.DIR_TRANSACTIONS);
+			File tmDir1 = new File(tmBaseDir, "btm1");
+			tmDir1.mkdirs();
+			tmConf.setLogPart1Filename(new File(tmDir1, tmDir1.getName() + ".tlog").getAbsolutePath());
+			File tmDir2 = new File(tmBaseDir, "btm2");
+			tmDir2.mkdirs();
+			tmConf.setLogPart2Filename(new File(tmDir2, tmDir2.getName() + ".tlog").getAbsolutePath());
+		}
 		BitronixTransactionManager transactionManager = getTransactionManager();
 		shutdownHooks.add(() -> transactionManager.shutdown());
 		BitronixTransactionSynchronizationRegistry transactionSynchronizationRegistry = getTransactionSynchronizationRegistry();
@@ -149,11 +143,11 @@ public class CmsState implements NodeState {
 	}
 
 	void shutdown() {
-		applyShutdownHooks();
-
 		if (kernelThread != null)
 			kernelThread.destroyAndJoin();
 
+		applyShutdownHooks();
+
 		if (log.isDebugEnabled())
 			log.debug("## CMS STOPPED");
 	}