From 1fb6a28a73ca17dbb8c4b3059db590e2f9620943 Mon Sep 17 00:00:00 2001 From: antelder Date: Wed, 3 Aug 2011 09:21:41 +0000 Subject: Correct tag name git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1153404 13f79535-47bb-0310-9956-ffa450edef68 --- .../1.6-TUSCANY-3909/implementation-web/LICENSE | 205 ++++++++++++++++++ .../1.6-TUSCANY-3909/implementation-web/NOTICE | 6 + .../1.6-TUSCANY-3909/implementation-web/pom.xml | 100 +++++++++ .../sca/implementation/web/WebImplementation.java | 71 +++++++ .../web/WebImplementationFactory.java | 34 +++ .../web/impl/WebImplementationFactoryImpl.java | 37 ++++ .../web/impl/WebImplementationImpl.java | 168 +++++++++++++++ .../web/introspect/PropertyProcessor.java | 150 ++++++++++++++ .../web/introspect/ReferenceProcessor.java | 177 ++++++++++++++++ .../web/xml/WebImplementationProcessor.java | 230 +++++++++++++++++++++ ...ca.contribution.processor.StAXArtifactProcessor | 19 ++ ...sca.implementation.web.WebImplementationFactory | 19 ++ .../sca/implementation/web/xml/ReadTestCase.java | 81 ++++++++ .../sca/implementation/web/xml/WriteTestCase.java | 66 ++++++ .../sca/implementation/web/xml/TestWeb.composite | 29 +++ 15 files changed, 1392 insertions(+) create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/LICENSE create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/NOTICE create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/pom.xml create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite (limited to 'sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web') diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/LICENSE new file mode 100644 index 0000000000..6e529a25c4 --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/LICENSE @@ -0,0 +1,205 @@ + + 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/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/NOTICE new file mode 100644 index 0000000000..ad2ba40961 --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/NOTICE @@ -0,0 +1,6 @@ +${pom.name} +Copyright (c) 2005 - 2010 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/pom.xml new file mode 100644 index 0000000000..b2e96b1b2a --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/pom.xml @@ -0,0 +1,100 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-modules + 1.6 + ../pom.xml + + + tuscany-implementation-web + Apache Tuscany SCA Web Implementation Model + + + + + org.apache.tuscany.sca + tuscany-assembly + 1.6 + + + + org.apache.tuscany.sca + tuscany-assembly-xml + 1.6 + + + + org.apache.tuscany.sca + tuscany-contribution-jee + 1.6 + + + + org.apache.tuscany.sca + tuscany-contribution-xml + 1.6 + test + + + + org.apache.tuscany.sca + tuscany-host-embedded + 1.6 + test + + + + org.apache.tuscany.sca + tuscany-implementation-java + 1.6 + + + + junit + junit + 4.5 + test + + + + + + + + + org.apache.felix + maven-bundle-plugin + + + + ${tuscany.version} + org.apache.tuscany.sca.implementation.web + ${pom.name} + org.apache.tuscany.sca.implementation.web* + + + + + + + diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java new file mode 100644 index 0000000000..2aef3477ba --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java @@ -0,0 +1,71 @@ +/* + * 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.implementation.web; + +import java.util.Map; + +import org.apache.tuscany.sca.assembly.Implementation; +import org.apache.tuscany.sca.contribution.jee.InjectionTarget; +import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl; +import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl; + + + +/** + * The model representing an Web implementation in an SCA assembly model. + */ +public interface WebImplementation extends Implementation { + + /** + * Returns the webapp URI. + * @return the webapp URI + */ + String getWebURI(); + + /** + * Sets the Webapp URI. + * @param uri the webapp URI + */ + void setWebURI(String webappURI); + + /** + * Returns the injection points for SCA references + * + * @return Map with injection points for SCA references + */ + Map getReferenceInjectionPoints(); + + /** + * Returns the injection points for SCA properties + * + * @return Map with injection points for SCA properties + */ + Map getPropertyInjectionPoints(); + + /** + * Returns the injection points for SCA resources like component context, component name, etc. + * + * @return Map with injection points for SCA resources + */ + Map getResourceInjectionPoints(); + + Map> getOptExtensionReferenceInjectionPoints(); + + Map getOptExtensionPropertyInjectionPoints(); +} diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java new file mode 100644 index 0000000000..0cb80de03e --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java @@ -0,0 +1,34 @@ +/* + * 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.implementation.web; + + +/** + * Factory for the Web implementation model. + */ +public interface WebImplementationFactory { + + /** + * Creates a new Web implementation. + * @return a new Web implementation + */ + WebImplementation createWebImplementation(); + +} diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java new file mode 100644 index 0000000000..744fefc39b --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java @@ -0,0 +1,37 @@ +/* + * 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.implementation.web.impl; + +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementationFactory; + +/** + * Factory for the Web implementation model. + */ +public class WebImplementationFactoryImpl implements WebImplementationFactory { + + public WebImplementationFactoryImpl() { + } + + public WebImplementation createWebImplementation() { + return new WebImplementationImpl(); + } + +} diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java new file mode 100644 index 0000000000..7764d45693 --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java @@ -0,0 +1,168 @@ +/* + * 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.implementation.web.impl; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.ConstrainingType; +import org.apache.tuscany.sca.assembly.Property; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.assembly.builder.ComponentPreProcessor; +import org.apache.tuscany.sca.assembly.impl.ImplementationImpl; +import org.apache.tuscany.sca.contribution.jee.InjectionTarget; +import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl; +import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl; +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.apache.tuscany.sca.runtime.RuntimeComponent; + + +/** + * The model representing an Web implementation in an SCA assembly model. + */ +class WebImplementationImpl extends ImplementationImpl implements WebImplementation, ComponentPreProcessor { + + private String webURI; + + private Map propertyInjectionPoints = new HashMap(); + + private Map referenceInjectionPoints = new HashMap(); + + private Map resourceInjectionPoints = new HashMap(); + + private Map> optExtReferenceInjectionPoints = new HashMap>(); + + private Map optExtPropertyInjectionPoints = new HashMap(); + /** + * Constructs a new Web implementation. + */ + WebImplementationImpl() { + super(); + } + + @Override + public ConstrainingType getConstrainingType() { + // The Web implementation does not support constrainingTypes + return null; + } + + @Override + public List getServices() { + // The Web implementation does not offer services + return Collections.emptyList(); + } + + @Override + public void setConstrainingType(ConstrainingType constrainingType) { + // The Web implementation does not support constrainingTypes + } + + public String getWebURI() { + return webURI; + } + + public void setWebURI(String webURI) { + this.webURI = webURI; + } + + /** + * Use preProcess to add any references and properties dynamically + * TODO: also support introspection and handle WEB-INF/web.componentType (spec line 503) + */ + public void preProcess(Component component) { + if (!(component instanceof RuntimeComponent)) { + return; + } + RuntimeComponent rtc = (RuntimeComponent) component; + + for (Reference reference : rtc.getReferences()) { + if (getReference(reference.getName()) == null) { + getReferences().add(createReference(reference)); + } + } + + for (Property property : rtc.getProperties()) { + if (getProperty(property.getName()) == null) { + getProperties().add(createProperty(property)); + } + } + } + + protected Reference getReference(String name) { + for (Reference reference : getReferences()) { + if (reference.getName().equals(name)) { + return reference; + } + } + return null; + } + + protected Reference createReference(Reference reference) { + Reference newReference; + try { + newReference = (Reference)reference.clone(); + } catch (CloneNotSupportedException e) { + throw new AssertionError(e); // should not ever happen + } + return newReference; + } + + protected Property getProperty(String name) { + for (Property property : getProperties()) { + if (property.getName().equals(name)) { + return property; + } + } + return null; + } + + protected Property createProperty(Property property) { + Property newProperty; + try { + newProperty = (Property)property.clone(); + } catch (CloneNotSupportedException e) { + throw new AssertionError(e); // should not ever happen + } + return newProperty; + } + + public Map getPropertyInjectionPoints() { + return propertyInjectionPoints; + } + + public Map getReferenceInjectionPoints() { + return referenceInjectionPoints; + } + + public Map getResourceInjectionPoints() { + return resourceInjectionPoints; + } + + public Map> getOptExtensionReferenceInjectionPoints() { + return optExtReferenceInjectionPoints; + } + + public Map getOptExtensionPropertyInjectionPoints() { + return optExtPropertyInjectionPoints; + } +} diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java new file mode 100644 index 0000000000..4bf53e8336 --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java @@ -0,0 +1,150 @@ +/* + * 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.implementation.web.introspect; + +import java.lang.annotation.ElementType; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import org.apache.tuscany.sca.assembly.AssemblyFactory; +import org.apache.tuscany.sca.assembly.Property; +import org.apache.tuscany.sca.implementation.java.IntrospectionException; +import org.apache.tuscany.sca.implementation.java.JavaImplementation; +import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl; +import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl; +import org.apache.tuscany.sca.implementation.java.introspect.impl.BaseJavaClassVisitor; +import org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicatePropertyException; +import org.apache.tuscany.sca.implementation.java.introspect.impl.IllegalPropertyException; +import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper; +import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper; + +/** + * Class to handle annotations that add Properties. + * + * @version $Rev$ $Date$ + */ +public class PropertyProcessor extends BaseJavaClassVisitor { + public PropertyProcessor(AssemblyFactory assemblyFactory) { + super(assemblyFactory); + } + + private boolean removeProperty(JavaElementImpl prop, JavaImplementation type) { + if(prop==null) { + return false; + } + List props = type.getProperties(); + for(int i=0;i properties = type.getPropertyMembers(); + JavaElementImpl prop = properties.get(name); + // Setter override field + if (prop != null && prop.getElementType() != ElementType.FIELD) { + throw new DuplicatePropertyException(name); + } + + removeProperty(prop, type); + + JavaElementImpl element = new JavaElementImpl(method, 0); + Property property = createProperty(name, element); + + property.setMustSupply(annotation.required()); + type.getProperties().add(property); + properties.put(name, element); + } + + @Override + public void visitField(Field field, JavaImplementation type) throws IntrospectionException { + + org.osoa.sca.annotations.Property annotation = field.getAnnotation(org.osoa.sca.annotations.Property.class); + if (annotation == null) { + return; + } + + String name = annotation.name(); + if (name == null) { + name = ""; + } + if ("".equals(name) || name.equals(field.getType().getName())) { + name = field.getName(); + } + + Map properties = type.getPropertyMembers(); + JavaElementImpl prop = properties.get(name); + // Setter override field + if (prop != null && prop.getElementType() == ElementType.FIELD) { + throw new DuplicatePropertyException(name); + } + + if (prop == null) { + JavaElementImpl element = new JavaElementImpl(field); + Property property = createProperty(name, element); + property.setMustSupply(annotation.required()); + type.getProperties().add(property); + properties.put(name, element); + } + } + + @Override + public void visitConstructorParameter(JavaParameterImpl parameter, JavaImplementation type) + throws IntrospectionException { + } + + protected Property createProperty(String name, JavaElementImpl element) throws IntrospectionException { + + Property property = assemblyFactory.createProperty(); + property.setName(name); + Class baseType = JavaIntrospectionHelper.getBaseType(element.getType(), element.getGenericType()); + property.setXSDType(JavaXMLMapper.getXMLType(baseType)); + + Class javaType = element.getType(); + if (javaType.isArray() || Collection.class.isAssignableFrom(javaType)) { + property.setMany(true); + } + return property; + } +} diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java new file mode 100644 index 0000000000..c68693f2e4 --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java @@ -0,0 +1,177 @@ +/* + * 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.implementation.web.introspect; + +import static org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getBaseType; + +import java.lang.annotation.ElementType; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.util.Collection; +import java.util.List; + +import org.apache.tuscany.sca.assembly.AssemblyFactory; +import org.apache.tuscany.sca.assembly.Multiplicity; +import org.apache.tuscany.sca.implementation.java.IntrospectionException; +import org.apache.tuscany.sca.implementation.java.JavaImplementation; +import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl; +import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl; +import org.apache.tuscany.sca.implementation.java.introspect.impl.BaseJavaClassVisitor; +import org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicateReferenceException; +import org.apache.tuscany.sca.implementation.java.introspect.impl.IllegalReferenceException; +import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper; +import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; +import org.apache.tuscany.sca.interfacedef.java.JavaInterface; +import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract; +import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; +import org.osoa.sca.CallableReference; +import org.osoa.sca.annotations.Reference; + +/** + * Class to handle annotations that add References. + * + * @version $Rev$ $Date$ + */ +public class ReferenceProcessor extends BaseJavaClassVisitor { + private JavaInterfaceFactory javaFactory; + + public ReferenceProcessor(AssemblyFactory assemblyFactory, JavaInterfaceFactory javaFactory) { + super(assemblyFactory); + this.javaFactory = javaFactory; + } + + @Override + public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException { + Reference annotation = method.getAnnotation(Reference.class); + if (annotation == null) { + return; // Not a reference annotation. + } + if (!JavaIntrospectionHelper.isSetter(method)) { + throw new IllegalReferenceException("Annotated method is not a setter: " + method, method); + } + String name = annotation.name(); + if ("".equals(name)) { + name = JavaIntrospectionHelper.toPropertyName(method.getName()); + } + JavaElementImpl ref = type.getReferenceMembers().get(name); + // Setter override field + if (ref != null && ref.getElementType() != ElementType.FIELD) { + throw new DuplicateReferenceException(name); + } + removeReference(ref, type); + + JavaElementImpl element = new JavaElementImpl(method, 0); + org.apache.tuscany.sca.assembly.Reference reference = createReference(element, name); + type.getReferences().add(reference); + type.getReferenceMembers().put(name, element); + } + + private boolean removeReference(JavaElementImpl ref, JavaImplementation type) { + if (ref == null) { + return false; + } + List refs = type.getReferences(); + for (int i = 0; i < refs.size(); i++) { + if (refs.get(i).getName().equals(ref.getName())) { + refs.remove(i); + return true; + } + } + return false; + } + + @Override + public void visitField(Field field, JavaImplementation type) throws IntrospectionException { + Reference annotation = field.getAnnotation(Reference.class); + if (annotation == null) { + return; + } + String name = annotation.name(); + if ("".equals(name)) { + name = field.getName(); + } + JavaElementImpl ref = type.getReferenceMembers().get(name); + if (ref != null && ref.getElementType() == ElementType.FIELD) { + throw new DuplicateReferenceException(name); + } + + // Setter method override field + if (ref == null) { + JavaElementImpl element = new JavaElementImpl(field); + org.apache.tuscany.sca.assembly.Reference reference = createReference(element, name); + type.getReferences().add(reference); + type.getReferenceMembers().put(name, element); + } + } + + @Override + public void visitConstructorParameter(JavaParameterImpl parameter, JavaImplementation type) + throws IntrospectionException { + } + + private org.apache.tuscany.sca.assembly.Reference createReference(JavaElementImpl element, String name) + throws IntrospectionException { + org.apache.tuscany.sca.assembly.Reference reference = assemblyFactory.createReference(); + JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract(); + reference.setInterfaceContract(interfaceContract); + + // reference.setMember((Member)element.getAnchor()); + boolean required = true; + Reference ref = element.getAnnotation(Reference.class); + if (ref != null) { + required = ref.required(); + } + // reference.setRequired(required); + reference.setName(name); + Class rawType = element.getType(); + if (rawType.isArray() || Collection.class.isAssignableFrom(rawType)) { + if (required) { + reference.setMultiplicity(Multiplicity.ONE_N); + } else { + reference.setMultiplicity(Multiplicity.ZERO_N); + } + } else { + if (required) { + reference.setMultiplicity(Multiplicity.ONE_ONE); + } else { + reference.setMultiplicity(Multiplicity.ZERO_ONE); + } + } + Type genericType = element.getGenericType(); + Class baseType = getBaseType(rawType, genericType); + if (CallableReference.class.isAssignableFrom(baseType)) { + if (Collection.class.isAssignableFrom(rawType)) { + genericType = JavaIntrospectionHelper.getParameterType(genericType); + } + baseType = JavaIntrospectionHelper.getBusinessInterface(baseType, genericType); + } + try { + JavaInterface callInterface = javaFactory.createJavaInterface(baseType); + reference.getInterfaceContract().setInterface(callInterface); + if (callInterface.getCallbackClass() != null) { + JavaInterface callbackInterface = javaFactory.createJavaInterface(callInterface.getCallbackClass()); + reference.getInterfaceContract().setCallbackInterface(callbackInterface); + } + } catch (InvalidInterfaceException e) { + throw new IntrospectionException(e); + } + return reference; + } +} diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java new file mode 100644 index 0000000000..7c9af0fee5 --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java @@ -0,0 +1,230 @@ +/* + * 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.implementation.web.xml; + +import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; + +import java.net.URI; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; + +import org.apache.tuscany.sca.assembly.AssemblyFactory; +import org.apache.tuscany.sca.assembly.ComponentReference; +import org.apache.tuscany.sca.assembly.ComponentType; +import org.apache.tuscany.sca.assembly.Property; +import org.apache.tuscany.sca.assembly.xml.Constants; +import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo; +import org.apache.tuscany.sca.contribution.jee.EnvEntryInfo; +import org.apache.tuscany.sca.contribution.jee.JspReferenceTagInfo; +import org.apache.tuscany.sca.contribution.jee.WebModuleInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEExtension; +import org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension; +import org.apache.tuscany.sca.contribution.jee.impl.WebModuleInfoImpl; +import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.contribution.service.ContributionReadException; +import org.apache.tuscany.sca.contribution.service.ContributionResolveException; +import org.apache.tuscany.sca.contribution.service.ContributionWriteException; +import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory; +import org.apache.tuscany.sca.implementation.java.IntrospectionException; +import org.apache.tuscany.sca.implementation.java.JavaImplementation; +import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; +import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl; +import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl; +import org.apache.tuscany.sca.implementation.java.introspect.impl.ComponentNameProcessor; +import org.apache.tuscany.sca.implementation.java.introspect.impl.ContextProcessor; +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementationFactory; +import org.apache.tuscany.sca.implementation.web.introspect.PropertyProcessor; +import org.apache.tuscany.sca.implementation.web.introspect.ReferenceProcessor; +import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; +import org.apache.tuscany.sca.interfacedef.java.JavaInterface; +import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract; +import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; +import org.apache.tuscany.sca.monitor.Monitor; + + +/** + * Implements a StAX artifact processor for Web implementations. + */ +public class WebImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor { + private static final QName IMPLEMENTATION_WEB = new QName(Constants.SCA10_NS, "implementation.web"); + + private AssemblyFactory assemblyFactory; + private WebImplementationFactory implementationFactory; + private Monitor monitor; + private JavaEEExtension jeeExtension; + private JavaEEOptionalExtension jeeOptionalExtension; + private JavaImplementationFactory javaImplementationFactory; + private JavaInterfaceFactory javaInterfaceFactory; + + public WebImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) { + this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); + this.implementationFactory = modelFactories.getFactory(WebImplementationFactory.class); + this.jeeExtension = modelFactories.getFactory(JavaEEExtension.class); + this.jeeOptionalExtension = modelFactories.getFactory(JavaEEOptionalExtension.class); + this.monitor = monitor; + + this.javaImplementationFactory = new DefaultJavaImplementationFactory(); + this.javaInterfaceFactory = modelFactories.getFactory(JavaInterfaceFactory.class); + javaImplementationFactory.addClassVisitor(new ReferenceProcessor(assemblyFactory, javaInterfaceFactory)); + javaImplementationFactory.addClassVisitor(new PropertyProcessor(assemblyFactory)); + javaImplementationFactory.addClassVisitor(new ComponentNameProcessor(assemblyFactory)); + javaImplementationFactory.addClassVisitor(new ContextProcessor(assemblyFactory)); + } + + public QName getArtifactType() { + // Returns the QName of the XML element processed by this processor + return IMPLEMENTATION_WEB; + } + + public Class getModelType() { + // Returns the type of model processed by this processor + return WebImplementation.class; + } + + public WebImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException { + + // Read an element + WebImplementation implementation = implementationFactory.createWebImplementation(); + implementation.setUnresolved(true); + + // Read the webapp uri attribute + String webURI = getString(reader, "web-uri"); + if (webURI != null) { + implementation.setWebURI(webURI); + + // Set the URI of the component type + // TODO: This should point to the base uri of the WAR file + implementation.setURI(webURI); + } + + // Skip to end element + while (reader.hasNext()) { + if (reader.next() == END_ELEMENT && IMPLEMENTATION_WEB.equals(reader.getName())) { + break; + } + } + + return implementation; + } + + public void resolve(WebImplementation implementation, ModelResolver resolver) throws ContributionResolveException { + + // Resolve the component type + String uri = implementation.getURI(); + if (uri != null) { + WebModuleInfo webModuleInfo = new WebModuleInfoImpl(); + webModuleInfo.setUri(URI.create(uri)); + webModuleInfo = resolver.resolveModel(WebModuleInfo.class, webModuleInfo); + if(jeeOptionalExtension != null) { + ComponentType ct = jeeOptionalExtension.createImplementationWebComponentType(webModuleInfo); + implementation.getReferences().addAll(ct.getReferences()); + implementation.getProperties().addAll(ct.getProperties()); + List propertyNames = new ArrayList(); + for(Property prop : ct.getProperties()) { + propertyNames.add(prop.getName()); + } + // Injection points from optional extension + for(Map.Entry entry : webModuleInfo.getEjbReferences().entrySet()) { + EjbReferenceInfo ejbRef = entry.getValue(); + implementation.getOptExtensionReferenceInjectionPoints().put(ejbRef.injectionTarget, ejbRef.businessInterface); + } + for(Map.Entry entry : webModuleInfo.getEnvEntries().entrySet()) { + EnvEntryInfo envEntry = entry.getValue(); + if(propertyNames.contains(envEntry.name.replace("/", "_"))) { + implementation.getOptExtensionPropertyInjectionPoints().put(envEntry.name, envEntry.type); + } + } + } + + // Introspection of classes + List> webArtifacts = new ArrayList>(); + webArtifacts.addAll(webModuleInfo.getServletClasses()); + webArtifacts.addAll(webModuleInfo.getFilterClasses()); + webArtifacts.addAll(webModuleInfo.getListenerClasses()); + webArtifacts.addAll(webModuleInfo.getJSFClasses()); + JavaImplementation ji = javaImplementationFactory.createJavaImplementation(); + for(Class clazz : webArtifacts) { + try { + javaImplementationFactory.createJavaImplementation(ji, clazz); + } catch (IntrospectionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + implementation.getReferences().addAll(ji.getReferences()); + implementation.getProperties().addAll(ji.getProperties()); + for(Map.Entry entry : ji.getReferenceMembers().entrySet()) { + implementation.getReferenceInjectionPoints().put(entry.getKey(), entry.getValue()); + } + for(Map.Entry entry : ji.getPropertyMembers().entrySet()) { + implementation.getPropertyInjectionPoints().put(entry.getKey(), entry.getValue()); + } + for(Map.Entry entry : ji.getResources().entrySet()) { + implementation.getResourceInjectionPoints().put(entry.getKey(), entry.getValue()); + } + + // SCA References in JSP Tags + for(JspReferenceTagInfo jspRefTag : webModuleInfo.getJspReferenceTags()) { + ComponentReference ref = assemblyFactory.createComponentReference(); + ref.setName(jspRefTag.name); + JavaInterfaceContract intfContract = javaInterfaceFactory.createJavaInterfaceContract(); + try { + intfContract.setInterface(javaInterfaceFactory.createJavaInterface(jspRefTag.type)); + } catch (InvalidInterfaceException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + ref.setInterfaceContract(intfContract); + implementation.getReferences().add(ref); + } + + // Process componentType side file + ComponentType componentType = assemblyFactory.createComponentType(); + componentType.setURI("WEB-INF/web.componentType"); + componentType = resolver.resolveModel(ComponentType.class, componentType); + if (!componentType.isUnresolved()) { + + // Initialize the implementation's services, references and properties + implementation.getServices().addAll(componentType.getServices()); + implementation.getReferences().addAll(componentType.getReferences()); + implementation.getProperties().addAll(componentType.getProperties()); + } + } + implementation.setUnresolved(false); + } + + public void write(WebImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException { + + // Write + writeStart(writer, IMPLEMENTATION_WEB.getNamespaceURI(), IMPLEMENTATION_WEB.getLocalPart(), + new XAttr("web-uri", implementation.getWebURI())); + + writeEnd(writer); + } +} diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor new file mode 100644 index 0000000000..3f1e888e16 --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor @@ -0,0 +1,19 @@ +# 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 artifact processor extension +org.apache.tuscany.sca.implementation.web.xml.WebImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.web,model=org.apache.tuscany.sca.implementation.web.WebImplementation,factory=org.apache.tuscany.sca.implementation.web.WebImplementationFactory diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory new file mode 100644 index 0000000000..d54fe9fcee --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory @@ -0,0 +1,19 @@ +# 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 model factory +org.apache.tuscany.sca.implementation.web.impl.WebImplementationFactoryImpl diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java new file mode 100644 index 0000000000..10a7df7ae5 --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java @@ -0,0 +1,81 @@ +/* + * 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.implementation.web.xml; + +import java.io.InputStream; + +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamReader; + +import junit.framework.TestCase; + +import org.apache.tuscany.sca.assembly.AssemblyFactory; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.SCABindingFactory; +import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; +import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl; +import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; +import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; +import org.apache.tuscany.sca.core.UtilityExtensionPoint; +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; +import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory; + +/** + * Test reading Web implementations. + */ +public class ReadTestCase extends TestCase { + + private XMLInputFactory inputFactory; + private StAXArtifactProcessor staxProcessor; + private CompositeBuilder compositeBuilder; + + @Override + public void setUp() throws Exception { + DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); + inputFactory = XMLInputFactory.newInstance(); + StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints); + staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null); + + ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class); + AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); + SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class); + UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); + InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class); + IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class); + compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper, null); + } + + public void testReadComposite() throws Exception { + InputStream is = getClass().getResourceAsStream("TestWeb.composite"); + XMLStreamReader reader = inputFactory.createXMLStreamReader(is); + Composite composite = (Composite) staxProcessor.read(reader); + assertNotNull(composite); + + compositeBuilder.build(composite); + + assertTrue(((WebImplementation) composite.getComponents().get(0).getImplementation()).getWebURI().equals("MyWebapp")); + } + +} diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java new file mode 100644 index 0000000000..723672270d --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java @@ -0,0 +1,66 @@ +/* + * 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.implementation.web.xml; + +import java.io.ByteArrayOutputStream; +import java.io.InputStream; + +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLOutputFactory; + +import junit.framework.TestCase; + +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; +import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; + +/** + * Test reading/write Web implementations. + */ +public class WriteTestCase extends TestCase { + + private XMLInputFactory inputFactory; + private XMLOutputFactory outputFactory; + private StAXArtifactProcessor staxProcessor; + + @Override + public void setUp() throws Exception { + DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); + inputFactory = XMLInputFactory.newInstance(); + outputFactory = XMLOutputFactory.newInstance(); + StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints); + staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, null); + } + + public void testReadWriteComposite() throws Exception { + InputStream is = getClass().getResourceAsStream("TestWeb.composite"); + Composite composite = (Composite) staxProcessor.read(inputFactory.createXMLStreamReader(is)); + assertNotNull(composite); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos)); + + assertTrue(bos.toString().contains("web-uri=\"MyWebapp\"")); + + } + +} diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite new file mode 100644 index 0000000000..181de3772b --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite @@ -0,0 +1,29 @@ + + + + + + + + + -- cgit v1.2.3