From ad1c9458ea08eb593be252b706a88568f17c494c Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 19 Nov 2008 00:07:37 +0000 Subject: Moving current trunk modules to contrib, before starting the Equinox branch merge git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@718812 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/modules/runtime-tomcat/LICENSE | 205 ---------------- java/sca/modules/runtime-tomcat/NOTICE | 6 - java/sca/modules/runtime-tomcat/pom.xml | 104 -------- .../tomcat/EndpointResolverFactoryImpl.java | 49 ---- .../sca/runtime/tomcat/EndpointResolverImpl.java | 136 ----------- .../runtime/tomcat/TuscanyAnnotationProcessor.java | 108 --------- .../tuscany/sca/runtime/tomcat/TuscanyContext.java | 270 --------------------- .../sca/runtime/tomcat/TuscanyContextListener.java | 69 ------ .../tuscany/sca/runtime/tomcat/TuscanyHost.java | 159 ------------ .../tuscany/sca/runtime/tomcat/TuscanyServlet.java | 65 ----- .../tuscany/sca/runtime/tomcat/TuscanyWrapper.java | 51 ---- ...ny.sca.endpointresolver.EndpointResolverFactory | 19 -- .../src/test/resources/content/test.html | 21 -- 13 files changed, 1262 deletions(-) delete mode 100644 java/sca/modules/runtime-tomcat/LICENSE delete mode 100644 java/sca/modules/runtime-tomcat/NOTICE delete mode 100644 java/sca/modules/runtime-tomcat/pom.xml delete mode 100644 java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java delete mode 100644 java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java delete mode 100644 java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java delete mode 100644 java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java delete mode 100644 java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java delete mode 100644 java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java delete mode 100644 java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java delete mode 100644 java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java delete mode 100644 java/sca/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory delete mode 100644 java/sca/modules/runtime-tomcat/src/test/resources/content/test.html (limited to 'java/sca/modules/runtime-tomcat') diff --git a/java/sca/modules/runtime-tomcat/LICENSE b/java/sca/modules/runtime-tomcat/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/java/sca/modules/runtime-tomcat/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/java/sca/modules/runtime-tomcat/NOTICE b/java/sca/modules/runtime-tomcat/NOTICE deleted file mode 100644 index fdfa0e9faa..0000000000 --- a/java/sca/modules/runtime-tomcat/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2008 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/java/sca/modules/runtime-tomcat/pom.xml b/java/sca/modules/runtime-tomcat/pom.xml deleted file mode 100644 index 840fc5467b..0000000000 --- a/java/sca/modules/runtime-tomcat/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 2.0-SNAPSHOT - ../pom.xml - - tuscany-runtime-tomcat - Apache Tuscany SCA Runtime for Tomcat deep integration - - - - - org.apache.tomcat - catalina - 6.0.14 - - - org.apache.tomcat - servlet-api - - - provided - - - - org.apache.tomcat - coyote - 6.0.14 - provided - - - - javax.servlet - servlet-api - 2.4 - provided - - - - org.apache.tuscany.sca - tuscany-runtime - 2.0-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-endpoint - - - - - - org.apache.tuscany.sca - tuscany-host-webapp - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-binding-sca-jms - 2.0-SNAPSHOT - - - - - - - - org.apache.felix - maven-bundle-plugin - - - - ${tuscany.version} - org.apache.tuscany.sca.runtime.tomcat - ${pom.name} - org.apache.tuscany.sca.runtime.tomcat* - - - - - - - diff --git a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java b/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java deleted file mode 100644 index 45ea279889..0000000000 --- a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java +++ /dev/null @@ -1,49 +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.runtime.tomcat; - -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.endpointresolver.EndpointResolver; -import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory; - -/** - * The factory for creating endpoint Binding providers - * - * @version $Rev$ $Date$ - */ -public class EndpointResolverFactoryImpl implements EndpointResolverFactory { - - private ExtensionPointRegistry extensionPoints; - - public EndpointResolverFactoryImpl(ExtensionPointRegistry extensionPoints) { - this.extensionPoints = extensionPoints; - } - - public EndpointResolver createEndpointResolver(Endpoint endpoint, Binding binding) { - - return new EndpointResolverImpl(extensionPoints, endpoint); - } - - public Class getModelType() { - return Endpoint.class; - } -} diff --git a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java b/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java deleted file mode 100644 index e05004160c..0000000000 --- a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java +++ /dev/null @@ -1,136 +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.runtime.tomcat; - - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Logger; - -import org.apache.catalina.core.StandardContext; -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.builder.DefaultEndpointBuilder; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.endpointresolver.EndpointResolver; -import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory; -import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain; -import org.apache.tuscany.sca.host.webapp.WebAppServletHost; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.Problem; - - -/** - * The endpoint resolver allows unresolved endpoints to be plumbed into - * the runtime start and message send processing as a hook to late resolution - * of target services - * - * @version $Rev$ $Date$ - */ -public class EndpointResolverImpl implements EndpointResolver { - - private final static Logger logger = Logger.getLogger(EndpointResolverImpl.class.getName()); - - private Endpoint endpoint; - private List endpointResolvers = new ArrayList(); - - public EndpointResolverImpl(ExtensionPointRegistry extensionPoints, - Endpoint endpoint) { - this.endpoint = endpoint; - - EndpointResolverFactoryExtensionPoint resolverFactories = - extensionPoints.getExtensionPoint(EndpointResolverFactoryExtensionPoint.class); - - for (Binding binding : endpoint.getCandidateBindings()){ - EndpointResolverFactory resolverFactory = resolverFactories.getEndpointResolverFactory(binding.getClass()); - - // if the binding in question has a endpoint resolver factory they try and - // create an endpoint resolver - if (resolverFactory != null){ - EndpointResolver resolver = resolverFactory.createEndpointResolver(endpoint, binding); - - if (resolver != null){ - endpointResolvers.add(resolver); - } - } - } - } - - public void start(){ - // do nothing - } - - public void resolve() { - if (endpoint.isUnresolved()){ - logger.info("resolving endpoint: " + endpoint.getTargetName()); - - Component target = findTarget(); - if (target != null) { - logger.info("endpoint target found: " + endpoint.getTargetName() + " component " + target); - resolveEndpoint(target); - } else { - logger.info("endpoint target not found: " + endpoint.getTargetName()); - } - - } - } - - protected void resolveEndpoint(Component targetComponent) { - - endpoint.setTargetComponent(targetComponent); - endpoint.setTargetComponentService(targetComponent.getServices().get(0)); // TODO real service - - DefaultEndpointBuilder ebi = new DefaultEndpointBuilder(new Monitor() { - public void problem(Problem problem) { - logger.warning(problem.toString()); - } - - public List getProblems() { - return null; - } - }); - - ebi.build(endpoint); - } - - protected Component findTarget() { - for (StandardContext sc : TuscanyHost.scaApps) { - SCADomain scaDomain = (SCADomain)sc.getServletContext().getAttribute(WebAppServletHost.SCA_DOMAIN_ATTRIBUTE); - if (scaDomain != null) { - Component component = ((DefaultSCADomain)scaDomain).getComponent(endpoint.getTargetName()); - if ( component != null) { - return component; - } - } - } - return null; - } - - public void stop() { - if (!endpoint.isUnresolved()){ - // Currently the CompositeActivator stop() should take care of the providers and - // wires that have been added. - } - } - -} diff --git a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java b/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java deleted file mode 100644 index 7351ecabe0..0000000000 --- a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java +++ /dev/null @@ -1,108 +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.runtime.tomcat; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import javax.naming.NamingException; - -import org.apache.AnnotationProcessor; -import org.apache.catalina.core.StandardContext; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.host.webapp.WebAppServletHost; -import org.osoa.sca.annotations.Reference; - -/** - * A Tuscany specific Tomcat annotation processor for processing SCA annotations - */ -public class TuscanyAnnotationProcessor implements AnnotationProcessor { - - private StandardContext scaApp; - - public TuscanyAnnotationProcessor(StandardContext scaApp) { - this.scaApp = scaApp; - } - - public void postConstruct(Object instance) throws IllegalAccessException, InvocationTargetException { - } - - public void preDestroy(Object instance) throws IllegalAccessException, InvocationTargetException { - } - - public void processAnnotations(Object instance) throws IllegalAccessException, InvocationTargetException, NamingException { - - // Initialize fields annotations - Field[] fields = instance.getClass().getDeclaredFields(); - for (int i = 0; i < fields.length; i++) { - if (fields[i].isAnnotationPresent(Reference.class)) { - Reference annotation = fields[i].getAnnotation(Reference.class); - injectFieldResource(instance, fields[i], annotation); - } - } - - // Initialize methods annotations - Method[] methods = instance.getClass().getDeclaredMethods(); - for (int i = 0; i < methods.length; i++) { - if (methods[i].isAnnotationPresent(Reference.class)) { - Reference annotation = methods[i].getAnnotation(Reference.class); - injectMethodResource(instance, methods[i], annotation); - } - } - - } - - protected void injectFieldResource(Object instance, Field field, Reference annotation) throws IllegalArgumentException, IllegalAccessException { - - String serviceName = annotation.name(); - if (serviceName == null || serviceName.length() < 1) { - serviceName = field.getName(); - } - - Object service = getSCADomain().getService(field.getType(), serviceName); - - boolean accessibility = field.isAccessible(); - field.setAccessible(true); - field.set(instance, service); - field.setAccessible(accessibility); - } - - protected void injectMethodResource(Object instance, Method method, Reference annotation) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException { - - String serviceName = annotation.name(); - if (serviceName == null || serviceName.length() < 1) { - StringBuilder setterName = new StringBuilder(method.getName()); - setterName.setCharAt(4, Character.toLowerCase(setterName.charAt(4))); - serviceName = setterName.substring(4); - } - - Object service = getSCADomain().getService(method.getParameterTypes()[0], serviceName); - - boolean accessibility = method.isAccessible(); - method.setAccessible(true); - method.invoke(instance, service); - method.setAccessible(accessibility); - } - - protected SCADomain getSCADomain() { - return (SCADomain)scaApp.getServletContext().getAttribute(WebAppServletHost.SCA_DOMAIN_ATTRIBUTE); - } -} diff --git a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java b/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java deleted file mode 100644 index c8d3aa7a46..0000000000 --- a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java +++ /dev/null @@ -1,270 +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.runtime.tomcat; - -import java.util.Hashtable; - -import javax.naming.Binding; -import javax.naming.Context; -import javax.naming.Name; -import javax.naming.NameClassPair; -import javax.naming.NameParser; -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.apache.catalina.core.StandardContext; - -/** - * - * @version $Rev$ $Date$ - */ -public class TuscanyContext extends StandardContext { - private static final long serialVersionUID = 1L; - - public TuscanyContext() { - setProcessTlds(false); - } - - @Override - public boolean getConfigured() { - return true; - } - - @Override - public DirContext getResources() { - return DUMMY_CONTEXT; - } - - @Override - public synchronized void setResources(DirContext resources) { - setDocBase("tuscany"); - super.setResources(DUMMY_CONTEXT); - } - - private static final DirContext DUMMY_CONTEXT = new DirContext(){ - - public void bind(Name name, Object obj, Attributes attrs) throws NamingException { - } - - public void bind(String name, Object obj, Attributes attrs) throws NamingException { - } - - public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException { - return null; - } - - public DirContext createSubcontext(String name, Attributes attrs) throws NamingException { - return null; - } - - public Attributes getAttributes(Name name) throws NamingException { - return null; - } - - public Attributes getAttributes(String name) throws NamingException { - return null; - } - - public Attributes getAttributes(Name name, String[] attrIds) throws NamingException { - return null; - } - - public Attributes getAttributes(String name, String[] attrIds) throws NamingException { - return null; - } - - public DirContext getSchema(Name name) throws NamingException { - return null; - } - - public DirContext getSchema(String name) throws NamingException { - return null; - } - - public DirContext getSchemaClassDefinition(Name name) throws NamingException { - return null; - } - - public DirContext getSchemaClassDefinition(String name) throws NamingException { - return null; - } - - public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException { - } - - public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException { - } - - public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException { - } - - public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException { - } - - public void rebind(Name name, Object obj, Attributes attrs) throws NamingException { - } - - public void rebind(String name, Object obj, Attributes attrs) throws NamingException { - } - - public NamingEnumeration search(Name name, Attributes matchingAttributes) throws NamingException { - return null; - } - - public NamingEnumeration search(String name, Attributes matchingAttributes) throws NamingException { - return null; - } - - public NamingEnumeration search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException { - return null; - } - - public NamingEnumeration search(String name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException { - return null; - } - - public NamingEnumeration search(Name name, String filter, SearchControls cons) throws NamingException { - return null; - } - - public NamingEnumeration search(String name, String filter, SearchControls cons) throws NamingException { - return null; - } - - public NamingEnumeration search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException { - return null; - } - - public NamingEnumeration search(String name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException { - return null; - } - - public Object addToEnvironment(String propName, Object propVal) throws NamingException { - return null; - } - - public void bind(Name name, Object obj) throws NamingException { - } - - public void bind(String name, Object obj) throws NamingException { - } - - public void close() throws NamingException { - } - - public Name composeName(Name name, Name prefix) throws NamingException { - return null; - } - - public String composeName(String name, String prefix) throws NamingException { - return null; - } - - public Context createSubcontext(Name name) throws NamingException { - return null; - } - - public Context createSubcontext(String name) throws NamingException { - return null; - } - - public void destroySubcontext(Name name) throws NamingException { - } - - public void destroySubcontext(String name) throws NamingException { - } - - public Hashtable getEnvironment() throws NamingException { - return null; - } - - public String getNameInNamespace() throws NamingException { - return null; - } - - public NameParser getNameParser(Name name) throws NamingException { - return null; - } - - public NameParser getNameParser(String name) throws NamingException { - return null; - } - - public NamingEnumeration list(Name name) throws NamingException { - return null; - } - - public NamingEnumeration list(String name) throws NamingException { - return null; - } - - public NamingEnumeration listBindings(Name name) throws NamingException { - return null; - } - - public NamingEnumeration listBindings(String name) throws NamingException { - throw new NamingException(); - } - - public Object lookup(Name name) throws NamingException { - return null; - } - - public Object lookup(String name) throws NamingException { - return null; - } - - public Object lookupLink(Name name) throws NamingException { - return null; - } - - public Object lookupLink(String name) throws NamingException { - return null; - } - - public void rebind(Name name, Object obj) throws NamingException { - } - - public void rebind(String name, Object obj) throws NamingException { - } - - public Object removeFromEnvironment(String propName) throws NamingException { - return null; - } - - public void rename(Name oldName, Name newName) throws NamingException { - } - - public void rename(String oldName, String newName) throws NamingException { - } - - public void unbind(Name name) throws NamingException { - } - - public void unbind(String name) throws NamingException { - } - }; - -} diff --git a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java b/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java deleted file mode 100644 index b19e2326a2..0000000000 --- a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java +++ /dev/null @@ -1,69 +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.runtime.tomcat; - -import java.io.File; - -import org.apache.catalina.Context; -import org.apache.catalina.Lifecycle; -import org.apache.catalina.LifecycleEvent; -import org.apache.catalina.LifecycleListener; -import org.apache.catalina.core.StandardContext; -//import org.apache.tuscany.sca.runtime.Launcher; - -/** - * - * @version $Rev$ $Date$ - */ -public class TuscanyContextListener implements LifecycleListener { - -// private Launcher launcher; - -// public TuscanyContextListener(Launcher launcher) { -// this.launcher = launcher; -// } - - public void lifecycleEvent(LifecycleEvent event) { - String type = event.getType(); - if (Lifecycle.AFTER_START_EVENT.equals(type)) { - startContext((Context) event.getLifecycle()); - } else if (Lifecycle.STOP_EVENT.equals(type)) { - stopContext((Context) event.getLifecycle()); - } - } - - protected void startContext(Context context) { - StandardContext sc = (StandardContext) context; - String path = sc.getServletContext().getRealPath("/"); - try { - File f = new File(path + "WEB-INF/classes"); - if (f.exists()) { - System.out.println("adding contribution: "+ path); -// launcher.addContribution(f.toURL()); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - protected void stopContext(Context context) { - } - -} diff --git a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java b/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java deleted file mode 100644 index 38280443f0..0000000000 --- a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java +++ /dev/null @@ -1,159 +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.runtime.tomcat; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.jar.JarFile; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.apache.catalina.Container; -import org.apache.catalina.LifecycleException; -import org.apache.catalina.core.StandardContext; -import org.apache.catalina.core.StandardEngine; -import org.apache.catalina.core.StandardHost; -import org.apache.catalina.deploy.FilterDef; -import org.apache.catalina.deploy.FilterMap; - -/** - * To use this copy all the Tuscany jars to the Tomcat lib folder and update - * the Tomcat conf/server.xml to include className="org.apache.tuscany.sca.runtime.tomcat.TomcatHost" - * - * For example: - * - * - * - * - * @version $Rev$ $Date$ - */ -public class TuscanyHost extends StandardHost { - private static final long serialVersionUID = 1L; - private static final Logger logger = Logger.getLogger(TuscanyHost.class.getName()); - - // TODO static for expedience, find a better way to share when/if this is working properly - protected static List scaApps = new ArrayList(); - - @Override - public synchronized void start() throws LifecycleException { - try { - logger.log(Level.INFO, "Starting Tuscany/SCA runtime"); - - super.start(); - - } catch (Exception e) { - logger.log(Level.SEVERE, "Exception starting Tuscany/SCA runtime", e); - } - } - - @Override - public synchronized void stop() throws LifecycleException { - try { - logger.log(Level.INFO, "Stopping Tuscany/SCA runtime"); - - super.stop(); - - } catch (Exception e) { - logger.log(Level.SEVERE, "Exception Stopping Tuscany/SCA runtime", e); - } - } - - @Override - public synchronized void addChild(Container child) { - try { - if (isSCAApp(child)) { - initSCAApplication((StandardContext)child); - } - } catch (Exception e) { - logger.log(Level.WARNING, "Exception detecting SCA application " + child.getName(), e); - } - super.addChild(child); - } - - /** - * Tests if the child is an SCA application by checking for the presence - * of either an sca-contribution.xml file or a sca-deployables folder - */ - protected boolean isSCAApp(Container child) throws IOException { - if (child instanceof StandardContext) { - StandardContext sc = (StandardContext) child; - - if (sc.getDocBase().endsWith(".war")) { - JarFile jar = null; - try { - jar = new JarFile(((StandardEngine)this.getParent()).getBaseDir() + "/" + getAppBase() + "/" + sc.getDocBase()); - - if (jar.getEntry("META-INF/sca-deployables/") != null) { - return true; - } - - if (jar.getEntry("META-INF/sca-contribution.xml") != null) { - return true; - } - - } finally { - if (jar != null) { - jar.close(); - } - } - } else { - File webappRoot = new File(sc.getConfigFile()).getParentFile().getParentFile(); - - File scaDeployables = new File(webappRoot, "META-INF/sca-deployables"); - if (scaDeployables.exists()) { - return true; - } - - File scaContribution = new File(webappRoot, "META-INF/sca-contribution.xml"); - if (scaContribution.exists()) { - return true; - } - } - } - return false; - } - - protected void initSCAApplication(StandardContext scaApp) { - logger.log(Level.INFO, "Initilizing SCA application: " + scaApp.getName()); - - // Add the Tuscany ContextListener - scaApp.addApplicationListener(org.apache.tuscany.sca.host.webapp.TuscanyContextListener.class.getName()); - - // Add the Tuscany Servlet Filter - FilterDef filterDef = new FilterDef(); - filterDef.setFilterClass(org.apache.tuscany.sca.host.webapp.TuscanyServletFilter.class.getName()); - filterDef.setFilterName(org.apache.tuscany.sca.host.webapp.TuscanyServletFilter.class.getName()); - scaApp.addFilterDef(filterDef); - FilterMap filterMap = new FilterMap(); - filterMap.setFilterName(filterDef.getFilterName()); - filterMap.addURLPattern("/*"); - scaApp.addFilterMap(filterMap); - - scaApp.setAnnotationProcessor(new TuscanyAnnotationProcessor(scaApp)); - - scaApps.add(scaApp); - } - -} diff --git a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java b/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java deleted file mode 100644 index 112b404515..0000000000 --- a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java +++ /dev/null @@ -1,65 +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.runtime.tomcat; - -import java.io.IOException; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; - -import org.apache.tuscany.sca.host.webapp.WebAppServletHost; - -/** - * A Servlet that forwards requests to the Servlets registered with the Tuscany - * ServletHost. - * - * TODO: Copy of host-webapp TuscanyServlet. Can be removed once host-webapp TuscanyServlet - * moved over to latest SCADomain API. - * - * @version $Rev$ $Date$ - */ -public class TuscanyServlet extends HttpServlet { - private static final long serialVersionUID = 1L; - - private transient WebAppServletHost servletHost; - - @Override - public void init(ServletConfig config) throws ServletException { - 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/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java b/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java deleted file mode 100644 index 8764094d48..0000000000 --- a/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.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.runtime.tomcat; - -import javax.servlet.Servlet; - -import org.apache.catalina.core.StandardWrapper; - -/** - * Override the StandardWrapper so that Servlets are not instantiated from the - * class name but just the instance Tuscany passes in the constructor is always used. - * - * @version $Rev$ $Date$ - */ -public class TuscanyWrapper extends StandardWrapper { - private static final long serialVersionUID = 1L; - - private final Servlet servlet; - - public TuscanyWrapper(Servlet servlet) { - super(); - this.servlet = servlet; - } - - @Override - public synchronized Servlet loadServlet() { - return servlet; - } - - @Override - public Servlet getServlet() { - return servlet; - } -} \ No newline at end of file diff --git a/java/sca/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/java/sca/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory deleted file mode 100644 index e59ade0150..0000000000 --- a/java/sca/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory +++ /dev/null @@ -1,19 +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 binding extension -org.apache.tuscany.sca.runtime.tomcat.EndpointResolverFactoryImpl;model=org.apache.tuscany.sca.assembly.Endpoint diff --git a/java/sca/modules/runtime-tomcat/src/test/resources/content/test.html b/java/sca/modules/runtime-tomcat/src/test/resources/content/test.html deleted file mode 100644 index f4b79d7f01..0000000000 --- a/java/sca/modules/runtime-tomcat/src/test/resources/content/test.html +++ /dev/null @@ -1,21 +0,0 @@ - - -

hello - \ No newline at end of file -- cgit v1.2.3