X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsDeployment.java;h=7a6ae064667817ff764d0bc3dc37e2da1ea1a45a;hb=48cae516376b12ea619a359450c62479d3e16584;hp=fba39b6d4e91955be766708db3fc3f0405b87181;hpb=c08269db6884798c78f39a49dd97bb53740feae6;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 fba39b6d4..7a6ae0646 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 @@ -55,10 +55,8 @@ import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.UserAdmin; import org.osgi.util.tracker.ServiceTracker; +/** Implementation of a CMS deployment. */ public class CmsDeployment implements NodeDeployment { - // private final static String LEGACY_JCR_REPOSITORY_ALIAS = - // "argeo.jcr.repository.alias"; - private final Log log = LogFactory.getLog(getClass()); private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext(); @@ -286,11 +284,11 @@ public class CmsDeployment implements NodeDeployment { JcrUtils.logoutQuietly(adminSession); } - Hashtable regProps = new Hashtable(); + // Publish home with the highest service ranking + Hashtable regProps = new Hashtable<>(); regProps.put(NodeConstants.CN, NodeConstants.HOME); - // regProps.put(LEGACY_JCR_REPOSITORY_ALIAS, NodeConstants.HOME); + regProps.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE); homeRepository = new HomeRepository(deployedRepository, false); - // register bc.registerService(Repository.class, homeRepository, regProps); // Keyring only if Argeo extensions are available @@ -408,10 +406,7 @@ public class CmsDeployment implements NodeDeployment { private void publishLocalRepo(String dataModelName, Repository repository) { Hashtable 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; String[] classes; if (repository instanceof RepositoryImpl) {