From ae8df2107457670d0404931b8fa7fdf55535aa30 Mon Sep 17 00:00:00 2001 From: vamsic007 Date: Thu, 29 Oct 2009 10:49:10 +0000 Subject: Injection info for SCA references from Java EE optional extension git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830888 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/implementation/web/WebImplementation.java | 3 +++ .../tuscany/sca/implementation/web/impl/WebImplementationImpl.java | 6 ++++++ .../sca/implementation/web/xml/WebImplementationProcessor.java | 6 ++++++ 3 files changed, 15 insertions(+) (limited to 'branches/sca-java-1.x/modules/implementation-web/src/main/java') diff --git a/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java b/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java index b8b8be1ffb..6b02c45208 100644 --- a/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java +++ b/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java @@ -21,6 +21,7 @@ package org.apache.tuscany.sca.implementation.web; import java.util.Map; import org.apache.tuscany.sca.assembly.Implementation; +import org.apache.tuscany.sca.contribution.jee.InjectionTarget; import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl; import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl; @@ -63,4 +64,6 @@ public interface WebImplementation extends Implementation { * @return Map with injection points for SCA resources */ Map getResourceInjectionPoints(); + + Map> getOptExtensionReferenceInjectionPoints(); } diff --git a/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java b/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java index ec0627f0a8..4eeb4d24d1 100644 --- a/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java +++ b/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java @@ -30,6 +30,7 @@ import org.apache.tuscany.sca.assembly.Reference; import org.apache.tuscany.sca.assembly.Service; import org.apache.tuscany.sca.assembly.builder.ComponentPreProcessor; import org.apache.tuscany.sca.assembly.impl.ImplementationImpl; +import org.apache.tuscany.sca.contribution.jee.InjectionTarget; import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl; import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl; import org.apache.tuscany.sca.implementation.web.WebImplementation; @@ -48,6 +49,8 @@ class WebImplementationImpl extends ImplementationImpl implements WebImplementat private Map referenceInjectionPoints = new HashMap(); private Map resourceInjectionPoints = new HashMap(); + + private Map> optExtReferenceInjectionPoints = new HashMap>(); /** * Constructs a new Web implementation. */ @@ -153,4 +156,7 @@ class WebImplementationImpl extends ImplementationImpl implements WebImplementat return resourceInjectionPoints; } + public Map> getOptExtensionReferenceInjectionPoints() { + return optExtReferenceInjectionPoints; + } } diff --git a/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java b/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java index d1c611dc2f..ccab5cd3cd 100644 --- a/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java +++ b/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java @@ -35,6 +35,7 @@ import org.apache.tuscany.sca.assembly.ComponentReference; import org.apache.tuscany.sca.assembly.ComponentType; import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo; import org.apache.tuscany.sca.contribution.jee.JspReferenceTagInfo; import org.apache.tuscany.sca.contribution.jee.WebModuleInfo; import org.apache.tuscany.sca.contribution.jee.JavaEEExtension; @@ -142,6 +143,11 @@ public class WebImplementationProcessor extends BaseStAXArtifactProcessor implem ComponentType ct = jeeOptionalExtension.createImplementationWebComponentType(webModuleInfo); implementation.getReferences().addAll(ct.getReferences()); implementation.getProperties().addAll(ct.getProperties()); + // Injection points from optional extension + for(Map.Entry entry : webModuleInfo.getEjbReferences().entrySet()) { + EjbReferenceInfo ejbRef = entry.getValue(); + implementation.getOptExtensionReferenceInjectionPoints().put(ejbRef.injectionTarget, ejbRef.businessInterface); + } } // Introspection of classes -- cgit v1.2.3