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=16f5979d736304caad7833a607730c4db91d6537;hpb=600afe220ae3bad9b2904f7a6d5529168e5c0f1b;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..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 @@ -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,12 +30,14 @@ 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; 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; @@ -73,24 +76,32 @@ public class CmsJcrDeployment { private boolean nodeAvailable = false; CmsDeployment cmsDeployment; - 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() { // if (nodeHttp != null) // nodeHttp.destroy(); + try { for (ServiceReference sr : bc .getServiceReferences(JackrabbitLocalRepository.class, null)) {