diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-06 16:55:15 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-06 16:55:15 +0000 |
commit | 381a103a148d1aacb19f0afb14f66d9d6e298878 (patch) | |
tree | b6a1b26b5d8670d3f60cea728c5d9668bcb34d96 /java/sca/modules/host-webapp/src/main | |
parent | 5d83de3646c6f1b07d2221f5586088deeca27d0a (diff) |
Enable lazy loading of ServletHost extensions
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@822343 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/host-webapp/src/main')
3 files changed, 5 insertions, 79 deletions
diff --git a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java b/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java index 22bbde2a00..1205e86684 100644 --- a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java +++ b/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java @@ -162,11 +162,12 @@ public class ServletHostHelper { if (hosts == null || hosts.size() < 1) { throw new IllegalStateException("No ServletHost found"); } - ServletHost servletHost = hosts.get(0); - if (!(servletHost instanceof WebAppServletHost)) { - throw new IllegalStateException("unexpected ServletHost type: " + servletHost); + for (ServletHost servletHost : hosts) { + if ((servletHost instanceof WebAppServletHost)) { + return (WebAppServletHost)servletHost; + } } - return (WebAppServletHost)servletHost; + throw new IllegalStateException("No WebApp Servlet host is configured"); } private static Node createNode(final ServletContext servletContext) throws ServletException { diff --git a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java b/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java deleted file mode 100644 index 356d14fb83..0000000000 --- a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.host.webapp; - -import java.util.List; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.ModuleActivator; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; - -/** - * Activates the webapp host by registering the webapp ServletHost impl - * - * @version $Rev$ $Date$ - */ -public class WebAppModuleActivator implements ModuleActivator { - - public void start(ExtensionPointRegistry extensionPointRegistry) { - - ServletHostExtensionPoint servletHosts = - extensionPointRegistry.getExtensionPoint(ServletHostExtensionPoint.class); - - List<ServletHost> hosts = servletHosts.getServletHosts(); - // Only add webapp host if no other host already registered (eg jetty in standalone) - if (hosts != null && hosts.size() < 1) { - hosts.add(new WebAppServletHost()); - } - } - - public void stop(ExtensionPointRegistry registry) { - // as we know we are running in a webapp remove all of the servlet - // hosts. There will just be one - see start method - ServletHostExtensionPoint servletHosts = - registry.getExtensionPoint(ServletHostExtensionPoint.class); - List<ServletHost> hosts = servletHosts.getServletHosts(); - hosts.clear(); - } - -} diff --git a/java/sca/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/java/sca/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator deleted file mode 100644 index d99fdf257e..0000000000 --- a/java/sca/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# Implementation class for the ModuleActivator
-org.apache.tuscany.sca.host.webapp.WebAppModuleActivator
|