Massive Argeo APIs refactoring

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / KernelUtils.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
index a5362c64e7484686ff64a0c2631d84acdc06b1cd..f267933cf5910de37b95213d30bab126c34cf8bd 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
@@ -8,7 +8,6 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.PrivilegedAction;
 import java.security.URIParameter;
 import java.util.Dictionary;
 import java.util.Hashtable;
@@ -16,18 +15,8 @@ import java.util.Properties;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
-
-import org.apache.commons.logging.Log;
-import org.argeo.api.DataModelNamespace;
-import org.argeo.api.NodeConstants;
-import org.argeo.cms.CmsException;
-import org.osgi.framework.Bundle;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.cms.osgi.DataModelNamespace;
 import org.osgi.framework.BundleContext;
 import org.osgi.util.tracker.ServiceTracker;
 
@@ -131,7 +120,7 @@ class KernelUtils implements KernelConstants {
        // }
        // }
 
-       static void logFrameworkProperties(Log log) {
+       static void logFrameworkProperties(CmsLog log) {
                BundleContext bc = getBundleContext();
                for (Object sysProp : new TreeSet<Object>(System.getProperties().keySet())) {
                        log.debug(sysProp + "=" + bc.getProperty(sysProp.toString()));
@@ -155,35 +144,67 @@ class KernelUtils implements KernelConstants {
                        out.println(key + "=" + display.get(key));
        }
 
-       static Session openAdminSession(Repository repository) {
-               return openAdminSession(repository, null);
-       }
-
-       static Session openAdminSession(final Repository repository, final String workspaceName) {
-               ClassLoader currentCl = Thread.currentThread().getContextClassLoader();
-               Thread.currentThread().setContextClassLoader(KernelUtils.class.getClassLoader());
-               LoginContext loginContext;
-               try {
-                       loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN);
-                       loginContext.login();
-               } catch (LoginException e1) {
-                       throw new IllegalStateException("Could not login as data admin", e1);
-               } finally {
-                       Thread.currentThread().setContextClassLoader(currentCl);
-               }
-               return Subject.doAs(loginContext.getSubject(), new PrivilegedAction<Session>() {
-
-                       @Override
-                       public Session run() {
-                               try {
-                                       return repository.login(workspaceName);
-                               } catch (RepositoryException e) {
-                                       throw new IllegalStateException("Cannot open admin session", e);
-                               }
-                       }
+//     static Session openAdminSession(Repository repository) {
+//             return openAdminSession(repository, null);
+//     }
+//
+//     static Session openAdminSession(final Repository repository, final String workspaceName) {
+//             LoginContext loginContext = loginAsDataAdmin();
+//             return Subject.doAs(loginContext.getSubject(), new PrivilegedAction<Session>() {
+//
+//                     @Override
+//                     public Session run() {
+//                             try {
+//                                     return repository.login(workspaceName);
+//                             } catch (RepositoryException e) {
+//                                     throw new IllegalStateException("Cannot open admin session", e);
+//                             } finally {
+//                                     try {
+//                                             loginContext.logout();
+//                                     } catch (LoginException e) {
+//                                             throw new IllegalStateException(e);
+//                                     }
+//                             }
+//                     }
+//
+//             });
+//     }
+//
+//     static LoginContext loginAsDataAdmin() {
+//             ClassLoader currentCl = Thread.currentThread().getContextClassLoader();
+//             Thread.currentThread().setContextClassLoader(KernelUtils.class.getClassLoader());
+//             LoginContext loginContext;
+//             try {
+//                     loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN);
+//                     loginContext.login();
+//             } catch (LoginException e1) {
+//                     throw new IllegalStateException("Could not login as data admin", e1);
+//             } finally {
+//                     Thread.currentThread().setContextClassLoader(currentCl);
+//             }
+//             return loginContext;
+//     }
 
-               });
-       }
+//     static void doAsDataAdmin(Runnable action) {
+//             LoginContext loginContext = loginAsDataAdmin();
+//             Subject.doAs(loginContext.getSubject(), new PrivilegedAction<Void>() {
+//
+//                     @Override
+//                     public Void run() {
+//                             try {
+//                                     action.run();
+//                                     return null;
+//                             } finally {
+//                                     try {
+//                                             loginContext.logout();
+//                                     } catch (LoginException e) {
+//                                             throw new IllegalStateException(e);
+//                                     }
+//                             }
+//                     }
+//
+//             });
+//     }
 
        static void asyncOpen(ServiceTracker<?, ?> st) {
                Runnable run = new Runnable() {
@@ -197,19 +218,6 @@ class KernelUtils implements KernelConstants {
 //             new Thread(run, "Open service tracker " + st).start();
        }
 
-       /**
-        * @return the {@link BundleContext} of the {@link Bundle} which provided this
-        *         class, never null.
-        * @throws CmsException if the related bundle is not active
-        */
-//     static BundleContext getBundleContext(Class<?> clzz) {
-////           Bundle bundle = FrameworkUtil.getBundle(clzz);
-//             BundleContext bc = Activator.getBundleContext();
-//             if (bc == null)
-//                     throw new CmsException("Bundle " + bundle.getSymbolicName() + " is not active");
-//             return bc;
-//     }
-
        static BundleContext getBundleContext() {
                return Activator.getBundleContext();
        }