X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeSecurity.java;h=e841bfc3db187cb8c2f896ea66e511758d72047a;hb=2f7e4652af30d568491041ca2bed1c54b3246766;hp=d0aec2023cbcaccbf32eca9594d00dfec0d77d0c;hpb=6e7769555f6ee64159bbdb5780e34957d6d8895e;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java
index d0aec2023..e841bfc3d 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java
@@ -8,12 +8,11 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.internal.useradmin.JcrUserAdmin;
-import org.argeo.security.SecurityUtils;
+import org.argeo.cms.internal.useradmin.SimpleJcrSecurityModel;
+import org.argeo.cms.internal.useradmin.jackrabbit.JackrabbitUserAdminService;
 import org.argeo.security.UserAdminService;
 import org.argeo.security.core.InternalAuthentication;
 import org.argeo.security.core.InternalAuthenticationProvider;
-import org.argeo.security.jcr.SimpleJcrSecurityModel;
-import org.argeo.security.jcr.jackrabbit.JackrabbitUserAdminService;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.useradmin.UserAdmin;
@@ -52,9 +51,9 @@ class NodeSecurity implements AuthenticationManager {
 		this.bundleContext = bundleContext;
 
 		internalAuth = new InternalAuthenticationProvider(
-				SecurityUtils.getStaticKey());
+				Activator.getSystemKey());
 		anonymousAuth = new AnonymousAuthenticationProvider(
-				SecurityUtils.getStaticKey());
+				Activator.getSystemKey());
 
 		// user admin
 		userAdminService = new JackrabbitUserAdminService();
@@ -86,6 +85,8 @@ class NodeSecurity implements AuthenticationManager {
 		userDetailsManagerReg.unregister();
 		userAdminServiceReg.unregister();
 		authenticationManagerReg.unregister();
+
+		userAdmin.destroy();
 		userAdminReg.unregister();
 	}