From 549ff25baf9371d910065303e22daf49321b517a Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 9 Jan 2022 05:39:24 +0100 Subject: [PATCH] Adapt to recent API changes --- org.argeo.cms.jcr/OSGI-INF/jcrDeployment.xml | 4 ++-- ...rDeployment.java => CmsJcrDeployment.java} | 16 ++++++++-------- .../jcr/internal/osgi/CmsJcrActivator.java | 19 ++++++------------- sdk/cms-e4-rap.properties | 3 ++- 4 files changed, 18 insertions(+), 24 deletions(-) rename org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/{JcrDeployment.java => CmsJcrDeployment.java} (98%) diff --git a/org.argeo.cms.jcr/OSGI-INF/jcrDeployment.xml b/org.argeo.cms.jcr/OSGI-INF/jcrDeployment.xml index 4ca86d31c..fcba11cc5 100644 --- a/org.argeo.cms.jcr/OSGI-INF/jcrDeployment.xml +++ b/org.argeo.cms.jcr/OSGI-INF/jcrDeployment.xml @@ -1,5 +1,5 @@ - - + + diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrDeployment.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java similarity index 98% rename from org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrDeployment.java rename to org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java index b541b41a4..62899cdf6 100644 --- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrDeployment.java +++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java @@ -29,9 +29,9 @@ import javax.servlet.Servlet; import org.apache.jackrabbit.commons.cnd.CndImporter; import org.apache.jackrabbit.core.RepositoryContext; import org.apache.jackrabbit.core.RepositoryImpl; +import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsDeployment; import org.argeo.api.cms.CmsLog; -import org.argeo.api.cms.CmsConstants; import org.argeo.cms.ArgeoNames; import org.argeo.cms.internal.jcr.JcrInitUtils; import org.argeo.cms.jcr.CmsJcrUtils; @@ -60,7 +60,7 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; import org.osgi.util.tracker.ServiceTracker; /** Implementation of a CMS deployment. */ -public class JcrDeployment { +public class CmsJcrDeployment { private final CmsLog log = CmsLog.getLog(getClass()); private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext(); @@ -72,9 +72,9 @@ public class JcrDeployment { // Readiness private boolean nodeAvailable = false; - CmsDeployment nodeDeployment; + CmsDeployment cmsDeployment; - public JcrDeployment() { + public CmsJcrDeployment() { dataModels = new DataModels(bc); // initTrackers(); } @@ -87,7 +87,7 @@ public class JcrDeployment { // nodeDeployment = CmsJcrActivator.getService(NodeDeployment.class); - JcrInitUtils.addToDeployment(nodeDeployment); + JcrInitUtils.addToDeployment(cmsDeployment); } @@ -106,8 +106,8 @@ public class JcrDeployment { } - public void setNodeDeployment(CmsDeployment nodeDeployment) { - this.nodeDeployment = nodeDeployment; + public void setCmsDeployment(CmsDeployment cmsDeployment) { + this.cmsDeployment = cmsDeployment; } /** @@ -356,7 +356,7 @@ public class JcrDeployment { } boolean isStandalone(String dataModelName) { - return nodeDeployment.getProps(CmsConstants.NODE_REPOS_FACTORY_PID, dataModelName) != null; + return cmsDeployment.getProps(CmsConstants.NODE_REPOS_FACTORY_PID, dataModelName) != null; } private void publishLocalRepo(String dataModelName, Repository repository) { diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/osgi/CmsJcrActivator.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/osgi/CmsJcrActivator.java index 677fc73da..7332fde29 100644 --- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/osgi/CmsJcrActivator.java +++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/osgi/CmsJcrActivator.java @@ -1,42 +1,34 @@ package org.argeo.cms.jcr.internal.osgi; import java.nio.file.spi.FileSystemProvider; -import java.util.ArrayList; import java.util.Dictionary; -import java.util.List; import javax.jcr.RepositoryFactory; import org.argeo.api.cms.CmsConstants; import org.argeo.cms.jcr.internal.CmsFsProvider; -import org.argeo.cms.jcr.internal.StatisticsThread; import org.argeo.cms.jcr.internal.NodeRepositoryFactory; import org.argeo.cms.jcr.internal.RepositoryServiceFactory; +import org.argeo.cms.jcr.internal.StatisticsThread; import org.argeo.util.LangUtils; -import org.osgi.framework.Bundle; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; -import org.osgi.framework.FrameworkUtil; import org.osgi.service.cm.ManagedServiceFactory; public class CmsJcrActivator implements BundleActivator { private static BundleContext bundleContext; - static { - Bundle bundle = FrameworkUtil.getBundle(CmsJcrActivator.class); - if (bundle != null) { - bundleContext = bundle.getBundleContext(); - } - } // private List stopHooks = new ArrayList<>(); private StatisticsThread kernelThread; private RepositoryServiceFactory repositoryServiceFactory; -// private JcrDeployment jcrDeployment; +// private CmsJcrDeployment jcrDeployment; @Override public void start(BundleContext context) throws Exception { + bundleContext = context; + // kernel thread kernelThread = new StatisticsThread("Kernel Thread"); kernelThread.setContextClassLoader(getClass().getClassLoader()); @@ -66,7 +58,7 @@ public class CmsJcrActivator implements BundleActivator { registerService(FileSystemProvider.class, cmsFsProvider, LangUtils.dict(Constants.SERVICE_PID, CmsConstants.NODE_FS_PROVIDER_PID)); -// jcrDeployment = new JcrDeployment(); +// jcrDeployment = new CmsJcrDeployment(); // jcrDeployment.init(); } @@ -81,6 +73,7 @@ public class CmsJcrActivator implements BundleActivator { if (kernelThread != null) kernelThread.destroyAndJoin(); + bundleContext = null; } @Deprecated diff --git a/sdk/cms-e4-rap.properties b/sdk/cms-e4-rap.properties index 5e1e6545d..fd897d48f 100644 --- a/sdk/cms-e4-rap.properties +++ b/sdk/cms-e4-rap.properties @@ -23,7 +23,8 @@ org.osgi.service.http.port=7070 #org.eclipse.equinox.http.jetty.websocket.enabled=true # Logging -log4j.configuration=file:../../log4j.properties +log.org.argeo=DEBUG +#log4j.configuration=file:../../log4j.properties # SSL #org.osgi.service.http.port.secure=7073 -- 2.30.2