[jboss-cvs] JBossAS SVN: r61235 - in trunk: ejb3/src/main/org/jboss/injection and 7 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Mar 9 05:13:06 EST 2007


Author: thomas.diesler at jboss.com
Date: 2007-03-09 05:13:06 -0500 (Fri, 09 Mar 2007)
New Revision: 61235

Modified:
   trunk/build/build-distr.xml
   trunk/ejb3/src/main/org/jboss/injection/ServiceRefInjector.java
   trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
   trunk/server/src/main/org/jboss/deployment/ClientDeployer.java
   trunk/server/src/main/org/jboss/ejb/Container.java
   trunk/server/src/main/org/jboss/metadata/BeanMetaData.java
   trunk/server/src/main/org/jboss/metadata/ClientMetaData.java
   trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java
   trunk/server/src/main/org/jboss/metadata/WebMetaData.java
   trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
   trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
   trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment2.java
Log:
Simplify service-ref handling

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-03-09 01:11:56 UTC (rev 61234)
+++ trunk/build/build-distr.xml	2007-03-09 10:13:06 UTC (rev 61235)
@@ -1863,6 +1863,7 @@
         <include name="jaxen.jar"/>
       </fileset>
       <fileset dir="${jboss.jbossws.lib}">
+        <include name="jbossws-integration.jar"/>
         <include name="jboss-jaxrpc.jar"/>
         <include name="jboss-jaxws.jar"/>
         <include name="jboss-saaj.jar"/>

Modified: trunk/ejb3/src/main/org/jboss/injection/ServiceRefInjector.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/ServiceRefInjector.java	2007-03-09 01:11:56 UTC (rev 61234)
+++ trunk/ejb3/src/main/org/jboss/injection/ServiceRefInjector.java	2007-03-09 10:13:06 UTC (rev 61235)
@@ -60,7 +60,7 @@
       {
          Context envCtx = container.getEnc();
          UnifiedVirtualFile vfsRoot = new VirtualFileAdaptor(container.getRootFile());
-         new ServiceRefDelegate().setupServiceRef(envCtx, name, vfsRoot, sref);
+         new ServiceRefDelegate().bindServiceRef(envCtx, name, vfsRoot, sref);
       }
       catch (Exception e)
       {

Modified: trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java	2007-03-09 01:11:56 UTC (rev 61234)
+++ trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java	2007-03-09 10:13:06 UTC (rev 61235)
@@ -143,7 +143,7 @@
       if (sref == null)
       {
          log.debug("No override for @WebServiceRef.name: " + name);
-         sref = new ServiceRefDelegate().newMetaData();
+         sref = new ServiceRefDelegate().newServiceRefMetaData();
          if (sref != null)
             sref.setServiceRefName(name);
       }

Modified: trunk/server/src/main/org/jboss/deployment/ClientDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/ClientDeployer.java	2007-03-09 01:11:56 UTC (rev 61234)
+++ trunk/server/src/main/org/jboss/deployment/ClientDeployer.java	2007-03-09 10:13:06 UTC (rev 61235)
@@ -53,6 +53,7 @@
 import org.jboss.naming.Util;
 import org.jboss.util.xml.DOMUtils;
 import org.jboss.virtual.VirtualFile;
+import org.jboss.ws.integration.ServiceRefMetaData;
 import org.jboss.ws.integration.UnifiedVirtualFile;
 import org.w3c.dom.DocumentType;
 import org.w3c.dom.Element;
@@ -271,7 +272,11 @@
 
       // Bind <service-ref> elements
       UnifiedVirtualFile vfsRoot = new VirtualFileAdaptor(unit.getDeploymentContext().getRoot());
-      new ServiceRefDelegate().setupServiceRefs(envCtx, vfsRoot, metaData.getServiceRefs().values());
+      for (ServiceRefMetaData sref : metaData.getServiceRefs().values())
+      {
+         String refName = sref.getServiceRefName();
+         new ServiceRefDelegate().bindServiceRef(envCtx, refName, vfsRoot, sref);
+      }
 
       // Bind resource references
       HashMap resRefs = metaData.getResourceReferences();

Modified: trunk/server/src/main/org/jboss/ejb/Container.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/Container.java	2007-03-09 01:11:56 UTC (rev 61234)
+++ trunk/server/src/main/org/jboss/ejb/Container.java	2007-03-09 10:13:06 UTC (rev 61235)
@@ -90,7 +90,7 @@
 import org.jboss.system.ServiceMBeanSupport;
 import org.jboss.util.NestedError;
 import org.jboss.util.NestedRuntimeException;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.ws.integration.ServiceRefMetaData;
 import org.jboss.ws.integration.UnifiedVirtualFile;
 import org.omg.CORBA.ORB;
 
@@ -1227,7 +1227,11 @@
 
       // Bind service references
       UnifiedVirtualFile vfsRoot = new VirtualFileAdaptor(unit.getDeploymentContext().getRoot());
-      new ServiceRefDelegate().setupServiceRefs(envCtx, vfsRoot, metaData.getServiceRefs().values());
+      for (ServiceRefMetaData sref : metaData.getServiceRefs().values())
+      {
+         String refName = sref.getServiceRefName();
+         new ServiceRefDelegate().bindServiceRef(envCtx, refName, vfsRoot, sref);
+      }
 
       // Bind resource references
       {

Modified: trunk/server/src/main/org/jboss/metadata/BeanMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/BeanMetaData.java	2007-03-09 01:11:56 UTC (rev 61234)
+++ trunk/server/src/main/org/jboss/metadata/BeanMetaData.java	2007-03-09 10:13:06 UTC (rev 61235)
@@ -1114,7 +1114,7 @@
          Element serviceRef = (Element)iterator.next();
          if (ServiceRefObjectFactory.isJ2EE14Descriptor(serviceRef))
          {
-            ServiceRefMetaData sref = new ServiceRefDelegate().newMetaData();
+            ServiceRefMetaData sref = new ServiceRefDelegate().newServiceRefMetaData();
             if (sref != null)
             {
                sref.importStandardXml(serviceRef);

Modified: trunk/server/src/main/org/jboss/metadata/ClientMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/ClientMetaData.java	2007-03-09 01:11:56 UTC (rev 61234)
+++ trunk/server/src/main/org/jboss/metadata/ClientMetaData.java	2007-03-09 10:13:06 UTC (rev 61235)
@@ -178,7 +178,7 @@
          Element serviceRef = (Element)iterator.next();
          if (ServiceRefObjectFactory.isJ2EE14Descriptor(serviceRef))
          {
-            ServiceRefMetaData sref = new ServiceRefDelegate().newMetaData();
+            ServiceRefMetaData sref = new ServiceRefDelegate().newServiceRefMetaData();
             if (sref != null)
             {
                sref.importStandardXml(serviceRef);
@@ -274,7 +274,7 @@
          if (sref == null)
          {
             log.warn("service-ref " + serviceRefName + " found in jboss-web.xml but not in web.xml");
-            sref = new ServiceRefDelegate().newMetaData();
+            sref = new ServiceRefDelegate().newServiceRefMetaData();
             if (sref != null)
             {
                sref.setServiceRefName(serviceRefName);

Modified: trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java	2007-03-09 01:11:56 UTC (rev 61234)
+++ trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java	2007-03-09 10:13:06 UTC (rev 61235)
@@ -435,7 +435,7 @@
       }
       else if (localName.equals("service-ref"))
       {
-         child = new ServiceRefDelegate().newMetaData();
+         child = new ServiceRefDelegate().newServiceRefMetaData();
       }
       else if (localName.equals("jndi-ref"))
       {

Modified: trunk/server/src/main/org/jboss/metadata/WebMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2007-03-09 01:11:56 UTC (rev 61234)
+++ trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2007-03-09 10:13:06 UTC (rev 61235)
@@ -1337,7 +1337,7 @@
          if (sref == null)
          {
             log.warn("service-ref " + serviceRefName + " found in jboss-web.xml but not in web.xml");
-            sref = new ServiceRefDelegate().newMetaData();
+            sref = new ServiceRefDelegate().newServiceRefMetaData();
             if (sref != null)
             {
                sref.setServiceRefName(serviceRefName);

Modified: trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java	2007-03-09 01:11:56 UTC (rev 61234)
+++ trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java	2007-03-09 10:13:06 UTC (rev 61235)
@@ -23,17 +23,15 @@
 
 // $Id$
 
-import java.util.Collection;
-
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.xml.soap.FactoryLoader;
 
 import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.util.KernelLocator;
 import org.jboss.kernel.spi.registry.KernelRegistry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 import org.jboss.logging.Logger;
-import org.jboss.ws.integration.KernelLocator;
 import org.jboss.ws.integration.ServiceRefElement;
 import org.jboss.ws.integration.ServiceRefHandler;
 import org.jboss.ws.integration.ServiceRefMetaData;
@@ -77,11 +75,11 @@
          log.warn("Not registered: " + ServiceRefHandler.BEAN_NAME);
    }
 
-   public ServiceRefMetaData newMetaData()
+   public ServiceRefMetaData newServiceRefMetaData()
    {
       ServiceRefMetaData sref = null;
       if (delegate != null)
-         sref = delegate.newMetaData();
+         sref = delegate.newServiceRefMetaData();
       return sref;
    }
 
@@ -99,15 +97,9 @@
          delegate.setValue(ref, navigator, namespaceURI, localName, value);
    }
 
-   public void setupServiceRefs(Context envCtx, UnifiedVirtualFile vfsRoot, Collection<ServiceRefMetaData> serviceRefs) throws NamingException
+   public void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot, ServiceRefMetaData sref) throws NamingException
    {
       if (delegate != null)
-         delegate.setupServiceRefs(envCtx, vfsRoot, serviceRefs);
+         delegate.bindServiceRef(encCtx, encName, vfsRoot, sref);
    }
-
-   public void setupServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot, ServiceRefMetaData sref) throws NamingException
-   {
-      if (delegate != null)
-         delegate.setupServiceRef(encCtx, encName, vfsRoot, sref);
-   }
 }

Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java	2007-03-09 01:11:56 UTC (rev 61234)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java	2007-03-09 10:13:06 UTC (rev 61235)
@@ -432,7 +432,7 @@
       }
       else if (localName.equals("service-ref"))
       {
-         child = new ServiceRefDelegate().newMetaData();
+         child = new ServiceRefDelegate().newServiceRefMetaData();
       }
       else if (localName.equals("jndi-ref"))
       {

Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java	2007-03-09 01:11:56 UTC (rev 61234)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java	2007-03-09 10:13:06 UTC (rev 61235)
@@ -26,8 +26,10 @@
 import java.net.URLClassLoader;
 import java.security.Policy;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 
 import javax.management.MBeanServer;
@@ -60,6 +62,7 @@
 import org.jboss.security.authorization.PolicyRegistration;
 import org.jboss.web.WebApplication;
 import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
+import org.jboss.ws.integration.ServiceRefMetaData;
 import org.jboss.ws.integration.UnifiedVirtualFile;
 import org.omg.CORBA.ORB;
 
@@ -512,8 +515,17 @@
       log.debug("linkEjbLocalRefs");
       linkEjbLocalRefs(unit, ejbLocalRefs, envCtx);
       log.debug("linkServiceRefs");
+      linkServiceRefs(unit, metaData.getServiceRefs(), envCtx);
+   }
+
+   private void linkServiceRefs(DeploymentUnit unit, Map<String, ServiceRefMetaData> serviceRefs, Context envCtx) throws NamingException
+   {
       UnifiedVirtualFile vfsRoot = new VirtualFileAdaptor(unit.getDeploymentContext().getRoot());
-      new ServiceRefDelegate().setupServiceRefs(envCtx, vfsRoot, metaData.getServiceRefs().values());
+      for (ServiceRefMetaData sref : serviceRefs.values())
+      {
+         String refName = sref.getServiceRefName();
+         new ServiceRefDelegate().bindServiceRef(envCtx, refName, vfsRoot, sref);
+      }
    }
 
    protected void addEnvEntries(Iterator envEntries, Context envCtx)

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java	2007-03-09 01:11:56 UTC (rev 61234)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java	2007-03-09 10:13:06 UTC (rev 61235)
@@ -372,7 +372,7 @@
                ServiceRefMetaData injectedRef = envRefGroup.getServiceRef(refName);
                if (injectedRef == null || injectedRef.isProcessed() == false)
                {
-                  new ServiceRefDelegate().setupServiceRef(envCtx, refName, vfsRoot, sref);
+                  new ServiceRefDelegate().bindServiceRef(envCtx, refName, vfsRoot, sref);
                }
             }
          }

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment2.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment2.java	2007-03-09 01:11:56 UTC (rev 61234)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment2.java	2007-03-09 10:13:06 UTC (rev 61235)
@@ -485,7 +485,7 @@
                   ServiceRefMetaData injectedRef = envRefGroup.getServiceRef(refName);
                   if (injectedRef == null || injectedRef.isProcessed() == false)
                   {
-                     new ServiceRefDelegate().setupServiceRef(envCtx, refName, vfsRoot, sref);
+                     new ServiceRefDelegate().bindServiceRef(envCtx, refName, vfsRoot, sref);
                   }
                }
             }




More information about the jboss-cvs-commits mailing list