X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsState.java;h=9ff1540a7bf3f1d6d9eb498279f57697e15aef63;hb=12caa0288053858bade6e16372a0998ae4fd2820;hp=63aeeac299a42b257ded84f05a6ec3a90e414feb;hpb=10b1584cd1e3550ecdd1d35dded9c4266d1cb4d8;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 63aeeac29..9ff1540a7 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,14 +3,11 @@ 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.util.ArrayList;
-import java.util.Dictionary;
-import java.util.Hashtable;
 import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
@@ -23,11 +20,10 @@ import javax.transaction.UserTransaction;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.auth.AuthConstants;
-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;
@@ -85,7 +81,7 @@ 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() {
@@ -104,15 +100,8 @@ public class CmsState implements NodeState {
 		// Security
 		NodeUserAdmin userAdmin = new NodeUserAdmin(AuthConstants.ROLES_BASEDN);
 		shutdownHooks.add(() -> userAdmin.destroy());
-		Dictionary<String, Object> props = new Hashtable<>();
-		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.init(Constants.SERVICE_PID, NodeConstants.NODE_USER_ADMIN_PID));
 	}
 
 	private void initTransactionManager() {