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=8fb61d70cb0d31ace223f9a5df9c296946478707;hb=7e464c3cedfa41ece64811fb55ddc9ce740a1050;hp=6ba9307bee896c0e6504bb19864935bfd430cc2e;hpb=e41a5f598aa4692ee4109e5442e5fcd8565e98bd;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 6ba9307be..8fb61d70c 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
@@ -37,6 +37,7 @@ import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.ArgeoNames;
 import org.argeo.cms.internal.jcr.JcrInitUtils;
 import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.jcr.acr.JcrContentProvider;
 import org.argeo.cms.jcr.internal.servlet.CmsRemotingServlet;
 import org.argeo.cms.jcr.internal.servlet.CmsWebDavServlet;
 import org.argeo.cms.jcr.internal.servlet.JcrHttpUtils;
@@ -75,8 +76,6 @@ public class CmsJcrDeployment {
 	private boolean nodeAvailable = false;
 
 	CmsDeployment cmsDeployment;
-	private ProvidedRepository contentRepository;
-
 	public void start() {
 		dataModels = new DataModels(bc);
 
@@ -88,12 +87,13 @@ public class CmsJcrDeployment {
 
 		JcrInitUtils.addToDeployment(cmsDeployment);
 
-		contentRepository.registerTypes(NamespaceRegistry.PREFIX_JCR, NamespaceRegistry.NAMESPACE_JCR, null);
-		contentRepository.registerTypes(NamespaceRegistry.PREFIX_MIX, NamespaceRegistry.NAMESPACE_MIX, null);
-		contentRepository.registerTypes(NamespaceRegistry.PREFIX_NT, NamespaceRegistry.NAMESPACE_NT, null);
-		// Jackrabbit
-		// see https://jackrabbit.apache.org/archive/wiki/JCR/NamespaceRegistry_115513459.html
-		contentRepository.registerTypes("rep", "internal", null);
+//		contentRepository.registerTypes(NamespaceRegistry.PREFIX_JCR, NamespaceRegistry.NAMESPACE_JCR, null);
+//		contentRepository.registerTypes(NamespaceRegistry.PREFIX_MIX, NamespaceRegistry.NAMESPACE_MIX, null);
+//		contentRepository.registerTypes(NamespaceRegistry.PREFIX_NT, NamespaceRegistry.NAMESPACE_NT, null);
+//		// Jackrabbit
+//		// see
+//		// https://jackrabbit.apache.org/archive/wiki/JCR/NamespaceRegistry_115513459.html
+//		contentRepository.registerTypes("rep", "internal", null);
 
 	}
 
@@ -101,6 +101,7 @@ public class CmsJcrDeployment {
 //		if (nodeHttp != null)
 //			nodeHttp.destroy();
 
+
 		try {
 			for (ServiceReference<JackrabbitLocalRepository> sr : bc
 					.getServiceReferences(JackrabbitLocalRepository.class, null)) {
@@ -116,10 +117,6 @@ public class CmsJcrDeployment {
 		this.cmsDeployment = cmsDeployment;
 	}
 
-	public void setContentRepository(ProvidedRepository contentRepository) {
-		this.contentRepository = contentRepository;
-	}
-
 	/**
 	 * Checks whether the deployment is available according to expectations, and
 	 * mark it as available.