diff options
Diffstat (limited to 'branches/sca-java-1.0.1/modules/host-webapp')
13 files changed, 0 insertions, 981 deletions
diff --git a/branches/sca-java-1.0.1/modules/host-webapp/DISCLAIMER b/branches/sca-java-1.0.1/modules/host-webapp/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/modules/host-webapp/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
diff --git a/branches/sca-java-1.0.1/modules/host-webapp/LICENSE b/branches/sca-java-1.0.1/modules/host-webapp/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/modules/host-webapp/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. - - - diff --git a/branches/sca-java-1.0.1/modules/host-webapp/NOTICE b/branches/sca-java-1.0.1/modules/host-webapp/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/modules/host-webapp/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/modules/host-webapp/pom.xml b/branches/sca-java-1.0.1/modules/host-webapp/pom.xml deleted file mode 100644 index b25ec64bb1..0000000000 --- a/branches/sca-java-1.0.1/modules/host-webapp/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-modules</artifactId> - <version>1.0.1-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>tuscany-host-webapp</artifactId> - <name>Apache Tuscany SCA Webapp Host</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-contribution-impl</artifactId> - <version>1.0.1-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-http</artifactId> - <version>1.0.1-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.0.1-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> <!-- to keep compatible with older servlet containers --> - <scope>provided</scope> - </dependency> - - </dependencies> -</project> diff --git a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java b/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java deleted file mode 100644 index e6300c81b9..0000000000 --- a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java +++ /dev/null @@ -1,55 +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.io.File; - -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; - -import org.apache.tuscany.sca.host.embedded.impl.HotUpdatableSCADomain; - -/** - * A WebApp ContextListener that starts a Tuscany runtime supporting multiple - * SCA contribution jars. All contribution jars found in the repository - * directory named "sca-contributions" will be contributed to the SCA - * domain. Any changes to the contributions in the repository will be - * automatically detected and the sca domain updated accordingly. - */ -public class HotUpdateContextListener extends TuscanyContextListener { - - public static final String REPOSITORY_FOLDER_NAME = "sca-contributions"; - - @Override - public void contextInitialized(ServletContextEvent event) { - ServletContext servletContext = event.getServletContext(); - - // TODO better domaiURI, maybe based on webapp name? - String domainURI = "http://localhost/" + servletContext.getServletContextName().replace(' ', '.'); - - File repository = new File(servletContext.getRealPath(REPOSITORY_FOLDER_NAME)); - HotUpdatableSCADomain scaDomain = new HotUpdatableSCADomain(domainURI, repository, 2000); - - servletContext.setAttribute(SCADomainHelper.SCA_DOMAIN_ATTRIBUTE, scaDomain); - - super.contextInitialized(event); - } - -} diff --git a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java b/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java deleted file mode 100644 index 7de0d48db5..0000000000 --- a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java +++ /dev/null @@ -1,71 +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.io.File; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.servlet.ServletContext; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * Utility class to initialize the SCADomian associated with a webapp - * - * @deprecated Not necessary anymore with TuscanyServletFilter - */ -@Deprecated -public class SCADomainHelper { - - static final String SCA_DOMAIN_ATTRIBUTE = "org.apache.tuscany.sca.SCADomain"; - - /** - * Initializes the SCADomian associated with a webapp context. If a SCADomain - * doesn't exist already then one is create based on the webapp config. - */ - static SCADomain initSCADomain(ServletContext servletContext) { - SCADomain scaDomain = (SCADomain)servletContext.getAttribute(SCA_DOMAIN_ATTRIBUTE); - - String domainURI = "http://localhost/" + servletContext.getServletContextName().replace(' ', '.'); - String contributionRoot = null; - - try { - URL rootURL = servletContext.getResource("/"); - if (rootURL.getProtocol().equals("jndi")) { - //this is tomcat case, we should use getRealPath - File warRootFile = new File(servletContext.getRealPath("/")); - contributionRoot = warRootFile.toURL().toString(); - } else { - //this is jetty case - contributionRoot = rootURL.toString(); - } - } catch(MalformedURLException mf) { - //ignore, pass null - } - - - if (scaDomain == null) { - scaDomain = SCADomain.newInstance(domainURI, contributionRoot); - servletContext.setAttribute(SCA_DOMAIN_ATTRIBUTE, scaDomain); - } - return scaDomain; - } -} diff --git a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java b/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java deleted file mode 100644 index d64a6209c8..0000000000 --- a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java +++ /dev/null @@ -1,54 +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 javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * A ServletContextListener to create and close the SCADomain - * when the webapp is initialized or destroyed. - * - * @deprecated Not needed anymore, TuscanyServletFilter is sufficient - */ -@Deprecated -public class TuscanyContextListener implements ServletContextListener { - - public void contextInitialized(ServletContextEvent event) { - ServletContext servletContext = event.getServletContext(); - try { - SCADomainHelper.initSCADomain(servletContext); - } catch (Throwable e) { - servletContext.log("exception initializing SCADomain", e); - } - } - - public void contextDestroyed(ServletContextEvent event) { - ServletContext servletContext = event.getServletContext(); - SCADomain scaDomain = (SCADomain) servletContext.getAttribute(SCADomainHelper.SCA_DOMAIN_ATTRIBUTE); - if (scaDomain != null) { - scaDomain.close(); - } - } - -} diff --git a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java b/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java deleted file mode 100644 index c2d8826ffc..0000000000 --- a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java +++ /dev/null @@ -1,66 +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.io.IOException; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; - -/** - * A servlet that forwards requests to the servlets registered with the Tuscany - * ServletHost. - * - * @deprecated Not needed anymore, TuscanyServletFilter is sufficient - */ -@Deprecated -public class TuscanyServlet extends HttpServlet { - private static final long serialVersionUID = 1L; - - private transient WebAppServletHost servletHost; - - @Override - public void init(ServletConfig config) throws ServletException { - ServletContext servletContext = config.getServletContext(); - SCADomainHelper.initSCADomain(servletContext); - - // TODO: must be a better way to get this than using a static - servletHost = WebAppServletHost.getInstance(); - servletHost.init(config); - } - - @Override - public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException { - String path = ((HttpServletRequest)req).getPathInfo(); - RequestDispatcher dispatcher = servletHost.getRequestDispatcher(path); - if (dispatcher == null) { - throw new IllegalStateException("No servlet registered for path: " + path); - } - - dispatcher.forward(req, res); - } - -} diff --git a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java b/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java deleted file mode 100644 index f4e33c954f..0000000000 --- a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java +++ /dev/null @@ -1,97 +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.io.IOException; -import java.util.Enumeration; - -import javax.servlet.Filter; -import javax.servlet.FilterConfig; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; - -/** - * A servlet filter that forwards service requests to the servlets registered with - * the Tuscany ServletHost. - */ -public class TuscanyServletFilter implements Filter { - private static final long serialVersionUID = 1L; - //private static final Logger logger = Logger.getLogger(WebAppServletHost.class.getName()); - - private WebAppServletHost servletHost; - - public void init(final FilterConfig config) throws ServletException { - - // TODO: must be a better way to get this than using a static - servletHost = WebAppServletHost.getInstance(); - - // Initialize the servlet host - servletHost.init(new ServletConfig() { - public String getInitParameter(String name) { - return config.getInitParameter(name); - } - public Enumeration getInitParameterNames() { - return config.getInitParameterNames(); - } - public ServletContext getServletContext() { - return config.getServletContext(); - } - public String getServletName() { - return config.getFilterName(); - } - }); - } - - public void destroy() { - WebAppServletHost.getInstance().destroy(); - } - - public void doFilter(ServletRequest request, ServletResponse response, javax.servlet.FilterChain chain) throws IOException ,ServletException { - - // Get the servlet path - HttpServletRequest httpRequest = (HttpServletRequest)request; - String path = httpRequest.getPathInfo(); - if (path == null) { - path = httpRequest.getServletPath(); - } - if (path == null) { - path = "/"; - } - - // Get a request dispatcher for the servlet mapped to that path - RequestDispatcher dispatcher = servletHost.getRequestDispatcher(path); - if (dispatcher != null) { - - // Let the dispatcher forward the request to the servlet - dispatcher.forward(request, response); - - } else { - - // Proceed down the filter chain - chain.doFilter(request, response); - - } - } -} diff --git a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java b/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java deleted file mode 100644 index 09b11145d6..0000000000 --- a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java +++ /dev/null @@ -1,42 +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 org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.ModuleActivator; -import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; - -/** - * Activates the webapp host by registering the webapp ServletHost impl - */ -public class WebAppModuleActivator implements ModuleActivator { - - public void start(ExtensionPointRegistry extensionPointRegistry) { - - ServletHostExtensionPoint servletHosts = - extensionPointRegistry.getExtensionPoint(ServletHostExtensionPoint.class); - - servletHosts.addServletHost(WebAppServletHost.getInstance()); - } - - public void stop(ExtensionPointRegistry registry) { - } - -} diff --git a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java b/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java deleted file mode 100644 index c3adf433b4..0000000000 --- a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java +++ /dev/null @@ -1,87 +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.io.IOException; - -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; - -/** - * A servlet request dispatcher that can be used to delegate requests to a - * serlvet registered with the Webapp servlet host. - */ -class WebAppRequestDispatcher implements RequestDispatcher { - private String servletPath; - private Servlet servlet; - - public WebAppRequestDispatcher(String mapping, Servlet servlet) { - if (mapping.endsWith("*")) { - mapping = mapping.substring(0, mapping.length()-1); - } - if (mapping.endsWith("/")) { - mapping = mapping.substring(0, mapping.length()-1); - } - this.servletPath = mapping; - this.servlet = servlet; - } - - /** - * Returns a request wrapper which will return the correct servlet path - * and path info. - * - * @param request - * @return - */ - private HttpServletRequest createRequestWrapper(ServletRequest request) { - HttpServletRequest requestWrapper = new HttpServletRequestWrapper((HttpServletRequest)request) { - - @Override - public String getServletPath() { - return servletPath; - } - - @Override - public String getPathInfo() { - String path = super.getServletPath(); - if (path.length() == 0) { - path = super.getPathInfo(); - } - path = path.substring(servletPath.length()); - return path; - } - }; - return requestWrapper; - } - - public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException { - servlet.service(createRequestWrapper(request), response); - } - - public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException { - servlet.service(createRequestWrapper(request), response); - } -} - diff --git a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java deleted file mode 100644 index 48000519fb..0000000000 --- a/branches/sca-java-1.0.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java +++ /dev/null @@ -1,213 +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.io.File; -import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.logging.Logger; - -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletMappingException; - -/** - * ServletHost implementation for use in a webapp environment. - * - * FIXME: using a static singleton seems a big hack but how should it be shared? - * Need some way for TuscanyServlet to pull it out. - */ -public class WebAppServletHost implements ServletHost { - private static final Logger logger = Logger.getLogger(WebAppServletHost.class.getName()); - - private static final String SCA_DOMAIN_ATTRIBUTE = "org.apache.tuscany.sca.SCADomain"; - - private static final WebAppServletHost instance = new WebAppServletHost(); - - private Map<String, Servlet> servlets; - private SCADomain scaDomain; - - private String contextPath; - - private WebAppServletHost() { - servlets = new HashMap<String, Servlet>(); - } - - public void addServletMapping(String suri, Servlet servlet) throws ServletMappingException { - URI pathURI = URI.create(suri); - - // Make sure that the path starts with a / - suri = pathURI.getPath(); - if (!suri.startsWith("/")) { - suri = '/' + suri; - } - - // In a webapp just use the given path and ignore the host and port - // as they are fixed by the Web container - servlets.put(suri, servlet); - - logger.info("addServletMapping: " + suri); - } - - public Servlet removeServletMapping(String suri) throws ServletMappingException { - URI pathURI = URI.create(suri); - - // Make sure that the path starts with a / - suri = pathURI.getPath(); - if (!suri.startsWith("/")) { - suri = '/' + suri; - } - - // In a webapp just use the given path and ignore the host and port - // as they are fixed by the Web container - return servlets.remove(suri); - } - - public Servlet getServletMapping(String suri) throws ServletMappingException { - if (!suri.startsWith("/")) { - suri = '/' + suri; - } - - // Get the servlet mapped to the given path - Servlet servlet = servlets.get(suri); - return servlet; - } - - public RequestDispatcher getRequestDispatcher(String suri) throws ServletMappingException { - - // Make sure that the path starts with a / - if (!suri.startsWith("/")) { - suri = '/' + suri; - } - - // Get the servlet mapped to the given path - Servlet servlet = servlets.get(suri); - if (servlet != null) { - return new WebAppRequestDispatcher(suri, servlet); - } - for (Map.Entry<String, Servlet> entry : servlets.entrySet()) { - String servletPath = entry.getKey(); - if (servletPath.endsWith("*")) { - servletPath = servletPath.substring(0, servletPath.length() -1); - if (suri.startsWith(servletPath)) { - return new WebAppRequestDispatcher(entry.getKey(), entry.getValue()); - } else { - if ((suri + "/").startsWith(servletPath)) { - return new WebAppRequestDispatcher(entry.getKey(), entry.getValue()); - } - } - } - } - - // No servlet found - return null; - } - - static WebAppServletHost getInstance() { - return instance; - } - - void init(ServletConfig config) throws ServletException { - - initContextPath(config); - - // Create an SCA domain object - ServletContext servletContext = config.getServletContext(); - String domainURI = "http://localhost/" + servletContext.getServletContextName().replace(' ', '.'); - String contributionRoot = null; - try { - URL rootURL = servletContext.getResource("/"); - if (rootURL.getProtocol().equals("jndi")) { - //this is tomcat case, we should use getRealPath - File warRootFile = new File(servletContext.getRealPath("/")); - contributionRoot = warRootFile.toURL().toString(); - } else { - //this is jetty case - contributionRoot = rootURL.toString(); - } - } catch(MalformedURLException mf) { - //ignore, pass null - } - scaDomain = SCADomain.newInstance(domainURI, contributionRoot); - - // Store the SCA domain in the servlet context - servletContext.setAttribute(SCA_DOMAIN_ATTRIBUTE, scaDomain); - - // Initialize the registered servlets - for (Servlet servlet : servlets.values()) { - servlet.init(config); - } - } - - /** - * Initializes the contextPath - * The 2.5 Servlet API has a getter for this, for pre 2.5 servlet - * containers use an init parameter. - */ - @SuppressWarnings("unchecked") - protected void initContextPath(ServletConfig config) { - if (Collections.list(config.getInitParameterNames()).contains("contextPath")) { - contextPath = config.getInitParameter("contextPath"); - } else { - ServletContext context = config.getServletContext(); - Method m; - try { - m = context.getClass().getMethod("getContextPath", new Class[]{}); - try { - contextPath = (String)m.invoke(context, new Object[]{}); - } catch (Exception e) { - throw new RuntimeException(e); - } - } catch (NoSuchMethodException e) { - throw new IllegalStateException("'contextPath' init parameter must be set for pre-2.5 servlet container"); - } - } - logger.info("initContextPath: " + contextPath); - } - - void destroy() { - - // Destroy the registered servlets - for (Servlet servlet : servlets.values()) { - servlet.destroy(); - } - - // Close the SCA domain - if (scaDomain != null) { - scaDomain.close(); - } - } - - public String getContextPath() { - return contextPath; - } - -} diff --git a/branches/sca-java-1.0.1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/branches/sca-java-1.0.1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator deleted file mode 100644 index d99fdf257e..0000000000 --- a/branches/sca-java-1.0.1/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
|