Clean up code

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java b/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
index 59b226a53c61a284ade9a84288cb373c6048831c..b09956203cc2eb4afa0bfa60b2a1c22cf1fe9f5c 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
@@ -26,29 +26,7 @@ public class CmsActivator implements BundleActivator {
 
        private static BundleContext bundleContext;
 
-//     private LogReaderService logReaderService;
-//
-//     private CmsOsgiLogger logger;
-
        void init() {
-//             Runtime.getRuntime().addShutdownHook(new CmsShutdown());
-//             instance = this;
-//             this.bc = bundleContext;
-//             if (bundleContext != null)
-//                     this.logReaderService = getService(LogReaderService.class);
-//             initArgeoLogger();
-//             this.internalExecutorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
-//
-//             try {
-//                     initSecurity();
-////                   initArgeoLogger();
-//                     initNode();
-//
-//                     if (log.isTraceEnabled())
-//                             log.trace("Kernel bundle started");
-//             } catch (Throwable e) {
-//                     log.error("## FATAL: CMS activator failed", e);
-//             }
        }
 
        void destroy() {
@@ -98,12 +76,6 @@ public class CmsActivator implements BundleActivator {
 
        }
 
-//     private void initArgeoLogger() {
-//             logger = new CmsOsgiLogger(logReaderService);
-//             if (bundleContext != null)
-//                     bundleContext.registerService(ArgeoLogger.class, logger, null);
-//     }
-
        public static <T> void registerService(Class<T> clss, T service, Dictionary<String, ?> properties) {
                if (bundleContext != null) {
                        bundleContext.registerService(clss, service, properties);

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelUtils.java
index 7165966486824fa56d842ded78c824bee0d7dc82..6e47873b35557f772ac7d702433652bdb342a3fa 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelUtils.java
@@ -55,18 +55,9 @@ class KernelUtils implements KernelConstants {
                Path executionDir = Paths.get(getFrameworkProp("user.dir"));
                if (relativePath == null)
                        return executionDir;
-//             try {
                return executionDir.resolve(relativePath);
-//             } catch (IOException e) {
-//                     throw new IllegalArgumentException("Cannot get canonical file", e);
-//             }
        }
 
-//     static File getOsgiInstanceDir() {
-//             return new File(CmsActivator.getBundleContext().getProperty(OSGI_INSTANCE_AREA).substring("file:".length()))
-//                             .getAbsoluteFile();
-//     }
-
        public static Path getOsgiInstancePath(String relativePath) {
                URI uri = getOsgiInstanceUri(relativePath);
                if (uri == null) // no data area available
@@ -81,22 +72,9 @@ class KernelUtils implements KernelConstants {
 
                if (!osgiInstanceBaseUri.endsWith("/"))
                        osgiInstanceBaseUri = osgiInstanceBaseUri + "/";
-//             if (osgiInstanceBaseUri != null)
                return safeUri(osgiInstanceBaseUri + (relativePath != null ? relativePath : ""));
-//             else
-//                     return Paths.get(System.getProperty("user.dir"), (relativePath != null ? relativePath : "")).toUri();
        }
 
-//     static File getOsgiConfigurationFile(String relativePath) {
-//             try {
-//                     return new File(
-//                                     new URI(CmsActivator.getBundleContext().getProperty(OSGI_CONFIGURATION_AREA) + relativePath))
-//                                     .getCanonicalFile();
-//             } catch (Exception e) {
-//                     throw new IllegalArgumentException("Cannot get configuration file for " + relativePath, e);
-//             }
-//     }
-
        static String getFrameworkProp(String key, String def) {
                String value;
                if (CmsActivator.getBundleContext() != null)
@@ -112,32 +90,10 @@ class KernelUtils implements KernelConstants {
                return getFrameworkProp(key, null);
        }
 
-       // Security
-       // static Subject anonymousLogin() {
-       // Subject subject = new Subject();
-       // LoginContext lc;
-       // try {
-       // lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, subject);
-       // lc.login();
-       // return subject;
-       // } catch (LoginException e) {
-       // throw new CmsException("Cannot login as anonymous", e);
-       // }
-       // }
-
        static void logFrameworkProperties(CmsLog log) {
                for (Object sysProp : new TreeSet<Object>(System.getProperties().keySet())) {
                        log.debug(sysProp + "=" + getFrameworkProp(sysProp.toString()));
                }
-               // String[] keys = { Constants.FRAMEWORK_STORAGE,
-               // Constants.FRAMEWORK_OS_NAME, Constants.FRAMEWORK_OS_VERSION,
-               // Constants.FRAMEWORK_PROCESSOR, Constants.FRAMEWORK_SECURITY,
-               // Constants.FRAMEWORK_TRUST_REPOSITORIES,
-               // Constants.FRAMEWORK_WINDOWSYSTEM, Constants.FRAMEWORK_VENDOR,
-               // Constants.FRAMEWORK_VERSION, Constants.FRAMEWORK_STORAGE_CLEAN,
-               // Constants.FRAMEWORK_LANGUAGE, Constants.FRAMEWORK_UUID };
-               // for (String key : keys)
-               // log.debug(key + "=" + bc.getProperty(key));
        }
 
        static void printSystemProperties(PrintStream out) {
@@ -148,84 +104,6 @@ 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) {
-//             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);
-//                                     }
-//                             }
-//                     }
-//
-//             });
-//     }
-
-//     public static void asyncOpen(ServiceTracker<?, ?> st) {
-//             Runnable run = new Runnable() {
-//
-//                     @Override
-//                     public void run() {
-//                             st.open();
-//                     }
-//             };
-//             Activator.getInternalExecutorService().execute(run);
-////           new Thread(run, "Open service tracker " + st).start();
-//     }
-
-//     static BundleContext getBundleContext() {
-//             return Activator.getBundleContext();
-//     }
-
        static boolean asBoolean(String value) {
                if (value == null)
                        return false;