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=35800f8953a50f23812771cf6b912c7441013c02;hb=abdb7ad6f6275a90b407062578892b1f088fa9bd;hp=ca25ddbdfd086fcf387ece13a62cb1cc9ccbfdd1;hpb=bbfad683e435f1989cb7ed4aa56a2fed52b64245;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 ca25ddbdf..35800f895 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
@@ -21,7 +21,6 @@ import java.util.Set;
 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;
@@ -35,12 +34,9 @@ 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.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -50,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;
 
@@ -246,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. */