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=6ba9307bee896c0e6504bb19864935bfd430cc2e;hb=e41a5f598aa4692ee4109e5442e5fcd8565e98bd;hp=16f5979d736304caad7833a607730c4db91d6537;hpb=2975985a4789df3ac4645d2ee1b063c4ba0bccab;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 16f5979d7..6ba9307be 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
@@ -20,6 +20,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import javax.jcr.NamespaceRegistry;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -29,6 +30,7 @@ import javax.servlet.Servlet;
 import org.apache.jackrabbit.commons.cnd.CndImporter;
 import org.apache.jackrabbit.core.RepositoryContext;
 import org.apache.jackrabbit.core.RepositoryImpl;
+import org.argeo.api.acr.spi.ProvidedRepository;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsDeployment;
 import org.argeo.api.cms.CmsLog;
@@ -73,18 +75,26 @@ public class CmsJcrDeployment {
 	private boolean nodeAvailable = false;
 
 	CmsDeployment cmsDeployment;
+	private ProvidedRepository contentRepository;
 
 	public void start() {
 		dataModels = new DataModels(bc);
 
 		ServiceTracker<?, ?> repoContextSt = new RepositoryContextStc();
 		repoContextSt.open();
-		//KernelUtils.asyncOpen(repoContextSt);
+		// KernelUtils.asyncOpen(repoContextSt);
 
 //		nodeDeployment = CmsJcrActivator.getService(NodeDeployment.class);
 
 		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);
+
 	}
 
 	public void stop() {
@@ -106,6 +116,10 @@ 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.