[jboss-cvs] JBossAS SVN: r66584 - trunk/ejb3/src/main/org/jboss/injection.

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

Author: thomas.diesler at jboss.com
Date: 2007-10-30 18:22:57 -0400 (Tue, 30 Oct 2007)
New Revision: 66584

Modified:
   trunk/ejb3/src/main/org/jboss/injection/ServiceRefInjector.java
   trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
Log:
Fix service-ref handling

Modified: trunk/ejb3/src/main/org/jboss/injection/ServiceRefInjector.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/ServiceRefInjector.java	2007-10-30 22:21:08 UTC (rev 66583)
+++ trunk/ejb3/src/main/org/jboss/injection/ServiceRefInjector.java	2007-10-30 22:22:57 UTC (rev 66584)
@@ -30,6 +30,7 @@
 
 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,8 +51,7 @@
    {
       this.name = name;
       this.sref = sref;
-      // FIXME: fix WS metadata
-      //sref.setAnnotatedElement(anElement);
+      this.sref.setAnnotatedElement(anElement);
    }
 
    public void inject(InjectionContainer container)
@@ -61,8 +61,7 @@
          Context envCtx = container.getEnc();
          ClassLoader loader = container.getClassloader();
          UnifiedVirtualFile vfsRoot = new VirtualFileAdaptor(container.getRootFile());
-         // FIXME: fix WS metadata
-         //new ServiceRefDelegate().bindServiceRef(envCtx, name, vfsRoot, loader, sref);
+         new ServiceReferenceHandler().bindServiceRef(envCtx, name, vfsRoot, loader, sref);
       }
       catch (Exception e)
       {

Modified: trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java	2007-10-30 22:21:08 UTC (rev 66583)
+++ trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java	2007-10-30 22:22:57 UTC (rev 66584)
@@ -34,6 +34,7 @@
 import javax.xml.ws.WebServiceRefs;
 
 import org.jboss.logging.Logger;
+import org.jboss.metadata.javaee.jboss.JBossServiceReferenceMetaData;
 import org.jboss.metadata.javaee.spec.RemoteEnvironment;
 import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
 import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
@@ -144,9 +145,8 @@
       if (sref == null)
       {
          log.debug("No override for @WebServiceRef.name: " + name);
-         // FIXME: fix WS metadata
-         //sref = new ServiceRefDelegate().newServiceRefMetaData();
-         //sref.setServiceRefName(name);
+         sref = new JBossServiceReferenceMetaData();
+         sref.setServiceRefName(name);
       }
       return sref;
    }