X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=jcr%2Forg.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjcr%2Finternal%2FCmsJcrDeployment.java;h=6fdd2009ba773e190a8a86cb63a330d2c2c80b65;hb=336930c69f0cd3e1242e518479624c6366541275;hp=8fb61d70cb0d31ace223f9a5df9c296946478707;hpb=7e464c3cedfa41ece64811fb55ddc9ce740a1050;p=lgpl%2Fargeo-commons.git diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java b/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java index 8fb61d70c..6fdd2009b 100644 --- a/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java +++ b/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java @@ -75,7 +75,7 @@ public class CmsJcrDeployment { // Readiness private boolean nodeAvailable = false; - CmsDeployment cmsDeployment; +// CmsDeployment cmsDeployment; public void start() { dataModels = new DataModels(bc); @@ -85,7 +85,7 @@ public class CmsJcrDeployment { // nodeDeployment = CmsJcrActivator.getService(NodeDeployment.class); - JcrInitUtils.addToDeployment(cmsDeployment); + //JcrInitUtils.addToDeployment(cmsDeployment); // contentRepository.registerTypes(NamespaceRegistry.PREFIX_JCR, NamespaceRegistry.NAMESPACE_JCR, null); // contentRepository.registerTypes(NamespaceRegistry.PREFIX_MIX, NamespaceRegistry.NAMESPACE_MIX, null); @@ -113,9 +113,9 @@ public class CmsJcrDeployment { } - public void setCmsDeployment(CmsDeployment cmsDeployment) { - this.cmsDeployment = cmsDeployment; - } +// public void setCmsDeployment(CmsDeployment cmsDeployment) { +// this.cmsDeployment = cmsDeployment; +// } /** * Checks whether the deployment is available according to expectations, and @@ -363,7 +363,8 @@ public class CmsJcrDeployment { } boolean isStandalone(String dataModelName) { - return cmsDeployment.getProps(CmsConstants.NODE_REPOS_FACTORY_PID, dataModelName) != null; + return true; + //return cmsDeployment.getProps(CmsConstants.NODE_REPOS_FACTORY_PID, dataModelName) != null; } private void publishLocalRepo(String dataModelName, Repository repository) {