]> git.argeo.org Git - lgpl/argeo-commons.git/blobdiff - org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
Improve node deployment
[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / Activator.java
index 11bb9f595b862916b17d121d82a086222284c809..1efc9dc66474953221194974c0044558e163514b 100644 (file)
@@ -42,13 +42,14 @@ public class Activator implements BundleActivator {
        private LogReaderService logReaderService;
        // private ConfigurationAdmin configurationAdmin;
 
-//     private NodeLogger logger;
+       private NodeLogger logger;
        private CmsState nodeState;
        private CmsDeployment nodeDeployment;
        private CmsInstance nodeInstance;
 
        @Override
        public void start(BundleContext bundleContext) throws Exception {
+               Runtime.getRuntime().addShutdownHook(new CmsShutdown());
                instance = this;
                this.bc = bundleContext;
                this.logReaderService = getService(LogReaderService.class);
@@ -61,7 +62,6 @@ public class Activator implements BundleActivator {
                        initNode();
                } catch (Exception e) {
                        log.error("## FATAL: CMS activator failed", e);
-                       // throw new CmsException("Cannot initialize node", e);
                }
        }
 
@@ -75,11 +75,36 @@ public class Activator implements BundleActivator {
                }
                // explicitly load JAAS configuration
                Configuration.getConfiguration();
+
+               // ConditionalPermissionAdmin permissionAdmin = bc
+               // .getService(bc.getServiceReference(ConditionalPermissionAdmin.class));
+               // ConditionalPermissionUpdate update =
+               // permissionAdmin.newConditionalPermissionUpdate();
+               // // Self
+               // update.getConditionalPermissionInfos()
+               // .add(permissionAdmin.newConditionalPermissionInfo(null,
+               // new ConditionInfo[] {
+               // new ConditionInfo(BundleLocationCondition.class.getName(), new
+               // String[] { "*" }) },
+               // new PermissionInfo[] { new
+               // PermissionInfo(AllPermission.class.getName(), null, null) },
+               // ConditionalPermissionInfo.ALLOW));
+               //
        }
 
        private void initArgeoLogger() {
-//             logger = new NodeLogger(logReaderService);
-//             bc.registerService(ArgeoLogger.class, logger, null);
+               // Jetty
+               // disable integration of Jetty logging with SLF4J
+               // in order to avoid chicken and egg problems
+               // org.eclipse.jetty.util.log.Log.setLog(new StdErrLog());
+               // org.eclipse.jetty.util.log.Logger jettyLog =
+               // org.eclipse.jetty.util.log.Log.getLog();
+               // if (jettyLog != null) {
+               // jettyLog.warn("TEST JETTY LOG", new Object[0]);
+               // }
+
+               logger = new NodeLogger(logReaderService);
+               bc.registerService(ArgeoLogger.class, logger, null);
        }
 
        private void initNode() throws IOException {
@@ -108,14 +133,21 @@ public class Activator implements BundleActivator {
 
        @Override
        public void stop(BundleContext bundleContext) throws Exception {
-               nodeInstance.shutdown();
-               nodeDeployment.shutdown();
-               nodeState.shutdown();
-
-               instance = null;
-               this.bc = null;
-               this.logReaderService = null;
-               // this.configurationAdmin = null;
+               try {
+                       if (nodeInstance != null)
+                               nodeInstance.shutdown();
+                       if (nodeDeployment != null)
+                               nodeDeployment.shutdown();
+                       if (nodeState != null)
+                               nodeState.shutdown();
+
+                       instance = null;
+                       this.bc = null;
+                       this.logReaderService = null;
+                       // this.configurationAdmin = null;
+               } catch (Exception e) {
+                       log.error("CMS activator shutdown failed", e);
+               }
        }
 
        private <T> T getService(Class<T> clazz) {