From 35f81a620ea2d8423a49d8630bcef1d69027f444 Mon Sep 17 00:00:00 2001 From: antelder Date: Sat, 28 Mar 2009 09:44:15 +0000 Subject: Remove old m2 branch git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@759447 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca-java-2.0-M2/modules/host-webapp/LICENSE | 241 ------------------- .../modules/host-webapp/META-INF/MANIFEST.MF | 24 -- .../sca-java-2.0-M2/modules/host-webapp/NOTICE | 12 - .../sca-java-2.0-M2/modules/host-webapp/pom.xml | 80 ------- .../tuscany/sca/host/webapp/ServletHostHelper.java | 202 ---------------- .../sca/host/webapp/TuscanyContextListener.java | 40 ---- .../sca/host/webapp/TuscanyServletFilter.java | 85 ------- .../sca/host/webapp/WebAppModuleActivator.java | 51 ----- .../sca/host/webapp/WebAppRequestDispatcher.java | 114 --------- .../tuscany/sca/host/webapp/WebAppServletHost.java | 254 --------------------- .../org.apache.tuscany.sca.core.ModuleActivator | 18 -- 11 files changed, 1121 deletions(-) delete mode 100644 branches/sca-java-2.0-M2/modules/host-webapp/LICENSE delete mode 100644 branches/sca-java-2.0-M2/modules/host-webapp/META-INF/MANIFEST.MF delete mode 100644 branches/sca-java-2.0-M2/modules/host-webapp/NOTICE delete mode 100644 branches/sca-java-2.0-M2/modules/host-webapp/pom.xml delete mode 100644 branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java delete mode 100644 branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java delete mode 100644 branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java delete mode 100644 branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java delete mode 100644 branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java delete mode 100644 branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java delete mode 100644 branches/sca-java-2.0-M2/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (limited to 'branches/sca-java-2.0-M2/modules/host-webapp') diff --git a/branches/sca-java-2.0-M2/modules/host-webapp/LICENSE b/branches/sca-java-2.0-M2/modules/host-webapp/LICENSE deleted file mode 100644 index 0085d7e5ee..0000000000 --- a/branches/sca-java-2.0-M2/modules/host-webapp/LICENSE +++ /dev/null @@ -1,241 +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. - -=============================================================================== - -Apache Tuscany SCA for Java Subcomponents -=========================================: - -The Tuscany SCA for Java release includes a number of subcomponents with -separate copyright notices and license terms. Your use of the source -code for the these subcomponents is subject to the terms and -conditions of the following licenses. - -=============================================================================== -The module host-webapp includes files under the following license: - -Permission to copy, display and distribute the Service Component Architecture Specification and/or -portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided -that you include the following on ALL copies of the Service Component Architecture Specification, or -portions thereof, that you make: - -1. A link or URL to the Service Component Architecture Specification at this location: -· http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - -2. The full text of the copyright notice as shown in the Service Component Architecture Specification. - -BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave, -SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a -royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem -necessary to implement the Service Component Architecture Specification. -THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE -AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, -REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS, -INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE. -THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL -OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR -DISTRIBUTION OF THE Service Components Architecture SPECIFICATION. -The name and trademarks of the Authors may NOT be used in any manner, including advertising or -publicity pertaining to the Service Component Architecture Specification or its contents without specific, - diff --git a/branches/sca-java-2.0-M2/modules/host-webapp/META-INF/MANIFEST.MF b/branches/sca-java-2.0-M2/modules/host-webapp/META-INF/MANIFEST.MF deleted file mode 100644 index d75f09042f..0000000000 --- a/branches/sca-java-2.0-M2/modules/host-webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,24 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: org.apache.tuscany.sca.host.webapp;version="2.0.0"; - uses:="javax.servlet,org.apache.tuscany.sca.host.http,org.apache.tuscany.sca.core" -Tool: Bnd-0.0.255 -Bundle-Name: Apache Tuscany SCA Webapp Host -Created-By: 1.6.0_07 (Sun Microsystems Inc.) -Bundle-Vendor: The Apache Software Foundation -Bundle-Version: 2.0.0 -Bnd-LastModified: 1222833658000 -Bundle-ManifestVersion: 2 -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Description: Apache Tuscany SCA Webapp Host -Import-Package: javax.naming, - javax.servlet, - javax.servlet.http, - org.apache.tuscany.sca.core;version="2.0.0", - org.apache.tuscany.sca.host.http;version="2.0.0", - org.apache.tuscany.sca.host.webapp;version="2.0.0", - org.apache.tuscany.sca.node;version="2.0.0", - org.apache.tuscany.sca.node.impl;version="2.0.0", - org.oasisopen.sca;version="2.0.0" -Bundle-SymbolicName: org.apache.tuscany.sca.host.webapp -Bundle-DocURL: http://www.apache.org/ - diff --git a/branches/sca-java-2.0-M2/modules/host-webapp/NOTICE b/branches/sca-java-2.0-M2/modules/host-webapp/NOTICE deleted file mode 100644 index d989435591..0000000000 --- a/branches/sca-java-2.0-M2/modules/host-webapp/NOTICE +++ /dev/null @@ -1,12 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2009 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - -This product also includes software under the Service Component Architecture specification license -(see the LICENSE file contained in this distribution) with the following copyright - -(c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA -Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens -AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved. diff --git a/branches/sca-java-2.0-M2/modules/host-webapp/pom.xml b/branches/sca-java-2.0-M2/modules/host-webapp/pom.xml deleted file mode 100644 index f8881a92f9..0000000000 --- a/branches/sca-java-2.0-M2/modules/host-webapp/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 2.0-M2-SNAPSHOT - ../pom.xml - - - tuscany-host-webapp - Apache Tuscany SCA Webapp Host - - - - org.apache.tuscany.sca - tuscany-contribution - 2.0-M2-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-host-http - 2.0-M2-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node-api - 2.0-M2-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node-impl - 2.0-M2-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-workspace-impl - 2.0-M2-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 2.0-M2-SNAPSHOT - runtime - - - - javax.servlet - servlet-api - 2.5 - provided - - - - - diff --git a/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java b/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java deleted file mode 100644 index fd6a3ed22b..0000000000 --- a/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java +++ /dev/null @@ -1,202 +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.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Collections; -import java.util.Enumeration; -import java.util.List; -import java.util.logging.Logger; - -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.impl.NodeImpl; -import org.oasisopen.sca.ServiceRuntimeException; - -public class ServletHostHelper { - private static final Logger logger = Logger.getLogger(ServletHostHelper.class.getName()); - - public static final String SCA_NODE_ATTRIBUTE = Node.class.getName(); - - public static void init(ServletConfig servletConfig) { - init(servletConfig.getServletContext()); - } - - public static ServletHost init(final ServletContext servletContext) { - Node node = (Node)servletContext.getAttribute(SCA_NODE_ATTRIBUTE); - if (node == null) { - try { - node = createNode(servletContext); - servletContext.setAttribute(SCA_NODE_ATTRIBUTE, node); - getServletHost(node).init(new ServletConfig() { - public String getInitParameter(String name) { - return servletContext.getInitParameter(name); - } - public Enumeration getInitParameterNames() { - return servletContext.getInitParameterNames(); - } - public ServletContext getServletContext() { - return servletContext; - } - public String getServletName() { - return servletContext.getServletContextName(); - }}); - } catch (ServletException e) { - throw new RuntimeException(e); - } - } - return getServletHost(node); - } - - private static WebAppServletHost getServletHost(Node node) { - NodeImpl nodeImpl = (NodeImpl) node; - ExtensionPointRegistry eps = nodeImpl.getExtensionPoints(); - ServletHostExtensionPoint servletHosts = eps.getExtensionPoint(ServletHostExtensionPoint.class); - List hosts = servletHosts.getServletHosts(); - 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); - } - return (WebAppServletHost) servletHost; - } - - private static Node createNode(final ServletContext servletContext) throws ServletException { - String contextPath = initContextPath(servletContext); - String contributionRoot = getContributionRoot(servletContext); - NodeFactory factory = NodeFactory.newInstance(); - String webComposite = getWebComposite(servletContext); - Node node = factory.createNode(contextPath, webComposite, new Contribution(contributionRoot, contributionRoot)); - node.start(); - return node; - } - - private static String getWebComposite(ServletContext servletContext) { - InputStream stream = servletContext.getResourceAsStream("/WEB-INF/web.composite"); - BufferedReader reader = new BufferedReader(new InputStreamReader(stream)); - - StringBuilder sb = new StringBuilder(); - String s = null; - try { - while ((s = reader.readLine()) != null) { - sb.append(s + "\n"); - } - } catch (IOException e) { - throw new ServiceRuntimeException(e); - } finally { - try { - stream.close(); - } catch (IOException e) { - throw new ServiceRuntimeException(e); - } - } - - return sb.toString(); - } - - private static String getContributionRoot(ServletContext servletContext) { - String contributionRoot = null; - try { - - InitialContext ic = new InitialContext(); - URL repoURL = (URL)ic.lookup("java:comp/env/url/contributions"); - - contributionRoot = repoURL.toString(); - - } catch (NamingException e) { - - // ignore exception and use default location - - try { - - String root = servletContext.getInitParameter("contributionRoot"); - if (root == null || root.length() < 1) { - root = "/"; - } - URL rootURL = servletContext.getResource(root); - if (rootURL.getProtocol().equals("jndi")) { - //this is Tomcat case, we should use getRealPath - File warRootFile = new File(servletContext.getRealPath(root)); - contributionRoot = warRootFile.toURI().toString(); - } else { - //this is Jetty case - contributionRoot = rootURL.toString(); - } - - } catch (MalformedURLException mf) { - //ignore, pass null - } - } - - logger.info("contributionRoot: " + contributionRoot); - return contributionRoot; - } - - /** - * 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") - private static String initContextPath(ServletContext context) { - String contextPath; - if (Collections.list(context.getInitParameterNames()).contains("contextPath")) { - contextPath = context.getInitParameter("contextPath"); - } else { - try { - // Try to get the method anyway since some ServletContext impl has this method even before 2.5 - Method m = context.getClass().getMethod("getContextPath", new Class[] {}); - contextPath = (String)m.invoke(context, new Object[] {}); - } catch (Exception e) { - logger.warning("Servlet level is: " + context.getMajorVersion() + "." + context.getMinorVersion()); - throw new IllegalStateException("'contextPath' init parameter must be set for pre-2.5 servlet container"); - } - } - logger.info("ContextPath: " + contextPath); - return contextPath; - } - - public static void stop(ServletContext servletContext) { - Node node = (Node) servletContext.getAttribute(ServletHostHelper.SCA_NODE_ATTRIBUTE); - if (node != null) { - node.stop(); - servletContext.setAttribute(ServletHostHelper.SCA_NODE_ATTRIBUTE, null); - } - } -} diff --git a/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java b/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java deleted file mode 100644 index 0f36094311..0000000000 --- a/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java +++ /dev/null @@ -1,40 +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.ServletContextEvent; -import javax.servlet.ServletContextListener; - - -/** - * A ServletContextListener to create and close the SCADomain - * when the webapp is initialized or destroyed. - */ -public class TuscanyContextListener implements ServletContextListener { - - public void contextInitialized(ServletContextEvent event) { - ServletHostHelper.init(event.getServletContext()); - } - - public void contextDestroyed(ServletContextEvent event) { - ServletHostHelper.stop(event.getServletContext()); - } - -} diff --git a/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java b/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java deleted file mode 100644 index 359817e024..0000000000 --- a/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java +++ /dev/null @@ -1,85 +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.Filter; -import javax.servlet.FilterConfig; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; - -import org.apache.tuscany.sca.host.http.ServletHost; - - -/** - * A Servlet filter that forwards service requests to the Servlets registered with - * the Tuscany ServletHost. - * - * @version $Rev$ $Date$ - */ -public class TuscanyServletFilter implements Filter { - private static final long serialVersionUID = 1L; - - private transient ServletContext context; - private transient ServletHost servletHost; - - public void init(final FilterConfig config) throws ServletException { - context = config.getServletContext(); - servletHost = ServletHostHelper.init(context); - } - - public void destroy() { - ServletHostHelper.stop(context); - } - - 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-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java b/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java deleted file mode 100644 index d07b19bca9..0000000000 --- a/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java +++ /dev/null @@ -1,51 +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 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) { - } - -} diff --git a/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java b/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java deleted file mode 100644 index f14dfac58b..0000000000 --- a/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java +++ /dev/null @@ -1,114 +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.StringTokenizer; - -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 - * Servlet registered with the Webapp Servlet host. - * - * @version $Rev$ $Date$ - */ -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(); - } - - // TODO: another context path hack, revisit when context path is sorted out - path = fiddlePath(path, servletPath); - - return path; - } - }; - return requestWrapper; - } - - /** - * Remove any path suffix thats part of the Servlet context path - */ - protected String fiddlePath(String path, String servletPath) { - StringTokenizer st = new StringTokenizer(path, "/"); - if (st.countTokens() == 1) { - return path; - } - String root = ""; - while (st.hasMoreTokens()){ - String s = st.nextToken(); - if (servletPath.endsWith((root + "/" + s))) { - root += "/" + s; - } else { - break; - } - } - String fiddlePath = path.substring(root.length()); - return fiddlePath; - } - - 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-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java deleted file mode 100644 index c572d9f1d3..0000000000 --- a/branches/sca-java-2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java +++ /dev/null @@ -1,254 +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.net.InetAddress; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import java.net.UnknownHostException; -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.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletMappingException; -import org.apache.tuscany.sca.node.Node; - -/** - * ServletHost implementation for use in a webapp environment. - * - * @version $Rev$ $Date$ - */ -public class WebAppServletHost implements ServletHost { - private static final Logger logger = Logger.getLogger(WebAppServletHost.class.getName()); - - public static final String SCA_NODE_ATTRIBUTE = Node.class.getName(); - - private Map servlets; - private String contextPath = "/"; - private int defaultPortNumber = 8080; - private String contributionRoot; - - private ServletContext servletContext; - private Map tempAttributes = new HashMap(); - - public WebAppServletHost() { - servlets = new HashMap(); - } - - public void setDefaultPort(int port) { - defaultPortNumber = port; - } - - public int getDefaultPort() { - return defaultPortNumber; - } - - 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; - } - - if (!suri.startsWith(contextPath)) { - suri = contextPath + 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("Added Servlet mapping: " + 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; - } - - if (!suri.startsWith(contextPath)) { - suri = contextPath + 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; - } - - if (!suri.startsWith(contextPath)) { - suri = contextPath + suri; - } - - // Get the Servlet mapped to the given path - Servlet servlet = servlets.get(suri); - return servlet; - } - - public URL getURLMapping(String suri) throws ServletMappingException { - URI uri = URI.create(suri); - - // Get the URI scheme and port - String scheme = uri.getScheme(); - if (scheme == null) { - scheme = "http"; - } - int portNumber = uri.getPort(); - if (portNumber == -1) { - portNumber = defaultPortNumber; - } - - // Get the host - String host; - try { - host = InetAddress.getLocalHost().getHostName(); - } catch (UnknownHostException e) { - host = "localhost"; - } - - // Construct the URL - String path = uri.getPath(); - if (!path.startsWith("/")) { - path = '/' + path; - } - - if (contextPath != null && !path.startsWith(contextPath)) { - path = contextPath + path; - } - - URL url; - try { - url = new URL(scheme, host, portNumber, path); - } catch (MalformedURLException e) { - throw new ServletMappingException(e); - } - return url; - } - - public RequestDispatcher getRequestDispatcher(String suri) throws ServletMappingException { - - // Make sure that the path starts with a / - if (!suri.startsWith("/")) { - suri = '/' + suri; - } - - suri = contextPath + 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 entry : servlets.entrySet()) { - String servletPath = entry.getKey(); - if (servletPath.endsWith("*")) { - servletPath = servletPath.substring(0, servletPath.length() - 1); - if (suri.startsWith(servletPath)) { - // entry key is contextPath/servletPath, WebAppRequestDispatcher only wants servletPath - return new WebAppRequestDispatcher(entry.getKey().substring(contextPath.length()), entry.getValue()); - } else { - if ((suri + "/").startsWith(servletPath)) { - return new WebAppRequestDispatcher(entry.getKey().substring(contextPath.length()), entry.getValue()); - } - } - } - } - - // No Servlet found - return null; - } - - public void init(ServletConfig config) throws ServletException { - - servletContext = config.getServletContext(); - - for (String name : tempAttributes.keySet()) { - servletContext.setAttribute(name, tempAttributes.get(name)); - } - - ServletHostHelper.init(servletContext); - - // Initialize the registered Servlets - for (Servlet servlet : servlets.values()) { - servlet.init(config); - } - - } - - void destroy() { - - // Destroy the registered Servlets - for (Servlet servlet : servlets.values()) { - servlet.destroy(); - } - - // Close the SCA domain - ServletHostHelper.stop(servletContext); - } - - public String getContextPath() { - return contextPath; - } - - public void setContextPath(String path) { - } - - /** - * TODO: How context paths work is still up in the air so for now - * this hacks in a path that gets some samples working - * can't use setContextPath as NodeImpl calls that later - */ - public void setContextPath2(String path) { - if (path != null && path.length() > 0) { - this.contextPath = path; - } - } - - public String getContributionRoot() { - return contributionRoot; - } - - public void setAttribute(String name, Object value) { - if (servletContext != null) { - servletContext.setAttribute(name, value); - } else { - tempAttributes.put(name, value); - } - } -} diff --git a/branches/sca-java-2.0-M2/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/branches/sca-java-2.0-M2/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-2.0-M2/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 -- cgit v1.2.3