[jboss-cvs] JBossAS SVN: r108567 - projects/ejb3/trunk/core/src/main/java/org/jboss/injection.

[jboss-cvs-commits at lists.jboss.org]

Author: jaikiran
Date: 2010-10-14 03:24:15 -0400 (Thu, 14 Oct 2010)
New Revision: 108567

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/injection/ServiceRefInjector.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/injection/WebServiceRefHandler.java
Log:
EJBTHREE-2163 Create an EncInjector for service-ref

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/injection/ServiceRefInjector.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/injection/ServiceRefInjector.java	2010-10-14 06:34:35 UTC (rev 108566)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/ServiceRefInjector.java	2010-10-14 07:24:15 UTC (rev 108567)
@@ -32,7 +32,6 @@
 import org.jboss.logging.Logger;
 import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
 import org.jboss.metadata.serviceref.ServiceReferenceHandler;
-import org.jboss.metadata.serviceref.VirtualFileAdaptor;
 import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
 
 /**
@@ -50,11 +49,17 @@
 
    public ServiceRefInjector(String name, AnnotatedElement anElement, ServiceReferenceMetaData sref)
    {
+      this(name, sref);
+      this.sref.setAnnotatedElement(anElement);
+   }
+   
+   public ServiceRefInjector(String name, ServiceReferenceMetaData sref)
+   {
       this.name = name;
       this.sref = sref;
-      this.sref.setAnnotatedElement(anElement);
    }
 
+
    public void inject(InjectionContainer container)
    {
       try

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/injection/WebServiceRefHandler.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/injection/WebServiceRefHandler.java	2010-10-14 06:34:35 UTC (rev 108566)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/WebServiceRefHandler.java	2010-10-14 07:24:15 UTC (rev 108567)
@@ -63,6 +63,12 @@
          srefMap.put(sref.getServiceRefName(), sref);
 
          String encName = "env/" + sref.getServiceRefName();
+         // create an EncInjector
+         if (!container.getEncInjectors().containsKey(encName))
+         {
+            container.getEncInjectors().put(encName, new ServiceRefInjector(encName, sref));
+         }
+         
          AnnotatedElement annotatedElement = sref.getAnnotatedElement();
          if(annotatedElement == null)
          {