From 21398e5a80dd0f163e2f6389482ee9d6e24ac068 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 8 Mar 2024 17:01:54 +0100 Subject: [PATCH] Make CMS JCR deployment mor erobust --- .../org/argeo/cms/jcr/internal/CmsJcrDeployment.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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()); -- 2.30.2