Remove unused package.

[lgpl/argeo-commons.git] / org.argeo.cms.ui / src / org / argeo / cms / script / ScriptAppActivator.java

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/ScriptAppActivator.java b/org.argeo.cms.ui/src/org/argeo/cms/script/ScriptAppActivator.java
index 5ff89b5fe7b34b11b2bcd86ee35ec24458ad921c..edf25bb00bdc2eb305bb9900f1aba3de39d92823 100644 (file)
--- a/org.argeo.cms.ui/src/org/argeo/cms/script/ScriptAppActivator.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/script/ScriptAppActivator.java
@@ -2,6 +2,8 @@ package org.argeo.cms.script;
 
 import javax.jcr.Repository;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
@@ -9,38 +11,36 @@ import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
 
 public class ScriptAppActivator implements BundleActivator {
-//     ServiceRegistration<ApplicationConfiguration> appConfigReg;
+       private final static Log log = LogFactory.getLog(ScriptAppActivator.class);
 
        @Override
        public void start(BundleContext context) throws Exception {
-               CmsScriptRwtApplication appConfig = new CmsScriptRwtApplication();
-               appConfig.init(context);
-               CmsScriptApp app = appConfig.getApp();
-               ServiceTracker<Repository, Repository> repoSt = new ServiceTracker<Repository, Repository>(context,
-                               FrameworkUtil.createFilter("(&" + app.getRepo() + "(objectClass=javax.jcr.Repository))"), null) {
-
-                       @Override
-                       public Repository addingService(ServiceReference<Repository> reference) {
-                               Repository repository = super.addingService(reference);
-                               appConfig.setRepository(repository);
-                               CmsScriptApp app = appConfig.getApp();
-                               app.register(context, appConfig);
-//                             Hashtable<String, String> props = new Hashtable<>();
-//                             if (app.getWebPath() != null)
-//                                     props.put("contextName", app.getWebPath());
-//                             appConfigReg = context.registerService(ApplicationConfiguration.class, appConfig, props);
-                               return repository;
-                       }
-
-               };
-               repoSt.open();
+               try {
+                       CmsScriptRwtApplication appConfig = new CmsScriptRwtApplication();
+                       appConfig.init(context);
+                       CmsScriptApp app = appConfig.getApp();
+                       ServiceTracker<Repository, Repository> repoSt = new ServiceTracker<Repository, Repository>(context,
+                                       FrameworkUtil.createFilter("(&" + app.getRepo() + "(objectClass=javax.jcr.Repository))"), null) {
+
+                               @Override
+                               public Repository addingService(ServiceReference<Repository> reference) {
+                                       Repository repository = super.addingService(reference);
+                                       appConfig.setRepository(repository);
+                                       CmsScriptApp app = appConfig.getApp();
+                                       app.register(context, appConfig);
+                                       return repository;
+                               }
+
+                       };
+                       repoSt.open();
+               } catch (Exception e) {
+                       log.error("Cannot initialise script bundle " + context.getBundle().getSymbolicName(), e);
+                       throw e;
+               }
        }
 
        @Override
        public void stop(BundleContext context) throws Exception {
-//             if (appConfigReg != null)
-//                     appConfigReg.unregister();
-
        }
 
 }