X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsDeployment.java;h=c4dee903fb4513946a6dee37ce0fb07d67808330;hb=8e9b429428549d18c14e6ccfab31d9c88fca68bc;hp=7134517f398e7c27ece82b48b295cad45ea32b1a;hpb=12c44296992a48de65fe6864a6ed005f03264fcf;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
index 7134517f3..c4dee903f 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
@@ -7,6 +7,7 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.management.ManagementFactory;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.List;
@@ -16,6 +17,7 @@ import java.util.Set;
 import javax.jcr.Repository;
 import javax.jcr.Session;
 import javax.security.auth.callback.CallbackHandler;
+import javax.transaction.UserTransaction;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -29,6 +31,7 @@ import org.argeo.node.NodeConstants;
 import org.argeo.node.NodeDeployment;
 import org.argeo.node.NodeState;
 import org.argeo.node.security.CryptoKeyring;
+import org.argeo.node.security.Keyring;
 import org.argeo.osgi.useradmin.UserAdminConf;
 import org.argeo.util.LangUtils;
 import org.osgi.framework.Bundle;
@@ -42,6 +45,7 @@ import org.osgi.framework.wiring.BundleWiring;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.cm.ManagedService;
+import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.UserAdmin;
 import org.osgi.util.tracker.ServiceTracker;
 
@@ -101,9 +105,11 @@ public class CmsDeployment implements NodeDeployment {
 		ServiceTracker<?, ?> userAdminSt = new ServiceTracker<UserAdmin, UserAdmin>(bc, UserAdmin.class, null) {
 			@Override
 			public UserAdmin addingService(ServiceReference<UserAdmin> reference) {
+				UserAdmin userAdmin = super.addingService(reference);
+				addStandardSystemRoles(userAdmin);
 				userAdminAvailable = true;
 				checkReadiness();
-				return super.addingService(reference);
+				return userAdmin;
 			}
 		};
 		// userAdminSt.open();
@@ -149,6 +155,26 @@ public class CmsDeployment implements NodeDeployment {
 		KernelUtils.asyncOpen(confAdminSt);
 	}
 
+	private void addStandardSystemRoles(UserAdmin userAdmin) {
+		// we assume UserTransaction is already available (TODO make it more robust)
+		UserTransaction userTransaction = bc.getService(bc.getServiceReference(UserTransaction.class));
+		try {
+			userTransaction.begin();
+			if (userAdmin.getRole(NodeConstants.ROLE_ADMIN) == null)
+				userAdmin.createRole(NodeConstants.ROLE_ADMIN, Role.GROUP);
+			if (userAdmin.getRole(NodeConstants.ROLE_USER_ADMIN) == null)
+				userAdmin.createRole(NodeConstants.ROLE_USER_ADMIN, Role.GROUP);
+			userTransaction.commit();
+		} catch (Exception e) {
+			try {
+				userTransaction.rollback();
+			} catch (Exception e1) {
+				// silent
+			}
+			throw new CmsException("Cannot add standard system roles", e);
+		}
+	}
+
 	private void loadIpaJaasConfiguration() {
 		if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) {
 			String jaasConfig = KernelConstants.JAAS_CONFIG_IPA;
@@ -227,8 +253,8 @@ public class CmsDeployment implements NodeDeployment {
 				NodeKeyRing nodeKeyring = new NodeKeyRing(homeRepository);
 				CallbackHandler callbackHandler = bc.getService(reference);
 				nodeKeyring.setDefaultCallbackHandler(callbackHandler);
-				bc.registerService(LangUtils.names(CryptoKeyring.class, ManagedService.class), nodeKeyring,
-						LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_KEYRING_PID));
+				bc.registerService(LangUtils.names(Keyring.class, CryptoKeyring.class, ManagedService.class),
+						nodeKeyring, LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_KEYRING_PID));
 				return callbackHandler;
 			}
 
@@ -265,20 +291,27 @@ public class CmsDeployment implements NodeDeployment {
 		for (BundleWire wire : requiredWires) {
 			processWiring(cn, adminSession, wire.getProviderWiring(), processed);
 		}
+
+		List<String> publishAsLocalRepo = new ArrayList<>();
 		List<BundleCapability> capabilities = wiring.getCapabilities(CMS_DATA_MODEL_NAMESPACE);
 		for (BundleCapability capability : capabilities) {
-			registerDataModelCapability(cn, adminSession, capability, processed);
+			boolean publish = registerDataModelCapability(cn, adminSession, capability, processed);
+			if (publish)
+				publishAsLocalRepo.add((String) capability.getAttributes().get(DataModelNamespace.NAME));
 		}
+		// Publish all at once, so that bundles with multiple CNDs are consistent
+		for (String dataModelName : publishAsLocalRepo)
+			publishLocalRepo(dataModelName, adminSession.getRepository());
 	}
 
-	private void registerDataModelCapability(String cn, Session adminSession, BundleCapability capability,
+	private boolean registerDataModelCapability(String cn, Session adminSession, BundleCapability capability,
 			Set<String> processed) {
 		Map<String, Object> attrs = capability.getAttributes();
 		String name = (String) attrs.get(DataModelNamespace.NAME);
 		if (processed.contains(name)) {
 			if (log.isTraceEnabled())
 				log.trace("Data model " + name + " has already been processed");
-			return;
+			return false;
 		}
 
 		// CND
@@ -303,7 +336,7 @@ public class CmsDeployment implements NodeDeployment {
 		}
 
 		if (KernelUtils.asBoolean((String) attrs.get(DataModelNamespace.ABSTRACT)))
-			return;
+			return false;
 		// Non abstract
 		boolean isStandalone = deployConfig.isStandalone(name);
 		boolean publishLocalRepo;
@@ -314,17 +347,19 @@ public class CmsDeployment implements NodeDeployment {
 		else
 			publishLocalRepo = false;
 
-		if (publishLocalRepo) {
-			Hashtable<String, Object> properties = new Hashtable<>();
-			// properties.put(LEGACY_JCR_REPOSITORY_ALIAS, name);
-			properties.put(NodeConstants.CN, name);
-			if (name.equals(NodeConstants.NODE))
-				properties.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
-			LocalRepository localRepository = new LocalRepository(adminSession.getRepository(), capability);
-			bc.registerService(Repository.class, localRepository, properties);
-			if (log.isDebugEnabled())
-				log.debug("Published data model " + name);
-		}
+		return publishLocalRepo;
+	}
+
+	private void publishLocalRepo(String dataModelName, Repository repository) {
+		Hashtable<String, Object> properties = new Hashtable<>();
+		// properties.put(LEGACY_JCR_REPOSITORY_ALIAS, name);
+		properties.put(NodeConstants.CN, dataModelName);
+		if (dataModelName.equals(NodeConstants.NODE))
+			properties.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
+		LocalRepository localRepository = new LocalRepository(repository, dataModelName);
+		bc.registerService(Repository.class, localRepository, properties);
+		if (log.isDebugEnabled())
+			log.debug("Published data model " + dataModelName);
 	}
 
 	@Override