Disable OSGi configuration admin and LDIF-based deploy config.

[lgpl/argeo-commons.git] / jcr / org.argeo.cms.jcr / src / org / argeo / cms / jcr / internal / CmsJcrDeployment.java

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 340d137824849b28917838e4aab5e43a15e378c1..6fdd2009ba773e190a8a86cb63a330d2c2c80b65 100644 (file)
--- 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;
@@ -72,22 +75,25 @@ public class CmsJcrDeployment {
        // Readiness
        private boolean nodeAvailable = false;
 
-       CmsDeployment cmsDeployment;
-
-       public CmsJcrDeployment() {
-//             initTrackers();
-       }
-
+//     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);
+               //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);
 
        }
 
@@ -95,6 +101,7 @@ public class CmsJcrDeployment {
 //             if (nodeHttp != null)
 //                     nodeHttp.destroy();
 
+
                try {
                        for (ServiceReference<JackrabbitLocalRepository> sr : bc
                                        .getServiceReferences(JackrabbitLocalRepository.class, null)) {
@@ -106,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
@@ -356,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) {
@@ -390,9 +398,8 @@ public class CmsJcrDeployment {
 //     }
 
        protected void registerRepositoryServlets(String alias, Repository repository) {
-               // FIXME re-enable it with a proper class loader
-//             registerRemotingServlet(alias, repository);
-//             registerWebdavServlet(alias, repository);
+               registerRemotingServlet(alias, repository);
+               registerWebdavServlet(alias, repository);
        }
 
        protected void registerWebdavServlet(String alias, Repository repository) {