From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 9 Jan 2019 14:22:12 +0000 (+0100)
Subject: Log exceptions during script bundles initialisation
X-Git-Tag: argeo-commons-2.1.77~38
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=429d790d9f11eed27d7cfbb1da2d6d52f9bb82ed;p=lgpl%2Fargeo-commons.git

Log exceptions during script bundles initialisation
---

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 7b3c57e33..edf25bb00 100644
--- 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,25 +11,32 @@ import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
 
 public class ScriptAppActivator implements BundleActivator {
+	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);
-				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