Disable unused keyring

[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 8fb61d70cb0d31ace223f9a5df9c296946478707..35800f8953a50f23812771cf6b912c7441013c02 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
@@ -12,43 +12,31 @@ 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;
-import javax.security.auth.callback.CallbackHandler;
 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;
 import org.argeo.cms.osgi.DataModelNamespace;
-import org.argeo.cms.security.CryptoKeyring;
-import org.argeo.cms.security.Keyring;
 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;
@@ -58,7 +46,6 @@ import org.osgi.framework.ServiceReference;
 import org.osgi.framework.wiring.BundleCapability;
 import org.osgi.framework.wiring.BundleWire;
 import org.osgi.framework.wiring.BundleWiring;
-import org.osgi.service.cm.ManagedService;
 import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
 import org.osgi.util.tracker.ServiceTracker;
 
@@ -75,7 +62,7 @@ public class CmsJcrDeployment {
        // Readiness
        private boolean nodeAvailable = false;
 
-       CmsDeployment cmsDeployment;
+//     CmsDeployment cmsDeployment;
        public void start() {
                dataModels = new DataModels(bc);
 
@@ -85,7 +72,7 @@ public class CmsJcrDeployment {
 
 //             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);
@@ -113,9 +100,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
@@ -165,23 +152,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. */
@@ -254,21 +241,21 @@ public class CmsJcrDeployment {
                registerRepositoryServlets(CmsConstants.EGO_REPOSITORY, egoRepository);
 
                // Keyring only if Argeo extensions are available
-               if (argeoDataModelExtensionsAvailable) {
-                       new ServiceTracker<CallbackHandler, CallbackHandler>(bc, CallbackHandler.class, null) {
-
-                               @Override
-                               public CallbackHandler addingService(ServiceReference<CallbackHandler> reference) {
-                                       NodeKeyRing nodeKeyring = new NodeKeyRing(egoRepository);
-                                       CallbackHandler callbackHandler = bc.getService(reference);
-                                       nodeKeyring.setDefaultCallbackHandler(callbackHandler);
-                                       bc.registerService(LangUtils.names(Keyring.class, CryptoKeyring.class, ManagedService.class),
-                                                       nodeKeyring, LangUtils.dict(Constants.SERVICE_PID, CmsConstants.NODE_KEYRING_PID));
-                                       return callbackHandler;
-                               }
-
-                       }.open();
-               }
+//             if (argeoDataModelExtensionsAvailable) {
+//                     new ServiceTracker<CallbackHandler, CallbackHandler>(bc, CallbackHandler.class, null) {
+//
+//                             @Override
+//                             public CallbackHandler addingService(ServiceReference<CallbackHandler> reference) {
+//                                     NodeKeyRing nodeKeyring = new NodeKeyRing(egoRepository);
+//                                     CallbackHandler callbackHandler = bc.getService(reference);
+//                                     nodeKeyring.setDefaultCallbackHandler(callbackHandler);
+//                                     bc.registerService(LangUtils.names(Keyring.class, CryptoKeyring.class, ManagedService.class),
+//                                                     nodeKeyring, LangUtils.dict(Constants.SERVICE_PID, CmsConstants.NODE_KEYRING_PID));
+//                                     return callbackHandler;
+//                             }
+//
+//                     }.open();
+//             }
        }
 
        /** Session is logged out. */
@@ -363,7 +350,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) {