From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 8 Mar 2024 16:01:54 +0000 (+0100)
Subject: Make CMS JCR deployment mor erobust
X-Git-Tag: v2.1.6~2^2~7
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=21398e5a80dd0f163e2f6389482ee9d6e24ac068;hp=9f91ada8a503a5202088770d6aa66adadce9ca93;p=gpl%2Fargeo-jcr.git

Make CMS JCR deployment mor erobust
---

diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java
index a871355..f3ce912 100644
--- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java
+++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java
@@ -42,7 +42,6 @@ import org.argeo.jcr.JcrUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
-import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.wiring.BundleCapability;
@@ -54,7 +53,7 @@ import org.osgi.util.tracker.ServiceTracker;
 /** Implementation of a CMS deployment. */
 public class CmsJcrDeployment {
 	private final CmsLog log = CmsLog.getLog(getClass());
-	private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
+	private BundleContext bc;
 
 	private DataModels dataModels;
 	private String webDavConfig = JcrHttpUtils.WEBDAV_CONFIG;
@@ -66,8 +65,13 @@ public class CmsJcrDeployment {
 
 	private ProvidedRepository contentRepository;
 
-//	CmsDeployment cmsDeployment;
-	public void start() {
+	public CmsJcrDeployment() {
+	}
+
+	// CmsDeployment cmsDeployment;
+	public void start(BundleContext bundleContext) {
+		// Bundle bundle = FrameworkUtil.getBundle(CmsJcrDeployment.class);
+		bc = bundleContext;
 		dataModels = new DataModels(bc);
 
 		contentRepository.registerTypes(JcrContentNamespace.values());