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=ca25ddbdfd086fcf387ece13a62cb1cc9ccbfdd1;hb=c424738be0c47c808f8cc64c2a51a67eb8e3d584;hp=340d137824849b28917838e4aab5e43a15e378c1;hpb=8282011b0e20e80704b209ad55fa9fb132e16280;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 340d13782..ca25ddbdf 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
@@ -12,10 +12,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -30,10 +28,8 @@ import org.apache.jackrabbit.commons.cnd.CndImporter;
 import org.apache.jackrabbit.core.RepositoryContext;
 import org.apache.jackrabbit.core.RepositoryImpl;
 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.internal.servlet.CmsRemotingServlet;
 import org.argeo.cms.jcr.internal.servlet.CmsWebDavServlet;
@@ -45,7 +41,6 @@ import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.util.LangUtils;
-import org.argeo.util.naming.LdapAttrs;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -72,22 +67,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 +93,7 @@ public class CmsJcrDeployment {
 //		if (nodeHttp != null)
 //			nodeHttp.destroy();
 
+
 		try {
 			for (ServiceReference<JackrabbitLocalRepository> sr : bc
 					.getServiceReferences(JackrabbitLocalRepository.class, null)) {
@@ -106,9 +105,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
@@ -158,23 +157,23 @@ public class CmsJcrDeployment {
 //		}
 
 		// init from repository
-		Collection<ServiceReference<Repository>> initRepositorySr;
-		try {
-			initRepositorySr = bc.getServiceReferences(Repository.class,
-					"(" + CmsConstants.CN + "=" + CmsConstants.NODE_INIT + ")");
-		} catch (InvalidSyntaxException e1) {
-			throw new IllegalArgumentException(e1);
-		}
-		Iterator<ServiceReference<Repository>> it = initRepositorySr.iterator();
-		while (it.hasNext()) {
-			ServiceReference<Repository> sr = it.next();
-			Object labeledUri = sr.getProperties().get(LdapAttrs.labeledURI.name());
-			Repository initRepository = bc.getService(sr);
-			if (log.isDebugEnabled())
-				log.debug("Found init repository " + labeledUri + ", copying it...");
-			initFromRepository(deployedNodeRepository, initRepository);
-			log.info("Node repository initialised from " + labeledUri);
-		}
+//		Collection<ServiceReference<Repository>> initRepositorySr;
+//		try {
+//			initRepositorySr = bc.getServiceReferences(Repository.class,
+//					"(" + CmsConstants.CN + "=" + CmsConstants.NODE_INIT + ")");
+//		} catch (InvalidSyntaxException e1) {
+//			throw new IllegalArgumentException(e1);
+//		}
+//		Iterator<ServiceReference<Repository>> it = initRepositorySr.iterator();
+//		while (it.hasNext()) {
+//			ServiceReference<Repository> sr = it.next();
+//			Object labeledUri = sr.getProperties().get(LdapAttrs.labeledURI.name());
+//			Repository initRepository = bc.getService(sr);
+//			if (log.isDebugEnabled())
+//				log.debug("Found init repository " + labeledUri + ", copying it...");
+//			initFromRepository(deployedNodeRepository, initRepository);
+//			log.info("Node repository initialised from " + labeledUri);
+//		}
 	}
 
 	/** Init from a (typically remote) repository. */
@@ -356,7 +355,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 +390,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) {