From 494e505f8d0e4972bdb61297595c5f09207fdfbb Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 27 Jul 2022 06:30:42 +0200
Subject: [PATCH] Fix cardinality of HTTP handlers

---
 org.argeo.cms.ee/OSGI-INF/statusHandler.xml                  | 2 +-
 org.argeo.cms/OSGI-INF/cmsAcrHttpHandler.xml                 | 2 +-
 org.argeo.cms/OSGI-INF/cmsDeployment.xml                     | 2 +-
 org.argeo.cms/bnd.bnd                                        | 2 --
 .../org/argeo/cms/internal/runtime/CmsDeploymentImpl.java    | 5 +++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/org.argeo.cms.ee/OSGI-INF/statusHandler.xml b/org.argeo.cms.ee/OSGI-INF/statusHandler.xml
index 8461cff1f..37e6c5fba 100644
--- a/org.argeo.cms.ee/OSGI-INF/statusHandler.xml
+++ b/org.argeo.cms.ee/OSGI-INF/statusHandler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immmediate="true" name="Status Handler">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" immmediate="true" name="Status Handler">
    <implementation class="org.argeo.cms.websocket.server.StatusHandler"/>
    <service>
       <provide interface="com.sun.net.httpserver.HttpHandler"/>
diff --git a/org.argeo.cms/OSGI-INF/cmsAcrHttpHandler.xml b/org.argeo.cms/OSGI-INF/cmsAcrHttpHandler.xml
index dc45b027e..35b144935 100644
--- a/org.argeo.cms/OSGI-INF/cmsAcrHttpHandler.xml
+++ b/org.argeo.cms/OSGI-INF/cmsAcrHttpHandler.xml
@@ -3,6 +3,6 @@
    <implementation class="org.argeo.cms.internal.runtime.CmsAcrHttpHandler"/>
    <service>
       <provide interface="com.sun.net.httpserver.HttpHandler"/>
-      <property name="context.path" type="String" value="/api/acr" />
    </service>
+   <property name="context.path" type="String" value="/api/acr" />
 </scr:component>
diff --git a/org.argeo.cms/OSGI-INF/cmsDeployment.xml b/org.argeo.cms/OSGI-INF/cmsDeployment.xml
index ea54fc2f9..66541827d 100644
--- a/org.argeo.cms/OSGI-INF/cmsDeployment.xml
+++ b/org.argeo.cms/OSGI-INF/cmsDeployment.xml
@@ -4,7 +4,7 @@
    <reference bind="setCmsState" cardinality="1..1" interface="org.argeo.api.cms.CmsState" name="CmsState" policy="static"/>
    <reference bind="setCmsSshd" cardinality="0..1" interface="org.argeo.cms.CmsSshd" policy="dynamic"/>
    <reference bind="setHttpServer" cardinality="0..1" interface="com.sun.net.httpserver.HttpServer" policy="dynamic"/>
-   <reference bind="addHttpHandler" unbind="removeHttpHandler" cardinality="0..1" interface="com.sun.net.httpserver.HttpHandler" policy="dynamic"/>
+   <reference bind="addHttpHandler" unbind="removeHttpHandler" cardinality="0..n" interface="com.sun.net.httpserver.HttpHandler" policy="dynamic"/>
    <service>
       <provide interface="org.argeo.api.cms.CmsDeployment"/>
    </service>
diff --git a/org.argeo.cms/bnd.bnd b/org.argeo.cms/bnd.bnd
index ddc328c21..9bf4f14b2 100644
--- a/org.argeo.cms/bnd.bnd
+++ b/org.argeo.cms/bnd.bnd
@@ -2,9 +2,7 @@ Bundle-Activator: org.argeo.cms.internal.osgi.CmsActivator
 
 Import-Package: \
 !com.sun.security.jgss,\
-com.sun.*;resolution:=optional,\
 org.osgi.*;version=0.0.0,\
-org.apache.xerces.jaxp;resolution:=optional,\
 *
 
 Service-Component:\
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java
index 67daef2c8..421ff661a 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java
@@ -74,10 +74,11 @@ public class CmsDeploymentImpl implements CmsDeployment {
 		CmsAuthenticator authenticator = isPublic ? new PublicCmsAuthenticator() : new CmsAuthenticator();
 		httpHandlers.put(contextPath, httpHandler);
 		httpAuthenticators.put(contextPath, authenticator);
-		if (httpServer == null)
+		if (httpServer == null) {
 			return;
-		else
+		} else {
 			createHttpContext(contextPath, httpHandler, authenticator);
+		}
 	}
 
 	public void createHttpContext(String contextPath, HttpHandler httpHandler, CmsAuthenticator authenticator) {
-- 
2.30.2