[jboss-cvs] JBossAS SVN: r61864 - in branches/Branch_4_2: ejb3/src/main/org/jboss/injection and 4 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2007-03-29 16:01:13 -0400 (Thu, 29 Mar 2007)
New Revision: 61864

Modified:
   branches/Branch_4_2/build/build-thirdparty.xml
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java
   branches/Branch_4_2/server/src/main/org/jboss/deployment/ClientDeployer.java
   branches/Branch_4_2/server/src/main/org/jboss/ejb/Container.java
   branches/Branch_4_2/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
   branches/Branch_4_2/server/src/main/org/jboss/web/AbstractWebDeployer.java
Log:
Add classloader to bindServiceRef

Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml	2007-03-29 19:17:34 UTC (rev 61863)
+++ branches/Branch_4_2/build/build-thirdparty.xml	2007-03-29 20:01:13 UTC (rev 61864)
@@ -86,7 +86,7 @@
     <componentref name="jboss/dom4j-jarjar" version="1.6.1"/>
     <componentref name="jboss/jaxr" version="1.2.0.GA"/>
     <componentref name="jboss/jbossts14" version="4.2.3.CR4"/>
-    <componentref name="jboss/jbossws-jboss42" version="1.2.1.GA"/>
+    <componentref name="jboss/jbossws-jboss42" version="1.2.1.DEV"/>
     <componentref name="jboss/jbossxb" version="1.0.0.CR9-brew"/>
     <componentref name="jboss/microcontainer" version="1.0.2"/>
     <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5-brew"/>

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java	2007-03-29 19:17:34 UTC (rev 61863)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java	2007-03-29 20:01:13 UTC (rev 61864)
@@ -29,6 +29,7 @@
 import javax.naming.Context;
 import javax.xml.ws.WebServiceException;
 
+import org.jboss.ejb3.DeploymentUnit;
 import org.jboss.ejb3.EJBContainer;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.serviceref.ServiceRefDelegate;
@@ -60,10 +61,13 @@
       try
       {
          Context encCtx = container.getEnc();
-         URL rootURL = ((EJBContainer)container).getDeploymentUnit().getUrl();
+         EJBContainer ejbContainer = (EJBContainer)container;
+         DeploymentUnit unit = ejbContainer.getDeploymentUnit();
+         URL rootURL = unit.getUrl();
 
+         ClassLoader loader = unit.getClassLoader();
          URLLoaderAdapter vfsRoot = new URLLoaderAdapter(rootURL);
-         new ServiceRefDelegate().bindServiceRef(encCtx, name, vfsRoot, sref);
+         new ServiceRefDelegate().bindServiceRef(encCtx, name, vfsRoot, loader, sref);
          
          log.debug("@WebServiceRef bound [env=" + name + "]");
       }

Modified: branches/Branch_4_2/server/src/main/org/jboss/deployment/ClientDeployer.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/deployment/ClientDeployer.java	2007-03-29 19:17:34 UTC (rev 61863)
+++ branches/Branch_4_2/server/src/main/org/jboss/deployment/ClientDeployer.java	2007-03-29 20:01:13 UTC (rev 61864)
@@ -277,7 +277,7 @@
       for (ServiceRefMetaData sref : metaData.getServiceReferences().values())
       {
          String refName = sref.getServiceRefName();
-         new ServiceRefDelegate().bindServiceRef(envCtx, refName, vfsRoot, sref);
+         new ServiceRefDelegate().bindServiceRef(envCtx, refName, vfsRoot, di.ucl, sref);
       }
       
       // Bind resource references

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/Container.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/Container.java	2007-03-29 19:17:34 UTC (rev 61863)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/Container.java	2007-03-29 20:01:13 UTC (rev 61864)
@@ -1246,7 +1246,7 @@
       for (ServiceRefMetaData sref : metaData.getServiceReferences().values())
       {
          String refName = sref.getServiceRefName();
-         new ServiceRefDelegate().bindServiceRef(envCtx, refName, vfsRoot, sref);
+         new ServiceRefDelegate().bindServiceRef(envCtx, refName, vfsRoot, di.ucl, sref);
       }
 
       // Bind resource references

Modified: branches/Branch_4_2/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java	2007-03-29 19:17:34 UTC (rev 61863)
+++ branches/Branch_4_2/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java	2007-03-29 20:01:13 UTC (rev 61864)
@@ -100,10 +100,10 @@
          delegate.setValue(ref, navigator, namespaceURI, localName, value);
    }
 
-   public void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot, ServiceRefMetaData sref) throws NamingException
+   public void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot, ClassLoader loader, ServiceRefMetaData sref) throws NamingException
    {
       if (delegate != null)
-         delegate.bindServiceRef(encCtx, encName, vfsRoot, sref);
+         delegate.bindServiceRef(encCtx, encName, vfsRoot, loader, sref);
    }
 
    public static class DummyServiceRef extends ServiceRefMetaData

Modified: branches/Branch_4_2/server/src/main/org/jboss/web/AbstractWebDeployer.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/web/AbstractWebDeployer.java	2007-03-29 19:17:34 UTC (rev 61863)
+++ branches/Branch_4_2/server/src/main/org/jboss/web/AbstractWebDeployer.java	2007-03-29 20:01:13 UTC (rev 61864)
@@ -532,7 +532,7 @@
       for (ServiceRefMetaData sref : metaData.getServiceReferences().values())
       {
          String refName = sref.getServiceRefName();
-         new ServiceRefDelegate().bindServiceRef(envCtx, refName, vfsRoot, sref);
+         new ServiceRefDelegate().bindServiceRef(envCtx, refName, vfsRoot, di.ucl, sref);
       }
    }