Refactor user admin

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / CmsDeployment.java

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 45e218a15701e9e3b00c1ae8619350566389f68c..7a4ca1bf4eeed4fec009f4c11a2203bcb9c3516f 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
@@ -28,6 +28,7 @@ import org.argeo.node.NodeDeployment;
 import org.argeo.node.NodeState;
 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.framework.wiring.BundleCapability;
@@ -118,6 +119,7 @@ public class CmsDeployment implements NodeDeployment {
 
                prepareDataModel(KernelUtils.openAdminSession(deployedNodeRepository));
                Hashtable<String, String> regProps = new Hashtable<String, String>();
+               regProps.put(NodeConstants.CN, ArgeoJcrConstants.ALIAS_HOME);
                regProps.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, ArgeoJcrConstants.ALIAS_HOME);
                homeRepository = new HomeRepository(deployedNodeRepository);
                // register
@@ -177,6 +179,8 @@ public class CmsDeployment implements NodeDeployment {
                Hashtable<String, Object> properties = new Hashtable<>();
                properties.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, name);
                properties.put(NodeConstants.CN, name);
+               if (name.equals(ArgeoJcrConstants.ALIAS_NODE))
+                       properties.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
                bc.registerService(Repository.class, adminSession.getRepository(), properties);
                if (log.isDebugEnabled())
                        log.debug("Published data model " + name);