svn commit: r748108 - /tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java

[antelder]

Author: antelder
Date: Thu Feb 26 12:16:20 2009
New Revision: 748108

URL: http://svn.apache.org/viewvc?rev=748108&view=rev
Log:
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

Modified:
    
tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java

Modified: 
tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java?rev=748108&r1=748107&r2=748108&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java
 (original)
+++ 
tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java
 Thu Feb 26 12:16:20 2009
@@ -21,12 +21,14 @@
 
 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 @@
         // Register a Jetty Servlet host
         ServletHostExtensionPoint servletHosts =
             
extensionPointRegistry.getExtensionPoint(ServletHostExtensionPoint.class);
-        
-        if (servletHosts.getServletHosts().size() < 1) {
+
+        List<ServletHost> 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.