From d1f056a0126252f101d108ad2952ac0eebb78cb0 Mon Sep 17 00:00:00 2001 From: nash Date: Tue, 24 Aug 2010 11:26:41 +0000 Subject: Copy 1.6 release to new 1.6.1 branch git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@988487 13f79535-47bb-0310-9956-ffa450edef68 --- .../modules/contribution-jee/LICENSE | 205 +++++++++++ .../sca-java-1.6.1/modules/contribution-jee/NOTICE | 6 + .../modules/contribution-jee/pom.xml | 106 ++++++ .../jee/EJBImplementationGenerated.java | 56 +++ .../tuscany/sca/contribution/jee/EjbInfo.java | 39 ++ .../sca/contribution/jee/EjbModuleInfo.java | 39 ++ .../contribution/jee/EjbModuleModelResolver.java | 70 ++++ .../sca/contribution/jee/EjbReferenceInfo.java | 34 ++ .../tuscany/sca/contribution/jee/EnvEntryInfo.java | 29 ++ .../sca/contribution/jee/ExternalEarInfo.java | 31 ++ .../sca/contribution/jee/InjectionTarget.java | 28 ++ .../contribution/jee/JavaEEApplicationInfo.java | 38 ++ .../jee/JavaEEApplicationModelResolver.java | 70 ++++ .../sca/contribution/jee/JavaEEExtension.java | 38 ++ .../sca/contribution/jee/JavaEEIntrospector.java | 34 ++ .../contribution/jee/JavaEEOptionalExtension.java | 41 +++ .../sca/contribution/jee/JspReferenceTagInfo.java | 30 ++ .../tuscany/sca/contribution/jee/ModelObject.java | 32 ++ .../contribution/jee/ModelObjectModelResolver.java | 73 ++++ .../jee/WebImplementationGenerated.java | 43 +++ .../sca/contribution/jee/WebModuleInfo.java | 50 +++ .../contribution/jee/WebModuleModelResolver.java | 70 ++++ .../jee/impl/EJBImplementationGeneratedImpl.java | 77 ++++ .../impl/EJBImplementationGeneratedProcessor.java | 67 ++++ .../jee/impl/EarContributionProcessor.java | 158 ++++++++ .../contribution/jee/impl/EjbArchiveProcessor.java | 69 ++++ .../contribution/jee/impl/EjbModuleInfoImpl.java | 66 ++++ .../jee/impl/JavaEEApplicationInfoImpl.java | 68 ++++ .../jee/impl/JavaEEArchiveProcessor.java | 59 +++ .../contribution/jee/impl/JavaEEExtensionImpl.java | 262 ++++++++++++++ .../jee/impl/JavaEEOptionalExtensionImpl.java | 398 +++++++++++++++++++++ .../sca/contribution/jee/impl/ModelObjectImpl.java | 51 +++ .../jee/impl/WarContributionProcessor.java | 36 ++ .../contribution/jee/impl/WebArchiveProcessor.java | 59 +++ .../jee/impl/WebImplementationGeneratedImpl.java | 60 ++++ .../impl/WebImplementationGeneratedProcessor.java | 66 ++++ .../contribution/jee/impl/WebModuleInfoImpl.java | 109 ++++++ ...he.tuscany.sca.contribution.jee.JavaEEExtension | 18 + ...ny.sca.contribution.jee.JavaEEOptionalExtension | 18 + ...any.sca.contribution.processor.PackageProcessor | 19 + ...ca.contribution.processor.StAXArtifactProcessor | 22 ++ ...sca.contribution.processor.URLArtifactProcessor | 21 ++ ...tuscany.sca.contribution.resolver.ModelResolver | 21 ++ .../jee/EarContributionProcessorTestCase.java | 57 +++ .../jee/WarContributionProcessorTestCase.java | 57 +++ .../src/test/resources/ejb-injection-sample.ear | Bin 0 -> 19015 bytes .../src/test/resources/ejb-injection-sample.jar | Bin 0 -> 11042 bytes .../src/test/resources/sample-web-app.war | Bin 0 -> 12454 bytes 48 files changed, 3000 insertions(+) create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/LICENSE create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/NOTICE create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/pom.xml create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBImplementationGenerated.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ExternalEarInfo.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/InjectionTarget.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObject.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObjectModelResolver.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebImplementationGenerated.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedProcessor.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/ModelObjectImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedProcessor.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEExtension create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/resources/sample-web-app.war (limited to 'sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee') diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/LICENSE b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/LICENSE new file mode 100644 index 0000000000..6e529a25c4 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/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/branches/sca-java-1.6.1/modules/contribution-jee/NOTICE b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/NOTICE new file mode 100644 index 0000000000..ad2ba40961 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/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/branches/sca-java-1.6.1/modules/contribution-jee/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/pom.xml new file mode 100644 index 0000000000..f43b95a3b6 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/pom.xml @@ -0,0 +1,106 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-modules + 1.6-SNAPSHOT + ../pom.xml + + tuscany-contribution-jee + Apache Tuscany SCA Java EE + + + + org.apache.geronimo.specs + geronimo-ejb_3.0_spec + 1.0.1 + provided + + + org.apache.tuscany.sca + tuscany-contribution + 1.6-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-contribution-impl + 1.6-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-core-spi + 1.6-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-interface-java + 1.6-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-interface-java-xml + 1.6-SNAPSHOT + + + + org.eclipse.emf + common + 2.2.3 + + + + org.codehaus.woodstox + wstx-asl + 3.2.4 + runtime + + + stax + stax-api + + + + + + + + + org.apache.felix + maven-bundle-plugin + + + + ${tuscany.version} + org.apache.tuscany.sca.contribution.jee + ${pom.name} + org.apache.tuscany.sca.contribution.jee* + org.apache.tuscany.sca.contribution.osgi.impl + + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBImplementationGenerated.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBImplementationGenerated.java new file mode 100644 index 0000000000..770fb08279 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBImplementationGenerated.java @@ -0,0 +1,56 @@ +/* + * 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.contribution.jee; + +import org.apache.tuscany.sca.assembly.Implementation; + + + +/** + * The model representing an EJB implementation in an SCA assembly model when the + * EJB implementation has been generated by introspecting a non-enhanced EAR + */ +public interface EJBImplementationGenerated extends Implementation { + + /** + * Return the EjbInfo which generated this EJB component implementation + * @return + */ + EjbInfo getEJBInfo(); + + /** + * Set the EjbInfo which generated this EJB component implementation + * @param ejbInfo + */ + void setEJBInfo(EjbInfo ejbInfo); + + /** + * return the EjbModuleInfo which contains the EJB Info used to generate this object + * + * @return + */ + EjbModuleInfo getEjbModuleInfo(); + + /** + * Set the EjbModuleInfo which contains the EJB Info used to generate this object + * + * @param ejbModuleInfo + */ + void setEjbModuleInfo(EjbModuleInfo ejbModuleInfo); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java new file mode 100644 index 0000000000..c3cb4e7b90 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java @@ -0,0 +1,39 @@ +/* + * 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.contribution.jee; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +/** + * @version $Rev$ $Date$ + */ +public class EjbInfo { + public enum EjbType {SESSION_STATELESS, SESSION_STATEFUL, SESSION_UNKNOWN, MESSAGE_DRIVEN}; + public String beanName; + public Class beanClass; + public String mappedName; + public EjbType ejbType; + public Collection> businessRemote = new ArrayList>(); + public Collection> businessLocal = new ArrayList>(); + public Map ejbReferences = new HashMap(); + public Map envEntries = new HashMap(); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java new file mode 100644 index 0000000000..00f7011111 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java @@ -0,0 +1,39 @@ +/* + * 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.contribution.jee; + +import java.net.URI; +import java.util.Map; + +/** + * @version $Rev$ $Date$ + */ +public interface EjbModuleInfo { + URI getUri(); + void setUri(URI uri); + + String getModuleName(); + void setModuleName(String moduleName); + + ClassLoader getModuleClassloader(); + void setmoduleClassloader(ClassLoader classLoader); + + Map getEjbInfos(); + EjbInfo getEjbInfo(String beanName); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java new file mode 100644 index 0000000000..72d594c4d0 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java @@ -0,0 +1,70 @@ +/* + * 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.contribution.jee; + +import java.net.URI; +import java.util.HashMap; +import java.util.Map; + +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; + +/** + * A Model Resolver for EjbModule models. + * + * @version $Rev$ $Date$ + */ +public class EjbModuleModelResolver implements ModelResolver { + + private Map map = new HashMap(); + private Contribution contribution; + + public EjbModuleModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) { + this.contribution = contribution; + } + + public void addModel(Object resolved) { + EjbModuleInfo ejbModule = (EjbModuleInfo)resolved; + map.put(ejbModule.getUri(), ejbModule); + } + + public Object removeModel(Object resolved) { + return map.remove(((EjbModuleInfo)resolved).getUri()); + } + + public T resolveModel(Class modelClass, T unresolved) { + // Lookup a EjbModuleInfo for the given URI + URI uri = ((EjbModuleInfo)unresolved).getUri(); + if (uri != null) { + EjbModuleInfo resolved = (EjbModuleInfo) map.get(uri); + if (resolved != null) { + return modelClass.cast(resolved); + } else { + uri = URI.create(""); + resolved = (EjbModuleInfo) map.get(uri); + if (resolved != null) { + return modelClass.cast(resolved); + } + } + } + return unresolved; + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java new file mode 100644 index 0000000000..70470f1133 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.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.contribution.jee; + +/** + * @version $Rev$ $Date$ + */ +public class EjbReferenceInfo { + public enum EjbType {STATELESS, STATEFUL, SESSION_UNKNOWN, UNKNOWN}; + public enum RefType {LOCAL, REMOTE, UNKNOWN}; + public String referenceName; + public EjbType ejbType; + public RefType referenceType; + public Class businessInterface; + public String ejbLink; + public String mappedName; + public InjectionTarget injectionTarget = new InjectionTarget(); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java new file mode 100644 index 0000000000..26ce44c07e --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java @@ -0,0 +1,29 @@ +/* + * 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.contribution.jee; + + +/** + * @version $Rev$ $Date$ + */ +public class EnvEntryInfo { + public String type; + public String name; + public String value; +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ExternalEarInfo.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ExternalEarInfo.java new file mode 100644 index 0000000000..c0b54156ea --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ExternalEarInfo.java @@ -0,0 +1,31 @@ +/* + * 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.contribution.jee; + +import org.apache.tuscany.sca.assembly.Composite; + + +/** + * @version $Rev: 755722 $ $Date: 2009-03-18 20:23:02 +0000 (Wed, 18 Mar 2009) $ + */ +public interface ExternalEarInfo { + + JavaEEApplicationInfo getAppInfo(); + Composite getAppComposite(); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/InjectionTarget.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/InjectionTarget.java new file mode 100644 index 0000000000..4ea2b6b072 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/InjectionTarget.java @@ -0,0 +1,28 @@ +/* + * 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.contribution.jee; + + +/** + * @version $Rev$ $Date$ + */ +public class InjectionTarget { + public String targetClass; + public String targetName; +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java new file mode 100644 index 0000000000..107c251ea7 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java @@ -0,0 +1,38 @@ +/* + * 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.contribution.jee; + +import java.net.URI; +import java.util.Map; + +/** + * @version $Rev$ $Date$ + */ +public interface JavaEEApplicationInfo { + URI getUri(); + void setUri(URI uri); + + String getApplicationName(); + void setApplicationName(String applicationName); + + Map getWebModuleInfos(); + WebModuleInfo getWebModuleInfo(String moduleName); + Map getEjbModuleInfos(); + EjbModuleInfo getEjbModuleInfo(String moduleName); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java new file mode 100644 index 0000000000..e27fa5ae44 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java @@ -0,0 +1,70 @@ +/* + * 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.contribution.jee; + +import java.net.URI; +import java.util.HashMap; +import java.util.Map; + +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; + +/** + * A Model Resolver for JavaEEApplicationInfo models. + * + * @version $Rev$ $Date$ + */ +public class JavaEEApplicationModelResolver implements ModelResolver { + + private Map map = new HashMap(); + private Contribution contribution; + + public JavaEEApplicationModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) { + this.contribution = contribution; + } + + public void addModel(Object resolved) { + JavaEEApplicationInfo jeeApp = (JavaEEApplicationInfo)resolved; + map.put(jeeApp.getUri(), jeeApp); + } + + public Object removeModel(Object resolved) { + return map.remove(((JavaEEApplicationInfo)resolved).getUri()); + } + + public T resolveModel(Class modelClass, T unresolved) { + // Lookup a JavaEEApplicationInfo for the given URI + URI uri = ((JavaEEApplicationInfo)unresolved).getUri(); + if (uri != null) { + JavaEEApplicationInfo resolved = (JavaEEApplicationInfo) map.get(uri); + if (resolved != null) { + return modelClass.cast(resolved); + } else { + uri = URI.create(""); + resolved = (JavaEEApplicationInfo) map.get(uri); + if (resolved != null) { + return modelClass.cast(resolved); + } + } + } + return unresolved; + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java new file mode 100644 index 0000000000..7b7d1f161f --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java @@ -0,0 +1,38 @@ +/* + * 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.contribution.jee; + +import org.apache.tuscany.sca.assembly.ComponentType; +import org.apache.tuscany.sca.assembly.Composite; + +/** + * Compute componentType with EJB3 business interfaces translating into SCA services. + * + * @version $Rev$ $Date$ + */ +public interface JavaEEExtension { + // The EJBImplementation model is a straight implementation so we deal in + // component types + ComponentType createImplementationEjbComponentType(EjbModuleInfo ejbModule, String ejbName); + + // The JEEImplemenation model is a composite and so we have to fluff + // up the composite contents to match the JEE artifact + void createImplementationJeeComposite(EjbModuleInfo ejbModule, Composite composite); + void createImplementationJeeComposite(JavaEEApplicationInfo appInfo, Composite composite); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java new file mode 100644 index 0000000000..ab89ce2bf7 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.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.contribution.jee; + +import java.net.URL; + +import org.apache.tuscany.sca.contribution.service.ContributionReadException; + +/** + * Introspect JavaEE modules and applications. + * + * @version $Rev$ $Date$ + */ +public interface JavaEEIntrospector { + WebModuleInfo introspectWebArchive(URL artifactURL) throws ContributionReadException; + EjbModuleInfo introspectEjbArchive(URL artifactURL) throws ContributionReadException; + JavaEEApplicationInfo introspectJeeArchive(URL artifactURL) throws ContributionReadException; +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java new file mode 100644 index 0000000000..50a449ce78 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java @@ -0,0 +1,41 @@ +/* + * 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.contribution.jee; + +import org.apache.tuscany.sca.assembly.ComponentType; +import org.apache.tuscany.sca.assembly.Composite; + +/** + * Compute componentType with Remote EJB references translating into SCA references and env-entries translating into + * SCA properties. + * + * @version $Rev$ $Date$ + */ +public interface JavaEEOptionalExtension { + // The EJBImplementation and WEBImplemenation models are straight implementations so + // we deals in component types + ComponentType createImplementationWebComponentType(WebModuleInfo webModule); + ComponentType createImplementationEjbComponentType(EjbModuleInfo ejbModule, String ejbName); + + // The JEEImplemenation model is a composite and so we have to fluff + // up the composite contents to match the JEE artifact + void createImplementationJeeComposite(WebModuleInfo webModule, Composite composite); + void createImplementationJeeComposite(EjbModuleInfo ejbModule, Composite composite); + void createImplementationJeeComposite(JavaEEApplicationInfo appInfo, Composite composite); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java new file mode 100644 index 0000000000..e36aea2790 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java @@ -0,0 +1,30 @@ +/* + * 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.contribution.jee; + + +/** + * @version $Rev$ $Date$ + * + * Information on SCA reference tags in JSP pages. + */ +public class JspReferenceTagInfo { + public String name; + public Class type; +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObject.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObject.java new file mode 100644 index 0000000000..e981339733 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObject.java @@ -0,0 +1,32 @@ +/* + * 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.contribution.jee; + +import java.net.URI; + +/** + * @version $Rev$ $Date$ + */ +public interface ModelObject { + URI getUri(); + void setUri(URI uri); + + Object getObject(); + void setObject(Object obj); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObjectModelResolver.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObjectModelResolver.java new file mode 100644 index 0000000000..aa24dcac2c --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObjectModelResolver.java @@ -0,0 +1,73 @@ +/* + * 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.contribution.jee; + +import java.net.URI; +import java.util.HashMap; +import java.util.Map; + +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.jee.impl.ModelObjectImpl; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; + +/** + * A Model Resolver for obtaining any model object using URI. + * + * @version $Rev$ $Date$ + */ +public class ModelObjectModelResolver implements ModelResolver { + + private Map map = new HashMap(); + private Contribution contribution; + + public ModelObjectModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) { + this.contribution = contribution; + } + + public void addModel(Object resolved) { + map.put(((ModelObject)resolved).getUri(), (ModelObject)resolved); + } + + public Object removeModel(Object resolved) { + return map.remove(((ModelObject)resolved).getUri()); + } + + public T resolveModel(Class modelClass, T unresolved) { + URI uri = ((ModelObject)unresolved).getUri(); + if (uri != null) { + ModelObject resolved = (ModelObject) map.get(uri); + if (resolved != null) { + return modelClass.cast(resolved); + } else { + for(Artifact artifact : contribution.getArtifacts()) { + if(artifact.getURI().equals(uri.toString())) { + resolved = new ModelObjectImpl(); + resolved.setUri(uri); + resolved.setObject(artifact.getModel()); + return modelClass.cast(resolved); + } + } + } + } + return unresolved; + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebImplementationGenerated.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebImplementationGenerated.java new file mode 100644 index 0000000000..ee3b057ee6 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebImplementationGenerated.java @@ -0,0 +1,43 @@ +/* + * 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.contribution.jee; + +import org.apache.tuscany.sca.assembly.Implementation; + + + +/** + * The model representing a WEB implementation in an SCA assembly model when the + * WEB implementation has been generated by introspecting a non-enhanced EAR + */ +public interface WebImplementationGenerated extends Implementation { + + /** + * Return the WebModuleInfo which generated this Web component implementation + * @return + */ + WebModuleInfo getWebInfo(); + + /** + * Set the WebModuleInfo which generated this Web component implementation + * @param webInfo + */ + void setWebInfo(WebModuleInfo webInfo); + +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java new file mode 100644 index 0000000000..79e9019b11 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java @@ -0,0 +1,50 @@ +/* + * 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.contribution.jee; + +import java.net.URI; +import java.util.Collection; +import java.util.Map; + +/** + * @version $Rev$ $Date$ + */ +public interface WebModuleInfo { + URI getUri(); + void setUri(URI uri); + + String getModuleName(); + void setModuleName(String moduleName); + + ClassLoader getModuleClassloader(); + void setmoduleClassloader(ClassLoader classLoader); + + Map getEjbReferences(); + Map getEnvEntries(); + + EjbReferenceInfo getEjbReference(String ejbRefName); + EnvEntryInfo getEnvEntry(String envEntryName); + + Collection> getServletClasses(); + Collection> getListenerClasses(); + Collection> getFilterClasses(); + Collection> getJSFClasses(); + + Collection getJspReferenceTags(); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java new file mode 100644 index 0000000000..74117a13f0 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java @@ -0,0 +1,70 @@ +/* + * 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.contribution.jee; + +import java.net.URI; +import java.util.HashMap; +import java.util.Map; + +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; + +/** + * A Model Resolver for WebModuleInfo models. + * + * @version $Rev$ $Date$ + */ +public class WebModuleModelResolver implements ModelResolver { + + private Map map = new HashMap(); + private Contribution contribution; + + public WebModuleModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) { + this.contribution = contribution; + } + + public void addModel(Object resolved) { + WebModuleInfo webModule = (WebModuleInfo)resolved; + map.put(webModule.getUri(), webModule); + } + + public Object removeModel(Object resolved) { + return map.remove(((WebModuleInfo)resolved).getUri()); + } + + public T resolveModel(Class modelClass, T unresolved) { + // Lookup a WebModuleInfo for the given URI + URI uri = ((WebModuleInfo)unresolved).getUri(); + if (uri != null) { + WebModuleInfo resolved = (WebModuleInfo) map.get(uri); + if (resolved != null) { + return modelClass.cast(resolved); + } else { + uri = URI.create(""); + resolved = (WebModuleInfo) map.get(uri); + if (resolved != null) { + return modelClass.cast(resolved); + } + } + } + return unresolved; + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedImpl.java new file mode 100644 index 0000000000..eb5b8d8463 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedImpl.java @@ -0,0 +1,77 @@ +/* + * 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.contribution.jee.impl; + +import org.apache.tuscany.sca.assembly.ConstrainingType; +import org.apache.tuscany.sca.assembly.impl.ImplementationImpl; +import org.apache.tuscany.sca.contribution.jee.EJBImplementationGenerated; +import org.apache.tuscany.sca.contribution.jee.EjbInfo; +import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo; + +/** + * The model representing an EJB implementation in an SCA assembly model when the + * EJB implementation has been generated by introspecting a non-enhanced EAR $ + */ +class EJBImplementationGeneratedImpl extends ImplementationImpl implements EJBImplementationGenerated { + + private EjbInfo ejbInfo; + private EjbModuleInfo ejbModuleInfo; + + /** + * Constructs a new EJB implementation. + */ + EJBImplementationGeneratedImpl() { + super(); + } + + @Override + public ConstrainingType getConstrainingType() { + // The EJB implementation does not support constrainingTypes + return null; + } + + @Override + public void setConstrainingType(ConstrainingType constrainingType) { + // The EJB implementation does not support constrainingTypes + } + + public EjbInfo getEJBInfo() { + return ejbInfo; + } + + public void setEJBInfo(EjbInfo ejbInfo) { + this.ejbInfo = ejbInfo; + } + + public EjbModuleInfo getEjbModuleInfo() { + return ejbModuleInfo; + } + + public void setEjbModuleInfo(EjbModuleInfo ejbModuleInfo) { + this.ejbModuleInfo = ejbModuleInfo; + } + + // make sure the generated implementation can be distinguished + // based on the ejb info that is referenced + @Override + public int hashCode() { + return getEJBInfo().hashCode(); + } + +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedProcessor.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedProcessor.java new file mode 100644 index 0000000000..bc8bc99770 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EJBImplementationGeneratedProcessor.java @@ -0,0 +1,67 @@ +/* + * 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.contribution.jee.impl; + +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.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.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.monitor.Monitor; + + +/** + * Dummy processor that's used to mark EJBImplementationGeneratedImpl instance + * as resolved at the appropriate point in the resolution processing + * + * @version $Rev$ $Date$ + */ +public class EJBImplementationGeneratedProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor { + + public EJBImplementationGeneratedProcessor(ExtensionPointRegistry registry, + Monitor monitor) { + } + + public QName getArtifactType() { + return null; + } + + public Class getModelType() { + // Returns the type of model processed by this processor + return EJBImplementationGeneratedImpl.class; + } + + public EJBImplementationGeneratedImpl read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException { + return null; + } + + public void resolve(EJBImplementationGeneratedImpl implementation, ModelResolver resolver) throws ContributionResolveException { + implementation.setUnresolved(false); + } + + public void write(EJBImplementationGeneratedImpl implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException { + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java new file mode 100644 index 0000000000..b0eb155636 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java @@ -0,0 +1,158 @@ +/* + * 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.contribution.jee.impl; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.jar.JarEntry; +import java.util.jar.JarInputStream; + +import org.apache.tuscany.sca.contribution.PackageType; +import org.apache.tuscany.sca.contribution.processor.PackageProcessor; +import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor; +import org.apache.tuscany.sca.contribution.service.ContributionException; +import org.eclipse.emf.common.archive.ArchiveURLConnection; + +/** + * Ear Contribution package processor. + * + * @version $Rev$ $Date$ + */ +public class EarContributionProcessor implements PackageProcessor { + + /* URL stream handler for "archive" */ + private static URLStreamHandler archiveUrlStreamHandler = new URLStreamHandler() { + @Override + protected URLConnection openConnection(URL u) throws IOException { + return new ArchiveURLConnection(u); + } + }; + + public URL getArtifactURL(URL packageSourceURL, URI artifact) + throws MalformedURLException { + if(artifact.toString().equals("")) { + return packageSourceURL; + } + if (packageSourceURL.toString().startsWith("archive:")) { + return new URL(packageSourceURL, artifact.toString(), archiveUrlStreamHandler); + } else { + return new URL("archive", "", -1, packageSourceURL.toExternalForm() + "!/" + artifact, archiveUrlStreamHandler); + } + } + + public List getArtifacts(URL packageSourceURL, InputStream inputStream) throws ContributionException, IOException { + if (packageSourceURL == null) { + throw new IllegalArgumentException("Invalid null package source URL."); + } + + if (inputStream == null) { + throw new IllegalArgumentException("Invalid null source inputstream."); + } + + // The root is a jar file + JarInputStream jar = new JarInputStream(inputStream); + try { + Set names = new HashSet(); + while (true) { + JarEntry entry = jar.getNextJarEntry(); + if (entry == null) { + // EOF + break; + } + + String name = entry.getName(); + if (!name.startsWith(".")) { + + // Trim trailing / + if (name.endsWith("/")) { + name = name.substring(0, name.length() - 1); + } + + // Add the entry name + if (!names.contains(name)) { + names.add(name); + + // Add parent folder names to the list too + for (;;) { + int s = name.lastIndexOf('/'); + if (s == -1) { + name = ""; + } else { + name = name.substring(0, s); + } + if (!names.contains(name)) { + names.add(name); + } else { + break; + } + } + } + } + if(entry.getName().indexOf("/") == -1 && (entry.getName().toLowerCase().endsWith(".war") || entry.getName().toLowerCase().endsWith(".jar"))) { + // A WAR or an EJB JAR file in the root of the archive. + // Get entries from the nested archive. + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + int b; + while((b = jar.read()) != -1) { + bout.write(b); + } + bout.close(); + ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); + + PackageProcessor archiveProcessor = entry.getName().toLowerCase().endsWith(".war") ? new WarContributionProcessor() : new JarContributionProcessor(); + List artifacts = archiveProcessor.getArtifacts(packageSourceURL, bin); + bin.close(); + for(URI artifact : artifacts) { + // don't add in nested application composites + if ((artifact.toString().endsWith("ejb-jar.composite") == false) && + (artifact.toString().endsWith("web.composite") == false)) { + names.add(entry.getName()+"!/"+artifact); + } + } + } + } + + // Return list of URIs + List artifacts = new ArrayList(); + for (String name: names) { + artifacts.add(URI.create(name)); + } + return artifacts; + + } finally { + jar.close(); + } + } + + public String getPackageType() { + return PackageType.EAR; + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java new file mode 100644 index 0000000000..36aabefa99 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java @@ -0,0 +1,69 @@ +/* + * 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.contribution.jee.impl; + +import java.io.File; +import java.net.URI; +import java.net.URL; + +import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; +import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; +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.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.monitor.Monitor; + +/** + * URLArtifactProcessor for EJB jars. + * + * @version $Rev$ $Date$ + */ +public class EjbArchiveProcessor implements URLArtifactProcessor { + private JavaEEIntrospector jeeIntrospector; + + public EjbArchiveProcessor(ExtensionPointRegistry registry, Monitor monitor) { + jeeIntrospector = registry.getExtensionPoint(JavaEEIntrospector.class); + } + + public String getArtifactType() { + return ".jar"; + } + + public EjbModuleInfo read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException { + if (jeeIntrospector != null) { + EjbModuleInfo ejbModuleInfo = jeeIntrospector.introspectEjbArchive(artifactURL); + if(ejbModuleInfo != null) { + ejbModuleInfo.setUri(artifactURI); + ejbModuleInfo.setModuleName(new File(artifactURL.getFile()).getName()); + } + return ejbModuleInfo; + } + return null; + } + + public Class getModelType() { + return EjbModuleInfo.class; + } + + public void resolve(EjbModuleInfo arg0, ModelResolver arg1) + throws ContributionResolveException { + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java new file mode 100644 index 0000000000..830aa81b19 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.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.contribution.jee.impl; + +import java.net.URI; +import java.util.HashMap; +import java.util.Map; + +import org.apache.tuscany.sca.contribution.jee.EjbInfo; +import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo; + +public class EjbModuleInfoImpl implements EjbModuleInfo { + + private URI uri; + private String moduleName; + private ClassLoader moduleClassLoader; + private Map ejbInfos = new HashMap(); + + public EjbInfo getEjbInfo(String beanName) { + return ejbInfos.get(beanName); + } + + public Map getEjbInfos() { + return ejbInfos; + } + + public String getModuleName() { + return moduleName; + } + + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + } + + public URI getUri() { + return uri; + } + + public void setUri(URI uri) { + this.uri = uri; + } + + public ClassLoader getModuleClassloader() { + return moduleClassLoader; + } + + public void setmoduleClassloader(ClassLoader classLoader) { + this.moduleClassLoader = classLoader; + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java new file mode 100644 index 0000000000..993605ebe5 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java @@ -0,0 +1,68 @@ +/* + * 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.contribution.jee.impl; + +import java.net.URI; +import java.util.HashMap; +import java.util.Map; + +import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; +import org.apache.tuscany.sca.contribution.jee.WebModuleInfo; + +public class JavaEEApplicationInfoImpl implements JavaEEApplicationInfo { + + private URI uri; + private String applicationName; + private Map ejbModuleInfos = new HashMap(); + private Map webModuleInfos = new HashMap(); + + + public String getApplicationName() { + return applicationName; + } + + public void setApplicationName(String applicationName) { + this.applicationName = applicationName; + } + + public EjbModuleInfo getEjbModuleInfo(String moduleName) { + return ejbModuleInfos.get(moduleName); + } + + public Map getEjbModuleInfos() { + return ejbModuleInfos; + } + + public WebModuleInfo getWebModuleInfo(String moduleName) { + return webModuleInfos.get(moduleName); + } + + public Map getWebModuleInfos() { + return webModuleInfos; + } + + public URI getUri() { + return uri; + } + + public void setUri(URI uri) { + this.uri = uri; + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java new file mode 100644 index 0000000000..53201b5e2b --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java @@ -0,0 +1,59 @@ +/* + * 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.contribution.jee.impl; + +import java.io.File; +import java.net.URI; +import java.net.URL; + +import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; +import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; +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.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.monitor.Monitor; + +public class JavaEEArchiveProcessor implements URLArtifactProcessor { + private JavaEEIntrospector jeeIntrospector; + + public JavaEEArchiveProcessor(ExtensionPointRegistry registry, Monitor monitor) { + jeeIntrospector = registry.getExtensionPoint(JavaEEIntrospector.class); + } + + public String getArtifactType() { + return ".ear"; + } + + public JavaEEApplicationInfo read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException { + JavaEEApplicationInfo jeeAppInfo = jeeIntrospector.introspectJeeArchive(artifactURL); + jeeAppInfo.setUri(artifactURI); + jeeAppInfo.setApplicationName(new File(artifactURL.getFile()).getName()); + return jeeAppInfo; + } + + public Class getModelType() { + return JavaEEApplicationInfo.class; + } + + public void resolve(JavaEEApplicationInfo arg0, ModelResolver arg1) + throws ContributionResolveException { + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java new file mode 100644 index 0000000000..4271a93399 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java @@ -0,0 +1,262 @@ +/* + * 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.contribution.jee.impl; + +import java.util.Map; + +import javax.xml.namespace.QName; + +import org.apache.tuscany.sca.assembly.AssemblyFactory; +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.ComponentService; +import org.apache.tuscany.sca.assembly.ComponentType; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.CompositeService; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.jee.EJBImplementationGenerated; +import org.apache.tuscany.sca.contribution.jee.EjbInfo; +import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEExtension; +import org.apache.tuscany.sca.contribution.jee.EjbInfo.EjbType; +import org.apache.tuscany.sca.interfacedef.InterfaceContract; +import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; +import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; +import org.apache.tuscany.sca.policy.Intent; +import org.apache.tuscany.sca.policy.PolicyFactory; + +public class JavaEEExtensionImpl implements JavaEEExtension { + + private AssemblyFactory assemblyFactory; + private JavaInterfaceFactory javaInterfaceFactory; + private PolicyFactory policyFactory; + private Intent EJB_INTENT; + + public JavaEEExtensionImpl(ModelFactoryExtensionPoint modelFactories) { + this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); + this.javaInterfaceFactory = modelFactories.getFactory(JavaInterfaceFactory.class); + this.policyFactory = modelFactories.getFactory(PolicyFactory.class); + + EJB_INTENT = policyFactory.createIntent(); + EJB_INTENT.setName(new QName("http://www.osoa.org/xmlns/sca/1.0", "ejb")); + } + + public ComponentType createImplementationEjbComponentType(EjbModuleInfo ejbModule, String ejbName) { + ComponentType componentType = assemblyFactory.createComponentType(); + EjbInfo ejbInfo = ejbModule.getEjbInfo(ejbName); + if(ejbInfo == null) { + return null; + } + if(ejbInfo.ejbType.compareTo(EjbType.MESSAGE_DRIVEN) != 0) { + for(Class intf : ejbInfo.businessRemote) { + Service service = assemblyFactory.createComponentService(); + String intfName = intf.getName(); + String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName; + service.setName(serviceName); + InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract(); + try { + ic.setInterface(javaInterfaceFactory.createJavaInterface(intf)); + } catch (InvalidInterfaceException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + service.setInterfaceContract(ic); + service.getRequiredIntents().add(EJB_INTENT); + + componentType.getServices().add(service); + } + + for(Class intf : ejbInfo.businessLocal) { + Service service = assemblyFactory.createComponentService(); + String intfName = intf.getName(); + String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName; + service.setName(serviceName); + InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract(); + try { + ic.setInterface(javaInterfaceFactory.createJavaInterface(intf)); + } catch (InvalidInterfaceException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + service.setInterfaceContract(ic); + service.getRequiredIntents().add(EJB_INTENT); + + componentType.getServices().add(service); + } + } + return componentType; + } + + public void createImplementationJeeComposite(EjbModuleInfo ejbModule, Composite composite) { + + for(Map.Entry entry : ejbModule.getEjbInfos().entrySet()) { + EjbInfo ejbInfo = entry.getValue(); + + Component component = findComponent(composite, ejbInfo, ejbModule); + + if(ejbInfo.ejbType.compareTo(EjbType.MESSAGE_DRIVEN) != 0) { + for(Class intf : ejbInfo.businessRemote) { + ComponentService service = assemblyFactory.createComponentService(); + String intfName = intf.getName(); + String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName; + serviceName = ejbInfo.beanName+"_"+serviceName; + service.setName(serviceName); + InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract(); + try { + ic.setInterface(javaInterfaceFactory.createJavaInterface(intf)); + } catch (InvalidInterfaceException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + service.setInterfaceContract(ic); + service.getRequiredIntents().add(EJB_INTENT); + + addComponentService(composite, component, service); + } + + for(Class intf : ejbInfo.businessLocal) { + ComponentService service = assemblyFactory.createComponentService(); + String intfName = intf.getName(); + String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName; + serviceName = ejbInfo.beanName+"_"+serviceName; + service.setName(serviceName); + InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract(); + try { + ic.setInterface(javaInterfaceFactory.createJavaInterface(intf)); + } catch (InvalidInterfaceException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + service.setInterfaceContract(ic); + service.getRequiredIntents().add(EJB_INTENT); + + addComponentService(composite, component, service); + } + } + } + } + + public void createImplementationJeeComposite(JavaEEApplicationInfo appInfo, Composite composite) { + + for(Map.Entry entry0 : appInfo.getEjbModuleInfos().entrySet()) { + EjbModuleInfo ejbModule = entry0.getValue(); + + for(Map.Entry entry : ejbModule.getEjbInfos().entrySet()) { + EjbInfo ejbInfo = entry.getValue(); + + Component component = findComponent(composite, ejbInfo, ejbModule); + + if(ejbInfo.ejbType.compareTo(EjbType.MESSAGE_DRIVEN) != 0) { + for(Class intf : ejbInfo.businessRemote) { + ComponentService service = assemblyFactory.createComponentService(); + String intfName = intf.getName(); + String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName; + serviceName = ejbInfo.mappedName+"_"+serviceName; + service.setName(serviceName); + InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract(); + try { + ic.setInterface(javaInterfaceFactory.createJavaInterface(intf)); + } catch (InvalidInterfaceException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + service.setInterfaceContract(ic); + service.getRequiredIntents().add(EJB_INTENT); + + addComponentService(composite, component, service); + } + + for(Class intf : ejbInfo.businessLocal) { + ComponentService service = assemblyFactory.createComponentService(); + String intfName = intf.getName(); + String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName; + serviceName = ejbInfo.mappedName+"_"+serviceName; + service.setName(serviceName); + InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract(); + try { + ic.setInterface(javaInterfaceFactory.createJavaInterface(intf)); + } catch (InvalidInterfaceException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + service.setInterfaceContract(ic); + service.getRequiredIntents().add(EJB_INTENT); + + addComponentService(composite, component, service); + } + } + } + } + } + + /** + * We are fluffing up the JEEImplemention composite to represented the components + * in the JEE archive. Given the JEEimplemenation composite find a named component + * it if already exists or create it if it doesn't. + * + * @param ejbInfo + * @param componentName + * @return + */ + private Component findComponent(Composite composite, EjbInfo ejbInfo, EjbModuleInfo ejbmoduleInfo){ + String componentName = ejbInfo.beanName; + Component component = null; + + for (Component tmpComponent : composite.getComponents()){ + if (tmpComponent.getName().equals(componentName)){ + component = tmpComponent; + break; + } + } + + if (component == null){ + component = assemblyFactory.createComponent(); + component.setName(componentName); + component.setUnresolved(true); + composite.getComponents().add(component); + + EJBImplementationGenerated implementation = new EJBImplementationGeneratedImpl(); + implementation.setUnresolved(true); + implementation.setEJBInfo(ejbInfo); + implementation.setEjbModuleInfo(ejbmoduleInfo); + component.setImplementation(implementation); + } + + return component; + } + + /** + * Add a component service and fluff up a composite service to match + * + * @param composite + * @param component + * @param service + */ + private void addComponentService(Composite composite, Component component, ComponentService service){ + component.getImplementation().getServices().add(service); + + CompositeService compositeService = assemblyFactory.createCompositeService(); + composite.getServices().add(compositeService); + + compositeService.setName(service.getName()); + compositeService.setPromotedComponent(component); + compositeService.setPromotedService(service); + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java new file mode 100644 index 0000000000..505578d6f1 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java @@ -0,0 +1,398 @@ +/* + * 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.contribution.jee.impl; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; + +import javax.xml.namespace.QName; + +import org.apache.tuscany.sca.assembly.AssemblyFactory; +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.ComponentReference; +import org.apache.tuscany.sca.assembly.ComponentService; +import org.apache.tuscany.sca.assembly.ComponentType; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.CompositeReference; +import org.apache.tuscany.sca.assembly.CompositeService; +import org.apache.tuscany.sca.assembly.Multiplicity; +import org.apache.tuscany.sca.assembly.Property; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.jee.EJBImplementationGenerated; +import org.apache.tuscany.sca.contribution.jee.EjbInfo; +import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo; +import org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo; +import org.apache.tuscany.sca.contribution.jee.EnvEntryInfo; +import org.apache.tuscany.sca.contribution.jee.InjectionTarget; +import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; +import org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension; +import org.apache.tuscany.sca.contribution.jee.WebImplementationGenerated; +import org.apache.tuscany.sca.contribution.jee.WebModuleInfo; +import org.apache.tuscany.sca.interfacedef.InterfaceContract; +import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; +import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; +import org.apache.tuscany.sca.policy.Intent; +import org.apache.tuscany.sca.policy.PolicyFactory; + +public class JavaEEOptionalExtensionImpl implements JavaEEOptionalExtension { + + private AssemblyFactory assemblyFactory; + private JavaInterfaceFactory javaInterfaceFactory; + private PolicyFactory policyFactory; + private Intent EJB_INTENT; + + public static final Map ALLOWED_ENV_ENTRY_TYPES; + static { + ALLOWED_ENV_ENTRY_TYPES = new HashMap(); + ALLOWED_ENV_ENTRY_TYPES.put(String.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "string", + "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Character.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "string", + "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Byte.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "byte", "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Short.class.getName(), + new QName("http://www.w3.org/2001/XMLSchema", "short", "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Integer.class.getName(), + new QName("http://www.w3.org/2001/XMLSchema", "int", "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Long.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "long", "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Boolean.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "boolean", + "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Double.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "double", + "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Float.class.getName(), + new QName("http://www.w3.org/2001/XMLSchema", "float", "xsd")); + } + + public JavaEEOptionalExtensionImpl(ModelFactoryExtensionPoint modelFactories) { + this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); + this.javaInterfaceFactory = modelFactories.getFactory(JavaInterfaceFactory.class); + this.policyFactory = modelFactories.getFactory(PolicyFactory.class); + + EJB_INTENT = policyFactory.createIntent(); + EJB_INTENT.setName(new QName("http://www.osoa.org/xmlns/sca/1.0", "ejb")); + } + + public ComponentType createImplementationWebComponentType(WebModuleInfo webModule) { + ComponentType componentType = assemblyFactory.createComponentType(); + + // Process Remote EJB References + for(Map.Entry entry : webModule.getEjbReferences().entrySet()) { + EjbReferenceInfo ejbRef = entry.getValue(); + // If the EJB reference has @Reference SCA annotation, then skip that reference + if(!hasReferenceAnnotation(ejbRef.injectionTarget)) { + continue; + } + String referenceName = entry.getKey(); + referenceName = referenceName.replace("/", "_"); + Reference reference = assemblyFactory.createComponentReference(); + reference.setName(referenceName); + InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract(); + try { + ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface)); + } catch (InvalidInterfaceException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + reference.setInterfaceContract(ic); + reference.getRequiredIntents().add(EJB_INTENT); + reference.setMultiplicity(Multiplicity.ZERO_ONE); + componentType.getReferences().add(reference); + } + + // Process env-entries to compute properties + for (Map.Entry entry : webModule.getEnvEntries().entrySet()) { + EnvEntryInfo envEntry = entry.getValue(); + String type = envEntry.type; + if (!ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) { + continue; + } + String propertyName = envEntry.name; + propertyName = propertyName.replace("/", "_"); + String value = envEntry.value; + Property property = assemblyFactory.createComponentProperty(); + property.setName(propertyName); + property.setXSDType(ALLOWED_ENV_ENTRY_TYPES.get(type)); + property.setValue(value); + componentType.getProperties().add(property); + } + + return componentType; + } + + public ComponentType createImplementationEjbComponentType(EjbModuleInfo ejbModule, String ejbName) { + ComponentType componentType = assemblyFactory.createComponentType(); + EjbInfo ejbInfo = ejbModule.getEjbInfo(ejbName); + if(ejbInfo == null) { + return null; + } + + // Process Remote EJB References + for(Map.Entry entry : ejbInfo.ejbReferences.entrySet()) { + EjbReferenceInfo ejbRef = entry.getValue(); + // If the EJB reference has @Reference SCA annotation, then skip that reference + if(!hasReferenceAnnotation(ejbRef.injectionTarget)) { + continue; + } + String referenceName = entry.getKey(); + referenceName = referenceName.replace("/", "_"); + Reference reference = assemblyFactory.createComponentReference(); + reference.setName(referenceName); + InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract(); + try { + ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface)); + } catch (InvalidInterfaceException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + reference.setInterfaceContract(ic); + reference.getRequiredIntents().add(EJB_INTENT); + reference.setMultiplicity(Multiplicity.ZERO_ONE); + componentType.getReferences().add(reference); + } + + // Process env-entries to compute properties + for (Map.Entry entry : ejbInfo.envEntries.entrySet()) { + EnvEntryInfo envEntry = entry.getValue(); + String type = envEntry.type; + if (!ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) { + continue; + } + String propertyName = envEntry.name; + propertyName = propertyName.replace("/", "_"); + String value = envEntry.value; + Property property = assemblyFactory.createComponentProperty(); + property.setName(propertyName); + property.setXSDType(ALLOWED_ENV_ENTRY_TYPES.get(type)); + property.setValue(value); + componentType.getProperties().add(property); + } + return componentType; + } + + public void createImplementationJeeComposite(WebModuleInfo webModule, Composite composite) { + + Component component = findComponent(composite, webModule); + + // Process Remote EJB References + for(Map.Entry entry : webModule.getEjbReferences().entrySet()) { + EjbReferenceInfo ejbRef = entry.getValue(); + String referenceName = entry.getKey(); + referenceName = referenceName.replace("/", "_"); + ComponentReference reference = assemblyFactory.createComponentReference(); + reference.setName(referenceName); + InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract(); + try { + ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface)); + } catch (InvalidInterfaceException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + reference.setInterfaceContract(ic); + reference.getRequiredIntents().add(EJB_INTENT); + reference.setMultiplicity(Multiplicity.ZERO_ONE); + + addComponentReference(composite, component, reference); + } + } + + public void createImplementationJeeComposite(EjbModuleInfo ejbModule, Composite composite) { + + for(Map.Entry entry : ejbModule.getEjbInfos().entrySet()) { + EjbInfo ejbInfo = entry.getValue(); + + Component component = findComponent(composite, ejbInfo, ejbModule); + + // Process Remote EJB References + for(Map.Entry entry1 : ejbInfo.ejbReferences.entrySet()) { + EjbReferenceInfo ejbRef = entry1.getValue(); + String referenceName = ejbRef.referenceName; + referenceName = referenceName.replace("/", "_"); + referenceName = ejbInfo.beanName + "_" + referenceName; + ComponentReference reference = assemblyFactory.createComponentReference(); + reference.setName(referenceName); + InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract(); + try { + ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface)); + } catch (InvalidInterfaceException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + reference.setInterfaceContract(ic); + reference.getRequiredIntents().add(EJB_INTENT); + reference.setMultiplicity(Multiplicity.ZERO_ONE); + + addComponentReference(composite, component, reference); + } + } + } + + + public void createImplementationJeeComposite(JavaEEApplicationInfo appInfo, Composite composite) { + + for(Map.Entry entry0 : appInfo.getEjbModuleInfos().entrySet()) { + EjbModuleInfo ejbModule = entry0.getValue(); + + for(Map.Entry entry : ejbModule.getEjbInfos().entrySet()) { + EjbInfo ejbInfo = entry.getValue(); + + Component component = findComponent(composite, ejbInfo, ejbModule); + + // Process Remote EJB References + for(Map.Entry entry1 : ejbInfo.ejbReferences.entrySet()) { + EjbReferenceInfo ejbRef = entry1.getValue(); + String referenceName = ejbRef.referenceName; + referenceName = referenceName.replace("/", "_"); + referenceName = ejbInfo.beanName + "_" + referenceName; + ComponentReference reference = assemblyFactory.createComponentReference(); + reference.setName(referenceName); + InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract(); + try { + ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface)); + } catch (InvalidInterfaceException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + reference.setInterfaceContract(ic); + reference.getRequiredIntents().add(EJB_INTENT); + reference.setMultiplicity(Multiplicity.ZERO_ONE); + + addComponentReference(composite, component, reference); + } + } + } + } + + /** + * We are fluffing up the JEEImplemention composite to represent the components + * in the JEE archive. Given the JEEimplemenation composite find a named component + * it if already exists or create it if it doesn't. + * + * @param composite + * @param ejbInfo + * @return + */ + private Component findComponent(Composite composite, EjbInfo ejbInfo, EjbModuleInfo ejbmoduleInfo){ + String componentName = ejbInfo.beanName; + Component component = null; + + for (Component tmpComponent : composite.getComponents()){ + if (tmpComponent.getName().equals(componentName)){ + component = tmpComponent; + break; + } + } + + if (component == null){ + component = assemblyFactory.createComponent(); + component.setName(componentName); + component.setUnresolved(true); + composite.getComponents().add(component); + + EJBImplementationGenerated implementation = new EJBImplementationGeneratedImpl(); + implementation.setUnresolved(true); + implementation.setEJBInfo(ejbInfo); + implementation.setEjbModuleInfo(ejbmoduleInfo); + component.setImplementation(implementation); + } + + return component; + } + + /** + * We are fluffing up the JEEImplemention composite to represent the components + * in the JEE archive. Given the JEEimplemenation composite find a named component + * it if already exists or create it if it doesn't. + * + * @param composite + * @param ejbInfo + * @return + */ + private Component findComponent(Composite composite, WebModuleInfo webInfo){ + String componentName = webInfo.getModuleName(); + Component component = null; + + for (Component tmpComponent : composite.getComponents()){ + if (tmpComponent.getName().equals(componentName)){ + component = tmpComponent; + break; + } + } + + if (component == null){ + component = assemblyFactory.createComponent(); + component.setName(componentName); + component.setUnresolved(true); + composite.getComponents().add(component); + + WebImplementationGenerated implementation = new WebImplementationGeneratedImpl(); + implementation.setUnresolved(true); + // need generated impl to represent web modules + implementation.setWebInfo(webInfo); + component.setImplementation(implementation); + } + + return component; + } + + /** + * Add a component reference and fluff up a composite reference to match + * + * @param composite + * @param component + * @param service + */ + private void addComponentReference(Composite composite, Component component, ComponentReference reference){ + component.getImplementation().getReferences().add(reference); + + CompositeReference compositeReference = assemblyFactory.createCompositeReference(); + composite.getReferences().add(compositeReference); + + compositeReference.setName(reference.getName()); + compositeReference.getPromotedReferences().add(reference); + } + + private boolean hasReferenceAnnotation(InjectionTarget injectionTarget) { + if(injectionTarget.targetClass == null || injectionTarget.targetClass.equals("")) { + return false; + } + try { + Class clazz = Class.forName(injectionTarget.targetClass); + try { + Method method = clazz.getDeclaredMethod("set"+injectionTarget.targetName); + if(method.isAnnotationPresent(javax.ejb.EJB.class)) { + return method.isAnnotationPresent(org.osoa.sca.annotations.Reference.class); + } else { + // The method does not have @EJB annotation. So, the method is not good for us. + throw new NoSuchMethodException("set"+injectionTarget.targetName); + } + } catch(NoSuchMethodException nsme) { + try { + Field field = clazz.getDeclaredField(injectionTarget.targetName); + return field.isAnnotationPresent(org.osoa.sca.annotations.Reference.class); + } catch(NoSuchFieldException nsfe) { + return false; + } + } + } catch(ClassNotFoundException cnfe) { + return false; + } + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/ModelObjectImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/ModelObjectImpl.java new file mode 100644 index 0000000000..95050dfd88 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/ModelObjectImpl.java @@ -0,0 +1,51 @@ +/* + * 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.contribution.jee.impl; + +import java.net.URI; + +import org.apache.tuscany.sca.contribution.jee.ModelObject; + +/** + * @version $Rev$ $Date$ + */ +public class ModelObjectImpl implements ModelObject { + + private URI uri; + private Object obj; + + public ModelObjectImpl() { + } + + public Object getObject() { + return obj; + } + + public void setObject(Object obj) { + this.obj = obj; + } + + public URI getUri() { + return uri; + } + + public void setUri(URI uri) { + this.uri = uri; + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java new file mode 100644 index 0000000000..17974e831f --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java @@ -0,0 +1,36 @@ +/* + * 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.contribution.jee.impl; + +import org.apache.tuscany.sca.contribution.PackageType; +import org.apache.tuscany.sca.contribution.processor.PackageProcessor; +import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor; + +/** + * War Contribution package processor. + * + * @version $Rev$ $Date$ + */ +public class WarContributionProcessor extends JarContributionProcessor implements PackageProcessor { + @Override + public String getPackageType() { + return PackageType.WAR; + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java new file mode 100644 index 0000000000..9e9bfb8bc1 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java @@ -0,0 +1,59 @@ +/* + * 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.contribution.jee.impl; + +import java.io.File; +import java.net.URI; +import java.net.URL; + +import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; +import org.apache.tuscany.sca.contribution.jee.WebModuleInfo; +import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; +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.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.monitor.Monitor; + +public class WebArchiveProcessor implements URLArtifactProcessor { + private JavaEEIntrospector jeeIntrospector; + + public WebArchiveProcessor(ExtensionPointRegistry registry, Monitor monitor) { + jeeIntrospector = registry.getExtensionPoint(JavaEEIntrospector.class); + } + + public String getArtifactType() { + return ".war"; + } + + public WebModuleInfo read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException { + WebModuleInfo webModuleInfo = jeeIntrospector.introspectWebArchive(artifactURL); + webModuleInfo.setUri(artifactURI); + webModuleInfo.setModuleName(new File(artifactURL.getFile()).getName()); + return webModuleInfo; + } + + public Class getModelType() { + return WebModuleInfo.class; + } + + public void resolve(WebModuleInfo arg0, ModelResolver arg1) + throws ContributionResolveException { + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedImpl.java new file mode 100644 index 0000000000..d898bd4ea0 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedImpl.java @@ -0,0 +1,60 @@ +/* + * 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.contribution.jee.impl; + +import org.apache.tuscany.sca.assembly.ConstrainingType; +import org.apache.tuscany.sca.assembly.impl.ImplementationImpl; +import org.apache.tuscany.sca.contribution.jee.WebImplementationGenerated; +import org.apache.tuscany.sca.contribution.jee.WebModuleInfo; + + +/** + * The model representing a WEB implementation in an SCA assembly model when the + * WEB implementation has been generated by introspecting a non-enhanced EAR + */ +class WebImplementationGeneratedImpl extends ImplementationImpl implements WebImplementationGenerated { + + private WebModuleInfo webInfo; + + /** + * Constructs a new EJB implementation. + */ + WebImplementationGeneratedImpl() { + super(); + } + + @Override + public ConstrainingType getConstrainingType() { + // The Web implementation does not support constrainingTypes + return null; + } + + @Override + public void setConstrainingType(ConstrainingType constrainingType) { + // The Web implementation does not support constrainingTypes + } + + public WebModuleInfo getWebInfo() { + return webInfo; + } + + public void setWebInfo(WebModuleInfo webInfo) { + this.webInfo = webInfo; + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedProcessor.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedProcessor.java new file mode 100644 index 0000000000..4e50b15960 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebImplementationGeneratedProcessor.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.contribution.jee.impl; + +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.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.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.monitor.Monitor; + + +/** + * Dummy processor that's used to mark WebImplementationGeneratedImpl instance + * as resolved at the appropriate point in the resolution processing + * + */ +public class WebImplementationGeneratedProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor { + + public WebImplementationGeneratedProcessor(ExtensionPointRegistry registry, + Monitor monitor) { + } + + public QName getArtifactType() { + return null; + } + + public Class getModelType() { + // Returns the type of model processed by this processor + return WebImplementationGeneratedImpl.class; + } + + public WebImplementationGeneratedImpl read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException { + return null; + } + + public void resolve(WebImplementationGeneratedImpl implementation, ModelResolver resolver) throws ContributionResolveException { + implementation.setUnresolved(false); + } + + public void write(WebImplementationGeneratedImpl implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException { + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java new file mode 100644 index 0000000000..ceca698356 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java @@ -0,0 +1,109 @@ +/* + * 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.contribution.jee.impl; + +import java.net.URI; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +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; + +public class WebModuleInfoImpl implements WebModuleInfo { + + private URI uri; + private String moduleName; + private ClassLoader moduleClassLoader; + + private Collection> servletClasses = new ArrayList>(); + private Collection> listenerClasses = new ArrayList>(); + private Collection> filterClasses = new ArrayList>(); + private Collection> jsfClasses = new ArrayList>(); + + private Collection jspReferenceTags = new ArrayList(); + + private Map ejbReferences = new HashMap(); + private Map envEntries = new HashMap(); + + public WebModuleInfoImpl() { + } + public Collection> getServletClasses() { + return servletClasses; + } + + public Collection> getListenerClasses() { + return listenerClasses; + } + + public Collection> getFilterClasses() { + return filterClasses; + } + + public Collection> getJSFClasses() { + return jsfClasses; + } + + public Collection getJspReferenceTags() { + return jspReferenceTags; + } + + public EjbReferenceInfo getEjbReference(String ejbRefName) { + return ejbReferences.get(ejbRefName); + } + + public Map getEjbReferences() { + return ejbReferences; + } + + public Map getEnvEntries() { + return envEntries; + } + + public EnvEntryInfo getEnvEntry(String envEntryName) { + return envEntries.get(envEntryName); + } + + public String getModuleName() { + return moduleName; + } + + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + } + + public URI getUri() { + return uri; + } + + public void setUri(URI uri) { + this.uri = uri; + } + + public ClassLoader getModuleClassloader() { + return moduleClassLoader; + } + + public void setmoduleClassloader(ClassLoader classLoader) { + this.moduleClassLoader = classLoader; + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEExtension b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEExtension new file mode 100644 index 0000000000..c79600bca6 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEExtension @@ -0,0 +1,18 @@ +# 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. + +org.apache.tuscany.sca.contribution.jee.impl.JavaEEExtensionImpl \ No newline at end of file diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension new file mode 100644 index 0000000000..5ce036e6b0 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension @@ -0,0 +1,18 @@ +# 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. + +org.apache.tuscany.sca.contribution.jee.impl.JavaEEOptionalExtensionImpl \ No newline at end of file diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor new file mode 100644 index 0000000000..88c69658f6 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor @@ -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. + +org.apache.tuscany.sca.contribution.jee.impl.EarContributionProcessor;type=application/ear +org.apache.tuscany.sca.contribution.jee.impl.WarContributionProcessor;type=application/war diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor new file mode 100644 index 0000000000..b0bb63225a --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor @@ -0,0 +1,22 @@ +# 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. + +# $Rev: 685124 $ $Date: 2008-08-12 12:46:19 +0100 (Tue, 12 Aug 2008) $ + +# Implementation class for the artifact processor extension +org.apache.tuscany.sca.contribution.jee.impl.EJBImplementationGeneratedProcessor;qname=http://dummy_namespace/#dummy.name,model=org.apache.tuscany.sca.contribution.jee.impl.EJBImplementationGeneratedImpl,factory=dummy +org.apache.tuscany.sca.contribution.jee.impl.WebImplementationGeneratedProcessor;qname=http://dummy_namespace/#dummy.name,model=org.apache.tuscany.sca.contribution.jee.impl.WebImplementationGeneratedImpl,factory=dummy diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor new file mode 100644 index 0000000000..71575b5ddd --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor @@ -0,0 +1,21 @@ +# 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.contribution.jee.impl.WebArchiveProcessor;type=.war,model=org.apache.tuscany.sca.contribution.jee.WebModuleInfo +org.apache.tuscany.sca.contribution.jee.impl.EjbArchiveProcessor;type=.jar,model=org.apache.tuscany.sca.contribution.jee.EjbModuleInfo +org.apache.tuscany.sca.contribution.jee.impl.JavaEEArchiveProcessor;type=.ear,model=org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo \ No newline at end of file diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver new file mode 100644 index 0000000000..90ff87e0b1 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver @@ -0,0 +1,21 @@ +# 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. + +org.apache.tuscany.sca.contribution.jee.WebModuleModelResolver;model=org.apache.tuscany.sca.contribution.jee.WebModuleInfo +org.apache.tuscany.sca.contribution.jee.EjbModuleModelResolver;model=org.apache.tuscany.sca.contribution.jee.EjbModuleInfo +org.apache.tuscany.sca.contribution.jee.JavaEEApplicationModelResolver;model=org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo +org.apache.tuscany.sca.contribution.jee.ModelObjectModelResolver;model=org.apache.tuscany.sca.contribution.jee.ModelObject diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java new file mode 100644 index 0000000000..9495df70b7 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java @@ -0,0 +1,57 @@ +/* + * 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.contribution.jee; + +import java.io.InputStream; +import java.net.URI; +import java.net.URL; +import java.util.List; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.contribution.jee.impl.EarContributionProcessor; +import org.apache.tuscany.sca.contribution.service.util.IOHelper; +import org.junit.Test; + +/** + * Ear Contribution package processor test case. + * Verifies proper handling of EAR contributions. + * + * @version $Rev$ $Date$ + */ +public class EarContributionProcessorTestCase { + private static final String EAR_CONTRIBUTION = "/ejb-injection-sample.ear"; + + @Test + public void testProcessPackageArtifacts() throws Exception { + EarContributionProcessor earProcessor = new EarContributionProcessor(); + + URL earURL = getClass().getResource(EAR_CONTRIBUTION); + InputStream earStream = earURL.openStream(); + List artifacts = null; + try { + artifacts = earProcessor.getArtifacts(earURL, earStream); + } finally { + IOHelper.closeQuietly(earStream); + } + + Assert.assertNotNull(artifacts); + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java new file mode 100644 index 0000000000..e315c417b9 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java @@ -0,0 +1,57 @@ +/* + * 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.contribution.jee; + +import java.io.InputStream; +import java.net.URI; +import java.net.URL; +import java.util.List; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.contribution.jee.impl.WarContributionProcessor; +import org.apache.tuscany.sca.contribution.service.util.IOHelper; +import org.junit.Test; + +/** + * War Contribution package processor test case. + * Verifies proper handling of WAR contributions. + * + * @version $Rev$ $Date$ + */ +public class WarContributionProcessorTestCase { + private static final String WAR_CONTRIBUTION = "/sample-web-app.war"; + + @Test + public void testProcessPackageArtifacts() throws Exception { + WarContributionProcessor warProcessor = new WarContributionProcessor(); + + URL warURL = getClass().getResource(WAR_CONTRIBUTION); + InputStream warStream = warURL.openStream(); + List artifacts = null; + try { + artifacts = warProcessor.getArtifacts(warURL, warStream); + } finally { + IOHelper.closeQuietly(warStream); + } + + Assert.assertNotNull(artifacts); + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear new file mode 100644 index 0000000000..3efdd206c7 Binary files /dev/null and b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear differ diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar new file mode 100644 index 0000000000..4b9e3b79f4 Binary files /dev/null and b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar differ diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/resources/sample-web-app.war b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/resources/sample-web-app.war new file mode 100644 index 0000000000..681b203fab Binary files /dev/null and b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/src/test/resources/sample-web-app.war differ -- cgit v1.2.3