From 60bc3fda9aaed67c76535ea34521397e327f098d Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 26 Feb 2009 12:16:20 +0000 Subject: Chnage Jetty host to make itself default if multiple hosts registered so that in standalone runtime environment jetty is used even if webapp host in the classpath git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@748108 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'java') diff --git a/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java b/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java index 31c8397f8b..dde99a1fac 100644 --- a/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java +++ b/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java @@ -21,12 +21,14 @@ package org.apache.tuscany.sca.http.jetty; import java.security.AccessController; import java.security.PrivilegedAction; +import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.ModuleActivator; import org.apache.tuscany.sca.core.UtilityExtensionPoint; +import org.apache.tuscany.sca.host.http.ServletHost; import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; import org.apache.tuscany.sca.work.WorkScheduler; @@ -43,8 +45,11 @@ public class JettyRuntimeModuleActivator implements ModuleActivator { // Register a Jetty Servlet host ServletHostExtensionPoint servletHosts = extensionPointRegistry.getExtensionPoint(ServletHostExtensionPoint.class); - - if (servletHosts.getServletHosts().size() < 1) { + + List hosts = servletHosts.getServletHosts(); + if (hosts != null) { + // Clear out any other hosts (eg webapp or tomcat) and add this jetty host is default + hosts.clear(); UtilityExtensionPoint utilities = extensionPointRegistry.getExtensionPoint(UtilityExtensionPoint.class); final WorkScheduler workScheduler = utilities.getUtility(WorkScheduler.class); // Allow privileged access to start MBeans. Requires MBeanPermission in security policy. -- cgit v1.2.3