summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.4/modules/contribution-jee
diff options
context:
space:
mode:
authorramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68>2008-12-02 11:17:24 +0000
committerramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68>2008-12-02 11:17:24 +0000
commiteed639ccf7fd95e0b31caf61787126e69592f207 (patch)
tree401cafc53175c67ac1aea5398986400b416bcde3 /branches/sca-java-1.4/modules/contribution-jee
parente2af7d8b2dc498e63375fec8d97186dc261a428f (diff)
Branch for 1.4
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@722428 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.4/modules/contribution-jee')
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/LICENSE205
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/NOTICE6
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/pom.xml124
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java163
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java406
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java96
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java63
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java172
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java140
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java36
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor19
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java72
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java57
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessorTestCase.java84
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java57
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java69
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.earbin0 -> 19015 bytes
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.jarbin0 -> 11042 bytes
-rw-r--r--branches/sca-java-1.4/modules/contribution-jee/src/test/resources/sample-web-app.warbin0 -> 12454 bytes
19 files changed, 1769 insertions, 0 deletions
diff --git a/branches/sca-java-1.4/modules/contribution-jee/LICENSE b/branches/sca-java-1.4/modules/contribution-jee/LICENSE
new file mode 100644
index 0000000000..6e529a25c4
--- /dev/null
+++ b/branches/sca-java-1.4/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/branches/sca-java-1.4/modules/contribution-jee/NOTICE b/branches/sca-java-1.4/modules/contribution-jee/NOTICE
new file mode 100644
index 0000000000..1325efd8bf
--- /dev/null
+++ b/branches/sca-java-1.4/modules/contribution-jee/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/branches/sca-java-1.4/modules/contribution-jee/pom.xml b/branches/sca-java-1.4/modules/contribution-jee/pom.xml
new file mode 100644
index 0000000000..f89e41edcf
--- /dev/null
+++ b/branches/sca-java-1.4/modules/contribution-jee/pom.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-modules</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>tuscany-contribution-jee</artifactId>
+ <name>Apache Tuscany SCA Java EE</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution-impl</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-spi</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-java</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-java-xml</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-ejb</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <!--scope>runtime</scope-->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-web</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <!--scope>runtime</scope-->
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-jee</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-jee</artifactId>
+ <version>3.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.1</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+
+ <configuration>
+ <instructions>
+ <Bundle-Version>${tuscany.version}</Bundle-Version>
+ <Bundle-SymbolicName>org.apache.tuscany.sca.contribution.jee</Bundle-SymbolicName>
+ <Bundle-Description>${pom.name}</Bundle-Description>
+ <Export-Package>org.apache.tuscany.sca.contribution.jee*</Export-Package>
+ <DynamicImport-Package>org.apache.tuscany.sca.contribution.osgi.impl</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java b/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java
new file mode 100644
index 0000000000..547ba52e74
--- /dev/null
+++ b/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java
@@ -0,0 +1,163 @@
+/*
+ * 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.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.ComponentProperty;
+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.DefaultAssemblyFactory;
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
+import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.PolicyFactory;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class AssemblyHelper {
+ private AssemblyFactory af;
+ private JavaInterfaceFactory jif;
+
+ public static final Map<String, QName> ALLOWED_ENV_ENTRY_TYPES;
+ public static final Intent CONVERSATIONAL_INTENT;
+ public static final Intent EJB_INTENT;
+ static {
+ ALLOWED_ENV_ENTRY_TYPES = new HashMap<String, QName>();
+ 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"));
+ }
+
+ static {
+ PolicyFactory dpf = new DefaultPolicyFactory();
+ CONVERSATIONAL_INTENT = dpf.createIntent();
+ CONVERSATIONAL_INTENT.setName(new QName("http://www.osoa.org/xmlns/sca/1.0", "conversational"));
+
+ EJB_INTENT = dpf.createIntent();
+ EJB_INTENT.setName(new QName("http://www.osoa.org/xmlns/sca/1.0", "ejb"));
+ }
+
+ public AssemblyHelper() {
+ super();
+ af = new DefaultAssemblyFactory();
+ jif = new DefaultJavaInterfaceFactory();
+ }
+
+ public AssemblyHelper(AssemblyFactory af, JavaInterfaceFactory jif) {
+ super();
+ this.af = af;
+ this.jif = jif;
+ }
+
+ public JavaInterfaceContract createInterfaceContract(Class<?> clazz) throws InvalidInterfaceException {
+ JavaInterface ji = jif.createJavaInterface(clazz);
+ JavaInterfaceContract jic = jif.createJavaInterfaceContract();
+ jic.setInterface(ji);
+
+ return jic;
+ }
+
+ public ComponentService createComponentService() {
+ return af.createComponentService();
+ }
+
+ public ComponentReference createComponentReference() {
+ return af.createComponentReference();
+ }
+
+ public ComponentProperty createComponentProperty() {
+ return af.createComponentProperty();
+ }
+
+ public ComponentType createComponentType() {
+ return af.createComponentType();
+ }
+
+ public Component createComponentFromComponentType(ComponentType componentType, String componentName) {
+ Component component = af.createComponent();
+ component.setName(componentName);
+
+ for (Service service : componentType.getServices()) {
+ ComponentService compService = af.createComponentService();
+ compService.setService(service);
+ component.getServices().add(compService);
+ }
+
+ for (Reference reference : componentType.getReferences()) {
+ ComponentReference compReference = af.createComponentReference();
+ compReference.setReference(reference);
+ component.getReferences().add(compReference);
+ }
+
+ for (Property property : componentType.getProperties()) {
+ ComponentProperty compProperty = af.createComponentProperty();
+ compProperty.setProperty(property);
+ component.getProperties().add(compProperty);
+ }
+ return component;
+ }
+
+ public Composite createComposite() {
+ return af.createComposite();
+ }
+
+ public Component createComponent() {
+ return af.createComponent();
+ }
+
+ public CompositeReference createCompositeReference() {
+ return af.createCompositeReference();
+ }
+
+ public CompositeService createCompositeService() {
+ return af.createCompositeService();
+ }
+}
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java b/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
new file mode 100644
index 0000000000..37ae53a38a
--- /dev/null
+++ b/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
@@ -0,0 +1,406 @@
+/*
+ * 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.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.EjbRef;
+import org.apache.openejb.jee.EjbRefType;
+import org.apache.openejb.jee.EjbReference;
+import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.openejb.jee.EnvEntry;
+import org.apache.openejb.jee.MessageDrivenBean;
+import org.apache.openejb.jee.SessionBean;
+import org.apache.openejb.jee.SessionType;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.ComponentProperty;
+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.Property;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.contribution.DefaultModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.service.ContributionException;
+import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
+import org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class EJBModuleProcessor {
+ private EjbModule ejbModule;
+ private AssemblyHelper helper;
+ private Map<String, List<String>> intfToBean = new HashMap<String, List<String>>();
+ private List<String> statefulBeans = new ArrayList<String>();
+
+ public EJBModuleProcessor(EjbModule ejbModule, AssemblyHelper helper) {
+ super();
+ this.ejbModule = ejbModule;
+ this.helper = helper;
+ }
+
+ public EJBModuleProcessor(EjbModule ejbModule) {
+ this.ejbModule = ejbModule;
+ this.helper = new AssemblyHelper();
+ }
+
+ public Map<String, ComponentType> getEjbComponentTypes() throws ContributionException {
+ intfToBean.clear();
+ statefulBeans.clear();
+ Map<String, ComponentType> ejbComponentTypes = new HashMap<String, ComponentType>();
+
+ EjbJar ejbJar = ejbModule.getEjbJar();
+ if (!ejbJar.getVersion().startsWith("3")) {
+ // Not an EJB3 module
+ // TODO: should throw an exception
+ }
+
+ Map<String, EnterpriseBean> beansMap = ejbJar.getEnterpriseBeansByEjbName();
+ for (Map.Entry<String, EnterpriseBean> entry : beansMap.entrySet()) {
+ EnterpriseBean bean = entry.getValue();
+ ComponentType ct = null;
+ if (bean instanceof SessionBean) {
+ SessionBean sbean = (SessionBean)bean;
+ ct = getEjbComponentType(sbean, ejbModule.getClassLoader());
+ } else if (bean instanceof MessageDrivenBean) {
+ MessageDrivenBean mdbean = (MessageDrivenBean)bean;
+ ct = getEjbComponentType(mdbean, ejbModule.getClassLoader());
+ } else {
+ continue;
+ }
+ if (ct != null) {
+ // Bean is an EJB3 bean
+ ejbComponentTypes.put(bean.getEjbName(), ct);
+ }
+ }
+
+ // Adjust the references to STATEFUL beans
+ for (Map.Entry<String, ComponentType> entry : ejbComponentTypes.entrySet()) {
+ ComponentType ct = entry.getValue();
+ for (Reference reference : ct.getReferences()) {
+ String intf = ((JavaInterface)reference.getInterfaceContract().getInterface()).getName();
+ for (String bean : intfToBean.get(intf)) {
+ if (statefulBeans.contains(bean)) {
+ reference.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
+ break;
+ }
+ }
+ }
+ }
+
+ return ejbComponentTypes;
+ }
+
+ public ComponentType getEjbAppComponentType() throws ContributionException {
+ ComponentType componentType = helper.createComponentType();
+
+ Map<String, ComponentType> ejbComponentTypes = getEjbComponentTypes();
+
+ for (Map.Entry<String, ComponentType> entry : ejbComponentTypes.entrySet()) {
+ String beanName = entry.getKey();
+ ComponentType ejbComponentType = entry.getValue();
+
+ for (Service service : ejbComponentType.getServices()) {
+ Service service2 = helper.createComponentService();
+ service2.setName(beanName + "_" + service.getName());
+ service2.setInterfaceContract(service.getInterfaceContract());
+ service2.getRequiredIntents().addAll(service.getRequiredIntents());
+
+ componentType.getServices().add(service2);
+ }
+
+ for (Reference reference : ejbComponentType.getReferences()) {
+ Reference reference2 = helper.createComponentReference();
+ reference2.setName(beanName + "_" + reference.getName());
+ reference2.setInterfaceContract(reference.getInterfaceContract());
+ reference2.getRequiredIntents().addAll(reference.getRequiredIntents());
+
+ componentType.getReferences().add(reference2);
+ }
+ }
+
+ return componentType;
+ }
+
+ public Composite getEjbAppComposite() throws ContributionException {
+ Composite composite = helper.createComposite();
+
+ Map<String, ComponentType> ejbComponentTypes = getEjbComponentTypes();
+
+ ModelFactoryExtensionPoint mfep = new DefaultModelFactoryExtensionPoint();
+ EJBImplementationFactory eif = mfep.getFactory(EJBImplementationFactory.class);
+
+ for (Map.Entry<String, ComponentType> entry : ejbComponentTypes.entrySet()) {
+ String ejbName = entry.getKey();
+ ComponentType componentType = entry.getValue();
+
+ EJBImplementation impl = eif.createEJBImplementation();
+ impl.setEJBLink(ejbModule.getModuleId() + "#" + ejbName);
+ // Create component
+ Component component = helper.createComponent();
+ String componentName = ejbName;
+ component.setName(componentName);
+ component.setImplementation(impl);
+
+ // Add services
+ for (Service service : componentType.getServices()) {
+ ComponentService componentService = helper.createComponentService();
+ componentService.setService(service);
+ componentService.setInterfaceContract(service.getInterfaceContract());
+ component.getServices().add(componentService);
+ }
+
+ // Add references
+ for (Reference reference : componentType.getReferences()) {
+ ComponentReference componentReference = helper.createComponentReference();
+ componentReference.setReference(reference);
+ componentReference.setInterfaceContract(reference.getInterfaceContract());
+ componentReference.getRequiredIntents().addAll(reference.getRequiredIntents());
+ component.getReferences().add(componentReference);
+ }
+
+ // Add properties
+ for (Property property : componentType.getProperties()) {
+ ComponentProperty componentProperty = helper.createComponentProperty();
+ componentProperty.setProperty(property);
+ component.getProperties().add(componentProperty);
+ }
+
+ // Add component
+ composite.getComponents().add(component);
+
+ // Add composite services
+ for (ComponentService service : component.getServices()) {
+ CompositeService compositeService = helper.createCompositeService();
+ compositeService.setInterfaceContract(service.getInterfaceContract());
+ compositeService.setPromotedComponent(component);
+ compositeService.setPromotedService(service);
+ composite.getServices().add(compositeService);
+ }
+
+ // Add composite references
+ for (ComponentReference reference : component.getReferences()) {
+ CompositeReference compositeReference = helper.createCompositeReference();
+ compositeReference.setInterfaceContract(reference.getInterfaceContract());
+ compositeReference.getRequiredIntents().addAll(reference.getRequiredIntents());
+ compositeReference.getPromotedReferences().add(reference);
+ composite.getReferences().add(compositeReference);
+ }
+ }
+ return composite;
+ }
+
+ private ComponentType getEjbComponentType(SessionBean bean, ClassLoader cl) throws ContributionException {
+ if(bean.getBusinessRemote().size() == 0 && bean.getBusinessLocal().size() == 0) {
+ // Not an EJB3 Session bean
+ return null;
+ }
+ ComponentType componentType = helper.createComponentType();
+
+ boolean conversational = bean.getSessionType().equals(SessionType.STATEFUL);
+ if (conversational) {
+ statefulBeans.add(bean.getEjbName());
+ }
+
+ // Process Remote Business interfaces of the SessionBean
+ for (String intfName : bean.getBusinessRemote()) {
+ // This code is added to take care of EJB references to STATEFUL beans that are injected
+ // without a beanname in @EJB annotation
+ List<String> beansList = intfToBean.get(intfName);
+ if (beansList == null) {
+ beansList = new ArrayList<String>();
+ intfToBean.put(intfName, beansList);
+ }
+ beansList.add(bean.getEjbName());
+
+ String serviceName =
+ intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
+ Service service = helper.createComponentService();
+ service.setName(serviceName);
+ InterfaceContract ic = null;
+ try {
+ Class<?> clazz = cl.loadClass(intfName);
+ ic = helper.createInterfaceContract(clazz);
+ ic.getInterface().setConversational(conversational);
+ ic.getInterface().setRemotable(true);
+ } catch (Exception e) {
+ throw new ContributionException(e);
+ }
+ service.setInterfaceContract(ic);
+ if (conversational) {
+ service.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
+ }
+ componentType.getServices().add(service);
+ }
+
+ // Process Local Business interfaces of the SessionBean
+ for (String intfName : bean.getBusinessLocal()) {
+ String serviceName =
+ intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
+ Service service = helper.createComponentService();
+ service.setName(serviceName);
+ InterfaceContract ic = null;
+ try {
+ Class<?> clazz = cl.loadClass(intfName);
+ ic = helper.createInterfaceContract(clazz);
+ ic.getInterface().setConversational(conversational);
+ } catch (Exception e) {
+ throw new ContributionException(e);
+ }
+ service.setInterfaceContract(ic);
+ if (conversational) {
+ service.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
+ }
+ componentType.getServices().add(service);
+ }
+
+ // Process Remote EJB References
+ for (Map.Entry<String, EjbRef> entry : bean.getEjbRefMap().entrySet()) {
+ EjbRef ejbRef = entry.getValue();
+ if(ejbRef.getHome() != null) {
+ // References to only EJB3 beans need to be considered.
+ // Skip the current on as it is not a reference to an EJB3 bean.
+ continue;
+ }
+ if (ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) {
+ // Only Remote EJB references need to be considered.
+ // Skip the current one as it is not a remote reference.
+ continue;
+ }
+ //FIXME: ejbRef.getEjbRefType() is null sometimes. Need a different way to figure the type.
+ if(ejbRef.getEjbRefType() != null && ejbRef.getEjbRefType().compareTo(EjbRefType.SESSION) != 0) {
+ // Only references to Session beans need to be considered.
+ // Skip the current one as it is not a Session bean.
+ continue;
+ }
+ String referenceName = entry.getKey();
+ referenceName = referenceName.replace("/", "_");
+ Reference reference = helper.createComponentReference();
+ reference.setName(referenceName);
+ InterfaceContract ic = null;
+ try {
+ Class<?> clazz = cl.loadClass(ejbRef.getInterface());
+ ic = helper.createInterfaceContract(clazz);
+ } catch (Exception e) {
+ throw new ContributionException(e);
+ }
+ reference.setInterfaceContract(ic);
+ reference.getRequiredIntents().add(AssemblyHelper.EJB_INTENT);
+ componentType.getReferences().add(reference);
+ }
+
+ // Process env-entries to compute properties
+ for (Map.Entry<String, EnvEntry> entry : bean.getEnvEntryMap().entrySet()) {
+ EnvEntry envEntry = entry.getValue();
+ String type = envEntry.getEnvEntryType();
+ if (!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
+ continue;
+ }
+ String propertyName = entry.getKey();
+ propertyName = propertyName.replace("/", "_");
+ String value = envEntry.getEnvEntryValue();
+ Property property = helper.createComponentProperty();
+ property.setName(propertyName);
+ property.setXSDType(AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.get(type));
+ property.setValue(value);
+ componentType.getProperties().add(property);
+ }
+
+ return componentType;
+ }
+
+ private ComponentType getEjbComponentType(MessageDrivenBean bean, ClassLoader cl) throws ContributionException {
+ try {
+ if(javax.ejb.MessageDrivenBean.class.isAssignableFrom(cl.loadClass(bean.getEjbClass()))) {
+ // Not an EJB3 bean
+ return null;
+ }
+ } catch (ClassNotFoundException ignored) {
+ // Should not happen
+ }
+ ComponentType componentType = helper.createComponentType();
+
+ // Process Remote EJB References
+ for (Map.Entry<String, EjbRef> entry : bean.getEjbRefMap().entrySet()) {
+ EjbRef ejbRef = entry.getValue();
+ if(ejbRef.getHome() != null) {
+ // References to only EJB3 beans need to be considered.
+ // Skip the current on as it is not a reference to an EJB3 bean.
+ continue;
+ }
+ if (ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) {
+ // Only Remote EJB references need to be considered.
+ // Skip the current one as it is not a remote reference.
+ continue;
+ }
+ //FIXME: ejbRef.getEjbRefType() is null sometimes. Need a different way to figure the type.
+ if(ejbRef.getEjbRefType() != null && ejbRef.getEjbRefType().compareTo(EjbRefType.SESSION) != 0) {
+ // Only references to Session beans need to be considered.
+ // Skip the current one as it is not a Session bean.
+ continue;
+ }
+ String referenceName = entry.getKey();
+ referenceName = referenceName.replace("/", "_");
+ Reference reference = helper.createComponentReference();
+ reference.setName(referenceName);
+ InterfaceContract ic = null;
+ try {
+ Class<?> clazz = cl.loadClass(ejbRef.getInterface());
+ ic = helper.createInterfaceContract(clazz);
+ } catch (Exception e) {
+ throw new ContributionException(e);
+ }
+ reference.setInterfaceContract(ic);
+ reference.getRequiredIntents().add(AssemblyHelper.EJB_INTENT);
+ componentType.getReferences().add(reference);
+ }
+
+ // Process env-entries to compute properties
+ for (Map.Entry<String, EnvEntry> entry : bean.getEnvEntryMap().entrySet()) {
+ EnvEntry envEntry = entry.getValue();
+ String type = envEntry.getEnvEntryType();
+ if (!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
+ continue;
+ }
+ String propertyName = entry.getKey();
+ propertyName = propertyName.replace("/", "_");
+ String value = envEntry.getEnvEntryValue();
+ Property property = helper.createComponentProperty();
+ property.setName(propertyName);
+ property.setXSDType(AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.get(type));
+ property.setValue(value);
+ componentType.getProperties().add(property);
+ }
+
+ return componentType;
+ }
+}
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java b/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java
new file mode 100644
index 0000000000..2ecabb9a23
--- /dev/null
+++ b/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java
@@ -0,0 +1,96 @@
+/*
+ * 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.Map;
+
+import org.apache.openejb.config.AppModule;
+import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.contribution.service.ContributionException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JavaEEApplicationProcessor {
+ private AppModule appModule;
+ private ComponentType componentType;
+ private AssemblyHelper helper;
+
+ public JavaEEApplicationProcessor(AppModule appModule, AssemblyHelper helper) {
+ super();
+ this.appModule = appModule;
+ this.helper = helper;
+ }
+
+ public JavaEEApplicationProcessor(AppModule module) {
+ appModule = module;
+ helper = new AssemblyHelper();
+ }
+
+ public ComponentType getJavaEEAppComponentType() throws ContributionException {
+ if (componentType != null) {
+ return componentType;
+ }
+ componentType = helper.createComponentType();
+
+ // Process all EJB modules
+ for(EjbModule ejbModule : appModule.getEjbModules()) {
+ EJBModuleProcessor emp = new EJBModuleProcessor(ejbModule, helper);
+ Map<String, ComponentType> ejbComponentTypes = emp.getEjbComponentTypes();
+ for(Map.Entry<String, ComponentType> entry : ejbComponentTypes.entrySet()) {
+ String beanName = entry.getKey();
+ ComponentType ct = entry.getValue();
+ EnterpriseBean bean = ejbModule.getEjbJar().getEnterpriseBeansByEjbName().get(beanName);
+ String mappedName = bean.getMappedName() != null ? bean.getMappedName() : beanName;
+
+ String mappedName2 = mappedName.replace("/", "_");
+ // Add all services from the bean
+ for(Service service : ct.getServices()) {
+ Service service2 = helper.createComponentService();
+ String serviceName = mappedName2 + "_"+service.getName();
+ service2.setName(serviceName);
+ service2.setInterfaceContract(service.getInterfaceContract());
+ componentType.getServices().add(service2);
+ }
+
+ String beanName2 = beanName.replace("/", "_");
+ // Add all references
+ for(Reference reference : ct.getReferences()) {
+ Reference reference2 = helper.createComponentReference();
+ String referenceName = beanName2+"_"+reference.getName();
+ reference2.setName(referenceName);
+ reference2.setInterfaceContract(reference.getInterfaceContract());
+ reference2.getRequiredIntents().addAll(reference.getRequiredIntents());
+ componentType.getReferences().add(reference2);
+ }
+ }
+ emp.getEjbAppComponentType();
+ }
+
+ // Process web modules (?)
+ // FIXME: SCA JEE Spec 1.0 - Sec 7.1.3 says nothing about web modules
+
+ return componentType;
+ }
+}
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java b/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java
new file mode 100644
index 0000000000..1187d1ed00
--- /dev/null
+++ b/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java
@@ -0,0 +1,63 @@
+/*
+ * 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.File;
+
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.config.AnnotationDeployer;
+import org.apache.openejb.config.AppModule;
+import org.apache.openejb.config.DeploymentLoader;
+import org.apache.openejb.config.ReadDescriptors;
+import org.apache.tuscany.sca.contribution.service.ContributionException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JavaEEModuleHelper {
+
+ public AppModule getMetadataCompleteModules(String jarFilePath) throws ContributionException {
+ DeploymentLoader loader = new DeploymentLoader();
+ AppModule appModule = null;
+ try {
+ appModule = loader.load(new File(jarFilePath));
+ } catch (OpenEJBException e) {
+ throw new ContributionException(e);
+ }
+
+ // Process deployment descriptor files
+ ReadDescriptors readDescriptors = new ReadDescriptors();
+ try {
+ readDescriptors.deploy(appModule);
+ } catch (OpenEJBException e) {
+ throw new ContributionException(e);
+ }
+
+ // Process annotations
+ AnnotationDeployer annDeployer = new AnnotationDeployer();
+ try {
+ annDeployer.deploy(appModule);
+ } catch (OpenEJBException e) {
+ throw new ContributionException(e);
+ }
+
+ return appModule;
+ }
+}
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java b/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
new file mode 100644
index 0000000000..deb9d9e755
--- /dev/null
+++ b/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
@@ -0,0 +1,172 @@
+/*
+ * 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.Map;
+
+import org.apache.openejb.config.WebModule;
+import org.apache.openejb.jee.EjbRef;
+import org.apache.openejb.jee.EjbRefType;
+import org.apache.openejb.jee.EjbReference;
+import org.apache.openejb.jee.EnvEntry;
+import org.apache.openejb.jee.WebApp;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.ComponentProperty;
+import org.apache.tuscany.sca.assembly.ComponentReference;
+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.Property;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.contribution.DefaultModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.service.ContributionException;
+import org.apache.tuscany.sca.implementation.web.WebImplementation;
+import org.apache.tuscany.sca.implementation.web.WebImplementationFactory;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+
+public class WebModuleProcessor {
+ private WebModule webModule;
+ private ComponentType componentType;
+ private AssemblyHelper helper;
+
+ public WebModuleProcessor(WebModule webModule, AssemblyHelper helper) {
+ super();
+ this.webModule = webModule;
+ this.helper = helper;
+ }
+
+ public WebModuleProcessor(WebModule module) {
+ webModule = module;
+ helper = new AssemblyHelper();
+ }
+
+ public ComponentType getWebAppComponentType() throws ContributionException {
+ if (componentType != null) {
+ return componentType;
+ }
+ componentType = helper.createComponentType();
+
+ WebApp webApp = webModule.getWebApp();
+ ClassLoader classLoader = webModule.getClassLoader();
+
+ // Process Remote EJB References
+ for (Map.Entry<String, EjbRef> entry : webApp.getEjbRefMap().entrySet()) {
+ EjbRef ejbRef = entry.getValue();
+ if(ejbRef.getHome() != null) {
+ // References to only EJB3 beans need to be considered.
+ // Skip the current on as it is not a reference to an EJB3 bean.
+ continue;
+ }
+ if (ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) {
+ // Only Remote EJB references need to be considered.
+ // Skip the current one as it is not a remote reference.
+ continue;
+ }
+ //FIXME: ejbRef.getEjbRefType() is null sometimes. Need a different way to figure the type.
+ if(ejbRef.getEjbRefType() != null && ejbRef.getEjbRefType().compareTo(EjbRefType.SESSION) != 0) {
+ // Only references to Session beans need to be considered.
+ // Skip the current one as it is not a Session bean.
+ continue;
+ }
+ String referenceName = entry.getKey();
+ referenceName = referenceName.replace("/", "_");
+ Reference reference = helper.createComponentReference();
+ reference.setName(referenceName);
+ InterfaceContract ic = null;
+ try {
+ Class<?> clazz = classLoader.loadClass(ejbRef.getInterface());
+ ic = helper.createInterfaceContract(clazz);
+ } catch (Exception e) {
+ componentType = null;
+ throw new ContributionException(e);
+ }
+ reference.setInterfaceContract(ic);
+ reference.getRequiredIntents().add(AssemblyHelper.EJB_INTENT);
+ componentType.getReferences().add(reference);
+ }
+
+ // Process env-entries to compute properties
+ for (Map.Entry<String, EnvEntry> entry : webApp.getEnvEntryMap().entrySet()) {
+ EnvEntry envEntry = entry.getValue();
+ String type = envEntry.getEnvEntryType();
+ if (!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
+ continue;
+ }
+ String propertyName = entry.getKey();
+ propertyName = propertyName.replace("/", "_");
+ String value = envEntry.getEnvEntryValue();
+ Property property = helper.createComponentProperty();
+ property.setName(propertyName);
+ property.setXSDType(AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.get(type));
+ property.setValue(value);
+ componentType.getProperties().add(property);
+ }
+
+ return componentType;
+ }
+
+ public Composite getWebAppComposite() throws ContributionException {
+ getWebAppComponentType();
+
+ Composite composite = helper.createComposite();
+
+ ModelFactoryExtensionPoint mfep = new DefaultModelFactoryExtensionPoint();
+ WebImplementationFactory wif = mfep.getFactory(WebImplementationFactory.class);
+ WebImplementation impl = wif.createWebImplementation();
+ impl.setWebURI(webModule.getModuleId());
+
+ // Create component
+ Component component = helper.createComponent();
+ String componentName = webModule.getModuleId();
+ component.setName(componentName);
+ component.setImplementation(impl);
+
+ // Add references
+ for (Reference reference : componentType.getReferences()) {
+ ComponentReference componentReference = helper.createComponentReference();
+ componentReference.setReference(reference);
+ componentReference.setInterfaceContract(reference.getInterfaceContract());
+ componentReference.getRequiredIntents().addAll(reference.getRequiredIntents());
+ component.getReferences().add(componentReference);
+ }
+
+ // Add properties
+ for (Property property : componentType.getProperties()) {
+ ComponentProperty componentProperty = helper.createComponentProperty();
+ componentProperty.setProperty(property);
+ component.getProperties().add(componentProperty);
+ }
+
+ // Add component to composite
+ composite.getComponents().add(component);
+
+ // Add composite references
+ for (ComponentReference reference : component.getReferences()) {
+ CompositeReference compositeReference = helper.createCompositeReference();
+ compositeReference.setInterfaceContract(reference.getInterfaceContract());
+ compositeReference.getRequiredIntents().addAll(reference.getRequiredIntents());
+ compositeReference.getPromotedReferences().add(reference);
+ composite.getReferences().add(compositeReference);
+ }
+
+ return composite;
+ }
+}
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java b/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
new file mode 100644
index 0000000000..3a80c1dd3b
--- /dev/null
+++ b/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
@@ -0,0 +1,140 @@
+/*
+ * 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.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;
+
+/**
+ * Ear Contribution package processor.
+ *
+ * @version $Rev$ $Date$
+ */
+public class EarContributionProcessor implements PackageProcessor {
+
+ public URL getArtifactURL(URL packageSourceURL, URI artifact)
+ throws MalformedURLException {
+ if (packageSourceURL.toString().startsWith("archive:")) {
+ return new URL(packageSourceURL, artifact.toString());
+ } else {
+ return new URL("archive:" + packageSourceURL.toExternalForm() + "!/" + artifact);
+ }
+ }
+
+ public List<URI> 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<String> names = new HashSet<String>();
+ 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<URI> artifacts = archiveProcessor.getArtifacts(packageSourceURL, bin);
+ bin.close();
+ for(URI artifact : artifacts) {
+ names.add(entry.getName()+"!/"+artifact);
+ }
+ }
+ }
+
+ // Return list of URIs
+ List<URI> artifacts = new ArrayList<URI>();
+ for (String name: names) {
+ artifacts.add(URI.create(name));
+ }
+ return artifacts;
+
+ } finally {
+ jar.close();
+ }
+ }
+
+ public String getPackageType() {
+ return PackageType.EAR;
+ }
+}
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java b/branches/sca-java-1.4/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/branches/sca-java-1.4/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/branches/sca-java-1.4/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/branches/sca-java-1.4/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/branches/sca-java-1.4/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/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java b/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java
new file mode 100644
index 0000000000..b062187afb
--- /dev/null
+++ b/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java
@@ -0,0 +1,72 @@
+/*
+ * 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.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.openejb.config.AppModule;
+import org.apache.openejb.config.EjbModule;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Service;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class EJBModuleProcessorTestCase {
+
+ EjbModule ejbModule;
+
+ @Before
+ public void setUp() throws Exception {
+ String jarFilePath = "target/test-classes/ejb-injection-sample.jar";
+ JavaEEModuleHelper jmh = new JavaEEModuleHelper();
+ AppModule appModule = jmh.getMetadataCompleteModules(jarFilePath);
+ ejbModule = appModule.getEjbModules().get(0);
+ }
+
+ @Test
+ public void testEjbContribution() throws Exception {
+ EJBModuleProcessor emp = new EJBModuleProcessor(ejbModule);
+ Map<String, ComponentType> ejbComponentTypes = emp.getEjbComponentTypes();
+ Assert.assertEquals(3, ejbComponentTypes.size());
+
+ Assert.assertTrue(ejbComponentTypes.containsKey("DataStoreImpl"));
+ Assert.assertTrue(ejbComponentTypes.containsKey("DataStoreStatefulImpl"));
+ Assert.assertTrue(ejbComponentTypes.containsKey("DataReaderImpl"));
+
+ ComponentType ct = ejbComponentTypes.get("DataStoreImpl");
+ Assert.assertEquals(2, ct.getServices().size());
+ Set<String> serviceNames = new HashSet<String>();
+ for (Service s : ct.getServices()) {
+ serviceNames.add(s.getName());
+ }
+
+ Assert.assertEquals(2, serviceNames.size());
+ Assert.assertTrue(serviceNames.contains("DataStoreRemote"));
+ Assert.assertTrue(serviceNames.contains("DataStoreLocal"));
+
+ Assert.assertEquals(0, ct.getReferences().size());
+ }
+}
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java b/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java
new file mode 100644
index 0000000000..9495df70b7
--- /dev/null
+++ b/branches/sca-java-1.4/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<URI> artifacts = null;
+ try {
+ artifacts = earProcessor.getArtifacts(earURL, earStream);
+ } finally {
+ IOHelper.closeQuietly(earStream);
+ }
+
+ Assert.assertNotNull(artifacts);
+ }
+}
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessorTestCase.java b/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessorTestCase.java
new file mode 100644
index 0000000000..85b5e87e7f
--- /dev/null
+++ b/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessorTestCase.java
@@ -0,0 +1,84 @@
+/*
+ * 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.HashSet;
+import java.util.Set;
+
+import org.apache.openejb.config.AppModule;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JavaEEApplicationProcessorTestCase {
+
+ AppModule appModule;
+
+ @Before
+ public void setUp() throws Exception {
+ String jarFilePath = "target/test-classes/ejb-injection-sample.ear";
+ JavaEEModuleHelper jmh = new JavaEEModuleHelper();
+ appModule = jmh.getMetadataCompleteModules(jarFilePath);
+ }
+
+ @Test
+ public void testJavaEEAppContribution() throws Exception {
+ JavaEEApplicationProcessor jap = new JavaEEApplicationProcessor(appModule);
+
+ ComponentType ct = jap.getJavaEEAppComponentType();
+
+ // Check the services
+ Assert.assertEquals(6, ct.getServices().size());
+
+ Set<String> expectedServiceNames = new HashSet<String>();
+ expectedServiceNames.add("BankBean_Bank");
+ expectedServiceNames.add("ConverterBean_Converter");
+ expectedServiceNames.add("ConverterBean_ConverterLocal");
+ expectedServiceNames.add("Converter2Bean_ConverterLocal");
+ expectedServiceNames.add("InvoiceBean_Invoice");
+ expectedServiceNames.add("PurchaseOrderBean_PurchaseOrder");
+
+ Set<String> serviceNames = new HashSet<String>();
+ for(Service service : ct.getServices()) {
+ serviceNames.add(service.getName());
+ }
+
+ Assert.assertEquals(expectedServiceNames, serviceNames);
+
+ // Check the references
+ Assert.assertEquals(1, ct.getReferences().size());
+
+ Set<String> expectedReferenceNames = new HashSet<String>();
+ expectedReferenceNames.add("BankBean_simple.BankBean_converter");
+
+ Set<String> referenceNames = new HashSet<String>();
+ for (Reference r : ct.getReferences()) {
+ referenceNames.add(r.getName());
+ }
+
+ Assert.assertEquals(expectedReferenceNames, referenceNames);
+ }
+}
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java b/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java
new file mode 100644
index 0000000000..e315c417b9
--- /dev/null
+++ b/branches/sca-java-1.4/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<URI> artifacts = null;
+ try {
+ artifacts = warProcessor.getArtifacts(warURL, warStream);
+ } finally {
+ IOHelper.closeQuietly(warStream);
+ }
+
+ Assert.assertNotNull(artifacts);
+ }
+}
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java b/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java
new file mode 100644
index 0000000000..030fdc3d19
--- /dev/null
+++ b/branches/sca-java-1.4/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.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;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.openejb.config.AppModule;
+import org.apache.openejb.config.WebModule;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class WebModuleProcessorTestCase {
+
+ WebModule webModule;
+
+ @Before
+ public void setUp() throws Exception {
+ String jarFilePath = "target/test-classes/ejb-injection-sample.ear";
+ JavaEEModuleHelper jmh = new JavaEEModuleHelper();
+ AppModule appModule = jmh.getMetadataCompleteModules(jarFilePath);
+ webModule = appModule.getWebModules().get(0);
+ }
+
+ @Test
+ public void testWebAppContribution() throws Exception {
+ WebModuleProcessor wmp = new WebModuleProcessor(webModule);
+
+ ComponentType ct = wmp.getWebAppComponentType();
+ Assert.assertEquals(2, ct.getReferences().size());
+ Set<String> referenceNames = new HashSet<String>();
+ for (Reference r : ct.getReferences()) {
+ referenceNames.add(r.getName());
+ }
+
+ Assert.assertEquals(2, referenceNames.size());
+ Assert.assertTrue(referenceNames.contains("org.myorg.MyServlet_bank"));
+ Assert.assertTrue(referenceNames.contains("org.myorg.MyServlet_converter"));
+
+ Assert.assertEquals(0, ct.getServices().size());
+
+ Composite composite = wmp.getWebAppComposite();
+ Assert.assertEquals(2, composite.getReferences().size());
+ }
+}
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear b/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear
new file mode 100644
index 0000000000..3efdd206c7
--- /dev/null
+++ b/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear
Binary files differ
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar b/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar
new file mode 100644
index 0000000000..4b9e3b79f4
--- /dev/null
+++ b/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar
Binary files differ
diff --git a/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/sample-web-app.war b/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/sample-web-app.war
new file mode 100644
index 0000000000..681b203fab
--- /dev/null
+++ b/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/sample-web-app.war
Binary files differ