Fix cardinality of HTTP handlers

diff --git a/org.argeo.cms.ee/OSGI-INF/statusHandler.xml b/org.argeo.cms.ee/OSGI-INF/statusHandler.xml
index 8461cff1fb29edb07e4b8b9016ddc949f8b2e24a..37e6c5fbaf1b1622a06b07c3eadd027621abb4a2 100644 (file)
--- 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 dc45b027e6223d7f0e9c69763314e43896643377..35b14493517cfdeec60460753dc601066fe2e160 100644 (file)
--- 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 ea54fc2f9c15e1318a8820ed3d407ebe3f49bfd7..66541827db71f0e9af08059420aa7186fe8d9140 100644 (file)
--- 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 ddc328c21cff20178e10af5c3c5a27037995e61d..9bf4f14b241bcab8d574fc434239f366a74cb887 100644 (file)
--- 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 67daef2c8c8e5ce249b7cb8107b4626bf55f2e2b..421ff661aeb2decf812a3f9a2baec23a4ebbd31b 100644 (file)
--- 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) {