You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by va...@apache.org on 2009/11/03 11:00:19 UTC

svn commit: r832369 - in /tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web: WebImplementation.java impl/WebImplementationImpl.java xml/WebImplementationProcessor.java

Author: vamsic007
Date: Tue Nov  3 10:00:17 2009
New Revision: 832369

URL: http://svn.apache.org/viewvc?rev=832369&view=rev
Log:
Property injection for SCA properties in implementation.web computed by Java EE optional extension

Modified:
    tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
    tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
    tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java

Modified: tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java?rev=832369&r1=832368&r2=832369&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java Tue Nov  3 10:00:17 2009
@@ -66,4 +66,6 @@
     Map<String, JavaResourceImpl> getResourceInjectionPoints();
     
     Map<InjectionTarget, Class<?>> getOptExtensionReferenceInjectionPoints();
+
+    Map<String, String> getOptExtensionPropertyInjectionPoints();
 }

Modified: tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java?rev=832369&r1=832368&r2=832369&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java Tue Nov  3 10:00:17 2009
@@ -51,6 +51,8 @@
     private Map<String, JavaResourceImpl> resourceInjectionPoints = new HashMap<String, JavaResourceImpl>();
     
     private Map<InjectionTarget, Class<?>> optExtReferenceInjectionPoints = new HashMap<InjectionTarget, Class<?>>();
+    
+    private Map<String, String> optExtPropertyInjectionPoints = new HashMap<String, String>();
     /**
      * Constructs a new Web implementation.
      */
@@ -159,4 +161,8 @@
     public Map<InjectionTarget, Class<?>> getOptExtensionReferenceInjectionPoints() {
         return optExtReferenceInjectionPoints;
     }
+
+    public Map<String, String> getOptExtensionPropertyInjectionPoints() {
+        return optExtPropertyInjectionPoints;
+    }
 }

Modified: tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java?rev=832369&r1=832368&r2=832369&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java Tue Nov  3 10:00:17 2009
@@ -33,9 +33,11 @@
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Property;
 import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
 import org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo;
+import org.apache.tuscany.sca.contribution.jee.EnvEntryInfo;
 import org.apache.tuscany.sca.contribution.jee.JspReferenceTagInfo;
 import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;
 import org.apache.tuscany.sca.contribution.jee.JavaEEExtension;
@@ -143,11 +145,21 @@
                 ComponentType ct = jeeOptionalExtension.createImplementationWebComponentType(webModuleInfo);
                 implementation.getReferences().addAll(ct.getReferences());
                 implementation.getProperties().addAll(ct.getProperties());
+                List<String> propertyNames = new ArrayList<String>();
+                for(Property prop : ct.getProperties()) {
+                    propertyNames.add(prop.getName());
+                }
                 // Injection points from optional extension
                 for(Map.Entry<String, EjbReferenceInfo> entry : webModuleInfo.getEjbReferences().entrySet()) {
                     EjbReferenceInfo ejbRef = entry.getValue();
                     implementation.getOptExtensionReferenceInjectionPoints().put(ejbRef.injectionTarget, ejbRef.businessInterface);
                 }
+                for(Map.Entry<String, EnvEntryInfo> entry : webModuleInfo.getEnvEntries().entrySet()) {
+                    EnvEntryInfo envEntry = entry.getValue();
+                    if(propertyNames.contains(envEntry.name.replace("/", "_"))) {
+                        implementation.getOptExtensionPropertyInjectionPoints().put(envEntry.name, envEntry.type);
+                    }
+                }
             }
             
             // Introspection of classes