Move Jetty factory to the servlet bundle

diff --git a/org.argeo.cms.servlet/.project b/org.argeo.cms.servlet/.project
index b1a25fcc8fbc4ce73d08ee6336ec94f539aa2e58..d39f974725fc5f620c89492e5b8ecad0b9fd66d5 100644 (file)
--- a/org.argeo.cms.servlet/.project
+++ b/org.argeo.cms.servlet/.project
@@ -20,6 +20,11 @@
                        <arguments>
                        </arguments>
                </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.ds.core.builder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.pde.PluginNature</nature>

diff --git a/org.argeo.cms.servlet/OSGI-INF/jettyServiceFactory.xml b/org.argeo.cms.servlet/OSGI-INF/jettyServiceFactory.xml
new file mode 100644 (file)
index 0000000..c007351
--- /dev/null
+++ b/org.argeo.cms.servlet/OSGI-INF/jettyServiceFactory.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" name="Jetty Service Factory">
+   <implementation class="org.argeo.cms.servlet.internal.jetty.JettyServiceFactory"/>
+   <service>
+      <provide interface="org.osgi.service.cm.ManagedServiceFactory"/>
+   </service>
+   <property name="service.pid" type="String" value="org.argeo.equinox.jetty.config"/>
+</scr:component>

diff --git a/org.argeo.cms.servlet/bnd.bnd b/org.argeo.cms.servlet/bnd.bnd
index 14575ada8c156fff61154661d234ad9dcefcea7d..b539a49bb5e55dca5400bdfe9535e630a7a4e414 100644 (file)
--- a/org.argeo.cms.servlet/bnd.bnd
+++ b/org.argeo.cms.servlet/bnd.bnd
@@ -6,5 +6,6 @@ org.argeo.cms.osgi,\
 *
 
 Service-Component:\
+OSGI-INF/jettyServiceFactory.xml,\
 OSGI-INF/pkgServletContext.xml,\
 OSGI-INF/pkgServlet.xml

diff --git a/org.argeo.cms.servlet/build.properties b/org.argeo.cms.servlet/build.properties
index 34d2e4d2dad529ceaeb953bfcdb63c51d69ffed2..ee94f53be160fa0642e9d1cfd612c545df535738 100644 (file)
--- a/org.argeo.cms.servlet/build.properties
+++ b/org.argeo.cms.servlet/build.properties
@@ -1,4 +1,5 @@
-source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/jettyServiceFactory.xml
+source.. = src/

diff --git a/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/jetty/JettyServiceFactory.java b/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/jetty/JettyServiceFactory.java
new file mode 100644 (file)
index 0000000..05de32c
--- /dev/null
+++ b/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/jetty/JettyServiceFactory.java
@@ -0,0 +1,79 @@
+package org.argeo.cms.servlet.internal.jetty;
+
+import java.util.Dictionary;
+
+import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.CmsLog;
+import org.eclipse.equinox.http.jetty.JettyConfigurator;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.service.cm.ConfigurationException;
+import org.osgi.service.cm.ManagedServiceFactory;
+
+public class JettyServiceFactory implements ManagedServiceFactory {
+       private final CmsLog log = CmsLog.getLog(JettyServiceFactory.class);
+
+       public void start() {
+
+       }
+
+       @Override
+       public String getName() {
+               return "Jetty Service Factory";
+       }
+
+       @Override
+       public void updated(String pid, Dictionary<String, ?> properties) throws ConfigurationException {
+               // Explicitly configures Jetty so that the default server is not started by the
+               // activator of the Equinox Jetty bundle.
+
+//             if (!webServerConfig.isEmpty()) {
+//             webServerConfig.put("customizer.class", KernelConstants.CMS_JETTY_CUSTOMIZER_CLASS);
+//
+//             // TODO centralise with Jetty extender
+//             Object webSocketEnabled = webServerConfig.get(InternalHttpConstants.WEBSOCKET_ENABLED);
+//             if (webSocketEnabled != null && webSocketEnabled.toString().equals("true")) {
+//                     bc.registerService(ServerEndpointConfig.Configurator.class, new CmsWebSocketConfigurator(), null);
+//                     webServerConfig.put(InternalHttpConstants.WEBSOCKET_ENABLED, "true");
+//             }
+//     }
+
+               int tryCount = 60;
+               try {
+                       tryGettyJetty: while (tryCount > 0) {
+                               try {
+                                       // FIXME deal with multiple ids
+                                       JettyConfigurator.startServer(CmsConstants.DEFAULT, properties);
+                                       // Explicitly starts Jetty OSGi HTTP bundle, so that it gets triggered if OSGi
+                                       // configuration is not cleaned
+                                       FrameworkUtil.getBundle(JettyConfigurator.class).start();
+                                       break tryGettyJetty;
+                               } catch (IllegalStateException e) {
+                                       // Jetty may not be ready
+                                       try {
+                                               Thread.sleep(1000);
+                                       } catch (Exception e1) {
+                                               // silent
+                                       }
+                                       tryCount--;
+                               }
+                       }
+               } catch (Exception e) {
+                       log.error("Cannot start default Jetty server with config " + properties, e);
+               }
+
+       }
+
+       @Override
+       public void deleted(String pid) {
+       }
+
+       public void stop() {
+               try {
+                       JettyConfigurator.stopServer(CmsConstants.DEFAULT);
+               } catch (Exception e) {
+                       log.error("Cannot stop default Jetty server.", e);
+               }
+
+       }
+
+}

diff --git a/org.argeo.cms/OSGI-INF/cmsContext.xml b/org.argeo.cms/OSGI-INF/cmsContext.xml
index eab5b92b48fc798d02be1c895af906a7b9c11be6..63d43192e9b6294084e9d4a83c37d6b1980881f1 100644 (file)
--- a/org.argeo.cms/OSGI-INF/cmsContext.xml
+++ b/org.argeo.cms/OSGI-INF/cmsContext.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" activate="init" deactivate="destroy" immediate="true" name="CMS Context">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" immediate="true" name="CMS Context">
    <implementation class="org.argeo.cms.internal.runtime.CmsContextImpl"/>
    <reference bind="setCmsDeployment" cardinality="1..1" interface="org.argeo.api.cms.CmsDeployment" name="CmsDeployment" policy="static"/>
    <service>

diff --git a/org.argeo.cms/OSGI-INF/cmsDeployment.xml b/org.argeo.cms/OSGI-INF/cmsDeployment.xml
index 4093f3e2178dbf3ddb2959164342f483f8df8438..d36a911102376e4f3f29b14409a184c46d8f4d5f 100644 (file)
--- a/org.argeo.cms/OSGI-INF/cmsDeployment.xml
+++ b/org.argeo.cms/OSGI-INF/cmsDeployment.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" activate="init" deactivate="destroy" immediate="false" name="CMS Deployment">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" immediate="false" name="CMS Deployment">
    <reference bind="setDeployConfig" cardinality="1..1" interface="org.argeo.cms.internal.osgi.DeployConfig" name="DeployConfig" policy="static"/>
    <implementation class="org.argeo.cms.internal.runtime.CmsDeploymentImpl"/>
    <reference bind="setCmsState" cardinality="1..1" interface="org.argeo.api.cms.CmsState" name="CmsState" policy="static"/>

diff --git a/org.argeo.cms/OSGI-INF/cmsState.xml b/org.argeo.cms/OSGI-INF/cmsState.xml
index 9e9ecc4df37dac870d9ecb140bc56e681d3b8933..a81e9f0681c17a03a65ab57a024c9cf5ba877be2 100644 (file)
--- a/org.argeo.cms/OSGI-INF/cmsState.xml
+++ b/org.argeo.cms/OSGI-INF/cmsState.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" activate="init" deactivate="destroy" immediate="false" name="CMS State">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" immediate="false" name="CMS State">
    <implementation class="org.argeo.cms.internal.runtime.CmsStateImpl"/>
    <service>
       <provide interface="org.argeo.api.cms.CmsState"/>

diff --git a/org.argeo.cms/OSGI-INF/deployConfig.xml b/org.argeo.cms/OSGI-INF/deployConfig.xml
index 85b30902132b565f961b95acbd16ebc0698815b8..03094342e14e162fa82f4e24eb9431c57cc35fc1 100644 (file)
--- a/org.argeo.cms/OSGI-INF/deployConfig.xml
+++ b/org.argeo.cms/OSGI-INF/deployConfig.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" activate="init" deactivate="destroy" name="Deploy Config">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" name="Deploy Config">
    <implementation class="org.argeo.cms.internal.osgi.DeployConfig"/>
    <service>
       <provide interface="org.argeo.cms.internal.osgi.DeployConfig"/>

diff --git a/org.argeo.cms/OSGI-INF/nodeUserAdmin.xml b/org.argeo.cms/OSGI-INF/nodeUserAdmin.xml
index f86eba6324ebcd483d83529506ab5a4322b58740..328d7bea5a7cc6424c3759597679db9f99ec0bab 100644 (file)
--- a/org.argeo.cms/OSGI-INF/nodeUserAdmin.xml
+++ b/org.argeo.cms/OSGI-INF/nodeUserAdmin.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" activate="init" deactivate="destroy" name="Node User Admin">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" name="Node User Admin">
    <implementation class="org.argeo.cms.internal.osgi.NodeUserAdmin"/>
    <property name="service.pid" type="String" value="org.argeo.api.userAdmin"/>
    <reference bind="setTransactionManager" cardinality="1..1" interface="org.argeo.osgi.transaction.WorkControl" name="WorkControl" policy="static"/>

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/osgi/DeployConfig.java b/org.argeo.cms/src/org/argeo/cms/internal/osgi/DeployConfig.java
index c31f50ded9c8ad8f98a0b40f45d5e0a3758760fa..deb33047502d325b006a63c0e69a928a14c24cc1 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/osgi/DeployConfig.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/osgi/DeployConfig.java
@@ -27,8 +27,6 @@ import org.argeo.osgi.useradmin.UserAdminConf;
 import org.argeo.util.naming.AttributesDictionary;
 import org.argeo.util.naming.LdifParser;
 import org.argeo.util.naming.LdifWriter;
-import org.eclipse.equinox.http.jetty.JettyConfigurator;
-import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
@@ -120,65 +118,29 @@ public class DeployConfig implements ConfigurationListener {
                }
 
                // http server
-//             Dictionary<String, Object> webServerConfig = InitUtils
-//                             .getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, NodeConstants.DEFAULT));
-//             if (!webServerConfig.isEmpty()) {
-//                     // TODO check for other customizers
+               Dictionary<String, Object> webServerConfig = InitUtils
+                               .getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, CmsConstants.DEFAULT));
+               if (!webServerConfig.isEmpty()) {
+                       // TODO check for other customizers
 //                     webServerConfig.put("customizer.class", "org.argeo.equinox.jetty.CmsJettyCustomizer");
-//                     putFactoryDeployConfig(KernelConstants.JETTY_FACTORY_PID, webServerConfig);
-//             }
-               LdapName defaultHttpServiceDn = serviceDn(KernelConstants.JETTY_FACTORY_PID, CmsConstants.DEFAULT);
-               if (deployConfigs.containsKey(defaultHttpServiceDn)) {
-                       // remove old default configs since we have now to start Jetty servlet bridge
-                       // indirectly
-                       deployConfigs.remove(defaultHttpServiceDn);
+                       putFactoryDeployConfig(KernelConstants.JETTY_FACTORY_PID, webServerConfig);
                }
+//             LdapName defaultHttpServiceDn = serviceDn(KernelConstants.JETTY_FACTORY_PID, CmsConstants.DEFAULT);
+//             if (deployConfigs.containsKey(defaultHttpServiceDn)) {
+//                     // remove old default configs since we have now to start Jetty servlet bridge
+//                     // indirectly
+//                     deployConfigs.remove(defaultHttpServiceDn);
+//             }
 
                // SAVE
                save();
                //
 
-               // Explicitly configures Jetty so that the default server is not started by the
-               // activator of the Equinox Jetty bundle.
-               Dictionary<String, Object> webServerConfig = InitUtils
-                               .getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, CmsConstants.DEFAULT));
-//             if (!webServerConfig.isEmpty()) {
-//                     webServerConfig.put("customizer.class", KernelConstants.CMS_JETTY_CUSTOMIZER_CLASS);
-//
-//                     // TODO centralise with Jetty extender
-//                     Object webSocketEnabled = webServerConfig.get(InternalHttpConstants.WEBSOCKET_ENABLED);
-//                     if (webSocketEnabled != null && webSocketEnabled.toString().equals("true")) {
-//                             bc.registerService(ServerEndpointConfig.Configurator.class, new CmsWebSocketConfigurator(), null);
-//                             webServerConfig.put(InternalHttpConstants.WEBSOCKET_ENABLED, "true");
-//                     }
-//             }
-
-               int tryCount = 60;
-               try {
-                       tryGettyJetty: while (tryCount > 0) {
-                               try {
-                                       JettyConfigurator.startServer(KernelConstants.DEFAULT_JETTY_SERVER, webServerConfig);
-                                       // Explicitly starts Jetty OSGi HTTP bundle, so that it gets triggered if OSGi
-                                       // configuration is not cleaned
-                                       FrameworkUtil.getBundle(JettyConfigurator.class).start();
-                                       break tryGettyJetty;
-                               } catch (IllegalStateException e) {
-                                       // Jetty may not be ready
-                                       try {
-                                               Thread.sleep(1000);
-                                       } catch (Exception e1) {
-                                               // silent
-                                       }
-                                       tryCount--;
-                               }
-                       }
-               } catch (Exception e) {
-                       log.error("Cannot start default Jetty server with config " + webServerConfig, e);
-               }
-
+//             Dictionary<String, Object> webServerConfig = InitUtils
+//                             .getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, CmsConstants.DEFAULT));
        }
 
-       public void init() throws IOException {
+       public void start() throws IOException {
                if (!isInitialized()) { // first init
                        isFirstInit = true;
                        firstInit();
@@ -205,7 +167,7 @@ public class DeployConfig implements ConfigurationListener {
                // TODO check consistency if not clean
        }
 
-       public void destroy() {
+       public void stop() {
 
        }
 

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/osgi/NodeUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/osgi/NodeUserAdmin.java
index d9524e89752cc88da682c8809977386c2b87f321..3850010e99544dd94c77e641da774fa5b678ad67 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/osgi/NodeUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/osgi/NodeUserAdmin.java
@@ -111,10 +111,10 @@ public class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServic
 //             }
        }
 
-       public void init() {
+       public void start() {
        }
 
-       public void destroy() {
+       public void stop() {
        }
 
        @Override

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsContextImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsContextImpl.java
index 7ce2e8bd5dfa76a2a9546cfd56129795c8cd3ae5..8e29f667365e10870da3f4ebf36d873af2d31594 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsContextImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsContextImpl.java
@@ -39,7 +39,7 @@ public class CmsContextImpl implements CmsContext {
 //             initTrackers();
 //     }
 
-       public void init() {
+       public void start() {
                Object defaultLocaleValue = KernelUtils.getFrameworkProp(CmsConstants.I18N_DEFAULT_LOCALE);
                defaultLocale = defaultLocaleValue != null ? new Locale(defaultLocaleValue.toString())
                                : new Locale(ENGLISH.getLanguage());
@@ -70,7 +70,7 @@ public class CmsContextImpl implements CmsContext {
                setInstance(this);
        }
 
-       public void destroy() {
+       public void stop() {
                setInstance(null);
        }
 

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 83f688a6a89c0e6ec89bd2b4bfceabcc1e391512..4ffa03a63fffe2ff37d4f18db8494b849275c97a 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
@@ -8,7 +8,6 @@ import org.argeo.api.cms.CmsDeployment;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsState;
 import org.argeo.cms.internal.osgi.DeployConfig;
-import org.eclipse.equinox.http.jetty.JettyConfigurator;
 import org.osgi.service.http.HttpService;
 
 /** Implementation of a CMS deployment. */
@@ -111,7 +110,7 @@ public class CmsDeploymentImpl implements CmsDeployment {
 //             KernelUtils.asyncOpen(confAdminSt);
        }
 
-       public void init() {
+       public void start() {
                httpExpected = deployConfig.getProps(KernelConstants.JETTY_FACTORY_PID, "default") != null;
                if (deployConfig.hasDomain()) {
                        loadIpaJaasConfiguration();
@@ -177,18 +176,19 @@ public class CmsDeploymentImpl implements CmsDeployment {
                }
        }
 
-       public void destroy() {
+       public void stop() {
 //             if (nodeHttp != null)
 //                     nodeHttp.destroy();
 
-               try {
-                       JettyConfigurator.stopServer(KernelConstants.DEFAULT_JETTY_SERVER);
-               } catch (Exception e) {
-                       log.error("Cannot stop default Jetty server.", e);
-               }
+//             try {
+//                     JettyConfigurator.stopServer(KernelConstants.DEFAULT_JETTY_SERVER);
+//             } catch (Exception e) {
+//                     log.error("Cannot stop default Jetty server.", e);
+//             }
 
                if (deployConfig != null) {
-                       new Thread(() -> deployConfig.save(), "Save Argeo Deploy Config").start();
+                       deployConfig.save();
+                       // new Thread(() -> deployConfig.save(), "Save Argeo Deploy Config").start();
                }
        }
 

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
index c071283949b3d688d7738fb4ee79cc9482348e10..b493c08ef3cb923d286444d96e96b8e1c1fdc4ab 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
@@ -33,7 +33,7 @@ public class CmsStateImpl implements CmsState {
 //     private final boolean cleanState;
        private String hostname;
 
-       public void init() {
+       public void start() {
 //             instance = this;
 
                Runtime.getRuntime().addShutdownHook(new CmsShutdown());
@@ -175,7 +175,7 @@ public class CmsStateImpl implements CmsState {
 //                     log.debug("Initialised default Bitronix transaction manager");
 //     }
 
-       public void destroy() {
+       public void stop() {
                if (log.isDebugEnabled())
                        log.debug("CMS stopping...  (" + this.stateUuid + ")");
 //             new GogoShellKiller().start();

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelConstants.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelConstants.java
index d491a6623c72740aa485aaeaa035d4522f1618ef..dfe86cfaaf7e95a8621a80bf30fb3ae6a2b88969 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelConstants.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelConstants.java
@@ -39,7 +39,8 @@ public interface KernelConstants {
        // String PATH_WORKBENCH = "/ui";
        // String PATH_WORKBENCH_PUBLIC = PATH_WORKBENCH + "/public";
 
-       String JETTY_FACTORY_PID = "org.eclipse.equinox.http.jetty.config";
+//     String JETTY_FACTORY_PID = "org.eclipse.equinox.http.jetty.config";
+       String JETTY_FACTORY_PID = "org.argeo.equinox.jetty.config";
        String WHITEBOARD_PATTERN_PROP = "osgi.http.whiteboard.servlet.pattern";
        // default Jetty server configured via JettyConfigurator
        String DEFAULT_JETTY_SERVER = "default";

diff --git a/sdk/cms-e4-rap.properties b/sdk/cms-e4-rap.properties
index fd897d48fe89eec80928ab71ef403bf8809310e0..a11ba7e1c82510383fac2274cfffda099d41ff97 100644 (file)
--- a/sdk/cms-e4-rap.properties
+++ b/sdk/cms-e4-rap.properties
@@ -10,6 +10,7 @@ argeo.osgi.start.3.node=\
 org.argeo.cms
 
 argeo.osgi.start.4.node=\
+org.argeo.cms.servlet,\
 org.argeo.cms.jcr
 
 argeo.osgi.start.5.node=\