X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=jcr%2Forg.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjcr%2Finternal%2FCmsJcrDeployment.java;h=ca25ddbdfd086fcf387ece13a62cb1cc9ccbfdd1;hb=dca2b13e0e3ca3e7a9469e089b980c48c880ad1a;hp=6fdd2009ba773e190a8a86cb63a330d2c2c80b65;hpb=336930c69f0cd3e1242e518479624c6366541275;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 6fdd2009b..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,15 +12,12 @@ 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; -import javax.jcr.NamespaceRegistry; import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; @@ -30,14 +27,10 @@ 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; @@ -48,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; @@ -165,23 +157,23 @@ public class CmsJcrDeployment { // } // init from repository - Collection> initRepositorySr; - try { - initRepositorySr = bc.getServiceReferences(Repository.class, - "(" + CmsConstants.CN + "=" + CmsConstants.NODE_INIT + ")"); - } catch (InvalidSyntaxException e1) { - throw new IllegalArgumentException(e1); - } - Iterator> it = initRepositorySr.iterator(); - while (it.hasNext()) { - ServiceReference 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> initRepositorySr; +// try { +// initRepositorySr = bc.getServiceReferences(Repository.class, +// "(" + CmsConstants.CN + "=" + CmsConstants.NODE_INIT + ")"); +// } catch (InvalidSyntaxException e1) { +// throw new IllegalArgumentException(e1); +// } +// Iterator> it = initRepositorySr.iterator(); +// while (it.hasNext()) { +// ServiceReference 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. */