[jboss-cvs] JBossAS SVN: r109858 - in trunk: ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider and 6 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sun Dec 12 11:29:23 EST 2010


Author: jaikiran
Date: 2010-12-12 11:29:22 -0500 (Sun, 12 Dec 2010)
New Revision: 109858

Modified:
   trunk/component-matrix/pom.xml
   trunk/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/EJBContextResource.java
   trunk/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/TimerServiceResource.java
   trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
   trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
   trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java
   trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
   trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
   trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java
Log:
JBAS-8548 Bring in the latest switchboard version which allows for specifying invocation dependencies

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-12-12 16:19:00 UTC (rev 109857)
+++ trunk/component-matrix/pom.xml	2010-12-12 16:29:22 UTC (rev 109858)
@@ -87,7 +87,7 @@
     <version.org.jboss.cluster.cache.ispn>1.0.0.CR8</version.org.jboss.cluster.cache.ispn>
     <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
     <version.org.jboss.deployers>2.2.0.Alpha8</version.org.jboss.deployers>
-    <version.org.jboss.ejb3.depchain>1.0.0-alpha-33</version.org.jboss.ejb3.depchain>
+    <version.org.jboss.ejb3.depchain>1.0.0-alpha-34</version.org.jboss.ejb3.depchain>
     <!-- This to move into the EJB3 BOM -->
     <version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
     <version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
@@ -98,7 +98,7 @@
     <version.org.jboss.javaee.specs.bom>1.0.0.CR1</version.org.jboss.javaee.specs.bom>
     <version.org.jboss.jbossxb>2.0.2.GA</version.org.jboss.jbossxb>
     <version.org.jboss.jopr>1.4.0.GA</version.org.jboss.jopr>
-    <version.org.jboss.jpa.deployers>1.0.2-alpha-2</version.org.jboss.jpa.deployers>
+    <version.org.jboss.jpa.deployers>1.0.2-alpha-3</version.org.jboss.jpa.deployers>
     <version.org.jboss.jpa.vfs3>1.0.2-alpha-2</version.org.jboss.jpa.vfs3>
     <version.org.jboss.jpa.impl>2.0.0</version.org.jboss.jpa.impl>
     <version.org.jboss.jpa.mcint>1.0.0-alpha-2</version.org.jboss.jpa.mcint>
@@ -108,12 +108,12 @@
     <version.org.jboss.logging-service-metadata>1.0.0.CR9</version.org.jboss.logging-service-metadata>
     <version.org.jboss.logmanager>1.2.0.CR8</version.org.jboss.logmanager>
     <version.org.jboss.man>2.1.1.SP2</version.org.jboss.man>
-    <version.managed.beans.depchain>1.0.0-alpha-4</version.managed.beans.depchain>
+    <version.managed.beans.depchain>1.0.0-alpha-5</version.managed.beans.depchain>
     <version.org.jboss.marshalling>1.3.0.CR3</version.org.jboss.marshalling>
     <version.org.jboss.mc-int>2.2.0.Alpha3</version.org.jboss.mc-int>
     <version.org.jboss.mdr>2.2.0.Alpha3</version.org.jboss.mdr>
     <version.org.jboss.metadata.client>2.0.0.Alpha2</version.org.jboss.metadata.client>
-    <version.org.jboss.metadata.common>2.0.0.Alpha22</version.org.jboss.metadata.common>
+    <version.org.jboss.metadata.common>2.0.0.Alpha23</version.org.jboss.metadata.common>
     <version.org.jboss.metadata.ear>2.0.0.Alpha4</version.org.jboss.metadata.ear>
     <version.org.jboss.metadata.ejb>2.0.0-alpha-26</version.org.jboss.metadata.ejb>
     <version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
@@ -135,7 +135,7 @@
     <version.org.jboss.shrinkwrap>1.0.0-alpha-11</version.org.jboss.shrinkwrap>
     <version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
     <version.org.jboss.stdio>1.0.0.CR3</version.org.jboss.stdio>
-    <version.org.jboss.switchboard.depchain>1.0.0-alpha-13</version.org.jboss.switchboard.depchain>
+    <version.org.jboss.switchboard.depchain>1.0.0-alpha-14</version.org.jboss.switchboard.depchain>
     <version.org.jboss.threads>2.0.0.CR7</version.org.jboss.threads>
     <version.org.jboss.threads-metadata>2.0.0.CR4</version.org.jboss.threads-metadata>
     <version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>

Modified: trunk/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/EJBContextResource.java
===================================================================
--- trunk/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/EJBContextResource.java	2010-12-12 16:19:00 UTC (rev 109857)
+++ trunk/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/EJBContextResource.java	2010-12-12 16:29:22 UTC (rev 109858)
@@ -21,6 +21,8 @@
  */
 package org.jboss.as.ejb3.switchboard.resource.provider;
 
+import java.util.Collection;
+
 import javax.ejb.EJBContext;
 import javax.naming.LinkRef;
 
@@ -58,4 +60,10 @@
    {
       return new LinkRef("java:internal/EJBContext");
    }
+   
+   @Override
+   public Collection<?> getInvocationDependencies()
+   {
+      return null;
+   }
 }

Modified: trunk/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/TimerServiceResource.java
===================================================================
--- trunk/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/TimerServiceResource.java	2010-12-12 16:19:00 UTC (rev 109857)
+++ trunk/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/TimerServiceResource.java	2010-12-12 16:29:22 UTC (rev 109858)
@@ -21,6 +21,8 @@
  */
 package org.jboss.as.ejb3.switchboard.resource.provider;
 
+import java.util.Collection;
+
 import javax.ejb.TimerService;
 import javax.naming.LinkRef;
 
@@ -58,4 +60,9 @@
       return new LinkRef("java:internal/TimerService");
    }
 
+   @Override
+   public Collection<?> getInvocationDependencies()
+   {
+      return null;
+   }
 }

Modified: trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
===================================================================
--- trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2010-12-12 16:19:00 UTC (rev 109857)
+++ trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2010-12-12 16:29:22 UTC (rev 109858)
@@ -28,10 +28,11 @@
 import javax.management.ObjectName;
 import javax.security.jacc.PolicyConfiguration;
 
-import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
+import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
 import org.jboss.beans.metadata.plugins.AbstractSupplyMetaData;
 import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
 import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.DemandMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.deployment.MappedReferenceMetaDataResolverDeployer;
@@ -157,8 +158,9 @@
          throw new RuntimeException("No SwitchBoard Barrier found for bean: " + container.getEjbName() + " in unit: "
                + this.jbossUnit + " (or its component deployment unit)");
       }
-      // Add dependency on switchboard
-      dependsPolicy.addDependency(switchBoard.getId());
+      // add dependency on START (and not INSTALLED) state of Switchboard, since the container only requires a fully populated ENC context,
+      // but doesn't require a invokable context. An invokable context is only needed by Injector.
+      dependsPolicy.addDependency(this.createSwitchBoardDependency(switchBoard));
       log.debug("Added dependency on Switchboard " + switchBoard.getId() + " for EJB container " + ejbContainer.getName());
       
       
@@ -358,8 +360,8 @@
       BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(injectorMCBeanName, injector.getClass().getName());
       builder.setConstructorValue(injector);
 
-      // add dependency on INSTALLED state of SwitchBoard Barrier
-      builder.addDependency(barrier.getId());
+      // add dependency on SwitchBoard Barrier
+      builder.addDemand(barrier.getId(), ControllerState.CREATE, ControllerState.START, null);
 
       // return the Injector BMD
       return builder.getBeanMetaData();
@@ -394,4 +396,16 @@
       }
       return false;
    }
+   
+   private DemandMetaData createSwitchBoardDependency(Barrier switchBoard)
+   {
+      AbstractDemandMetaData switchboardDependency = new AbstractDemandMetaData();
+      switchboardDependency.setDemand(switchBoard.getId());
+      switchboardDependency.setWhenRequired(ControllerState.CREATE);
+      // container requires only a populated ENC (== START state of switchboard)
+      switchboardDependency.setTargetState(ControllerState.START);
+
+      return switchboardDependency;
+   }
+
 }

Modified: trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/switchboard-jboss-beans.xml	2010-12-12 16:19:00 UTC (rev 109857)
+++ trunk/server/src/etc/deployers/switchboard-jboss-beans.xml	2010-12-12 16:29:22 UTC (rev 109858)
@@ -146,11 +146,11 @@
                 <inject bean="org.jboss.switchboard.MessageDestinationRefResourceProvider"/>
                 <inject bean="org.jboss.switchboard.WebServiceRefResourceProvider"/>
                 <inject bean="org.jboss.switchboard.PersistenceUnitResourceProvider"/>
-                <!-- Disabled till we resolve the transient failures with EJB jndi dependencies
+                <!-- Disabled till we resolve the transient failures with EJB jndi dependencies -->
                 <inject bean="org.jboss.switchboard.EJBLocalRefResourceProvider"/>
                 <inject bean="org.jboss.switchboard.EJBRefResourceProvider"/>
                 <inject bean="org.jboss.switchboard.AnnotatedEJBRefResourceProvider"/>
-                -->
+
                 <inject bean="org.jboss.switchboard.BeanManagerResourceProvider"/>
                 <inject bean="org.jboss.switchboard.ORBRefResourceProvider"/>                
                 <inject bean="org.jboss.switchboard.UserTransactionRefResourceProvider"/>

Modified: trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java
===================================================================
--- trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java	2010-12-12 16:19:00 UTC (rev 109857)
+++ trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java	2010-12-12 16:29:22 UTC (rev 109858)
@@ -43,7 +43,7 @@
       // As per JavaEE 6 spec, section EE.9.6, java:comp/ORB is optional.
       // So let's create a LinkRefResource with ignoreDependency = true, so
       // that the deployment doesn't fail in the absence of ORB
-      return new LinkRefResource(this.corbaJndiName, true);
+      return new LinkRefResource(this.corbaJndiName, null, true);
    }
 
 }

Modified: trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java	2010-12-12 16:19:00 UTC (rev 109857)
+++ trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java	2010-12-12 16:29:22 UTC (rev 109858)
@@ -51,8 +51,6 @@
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.structure.spi.main.MainDeployerInternals;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.ejb3.ejbref.resolver.spi.EjbReference;
-import org.jboss.ejb3.ejbref.resolver.spi.EjbReferenceResolver;
 import org.jboss.injection.injector.EEInjector;
 import org.jboss.injection.injector.metadata.EnvironmentEntryType;
 import org.jboss.injection.injector.metadata.InjectionTargetType;
@@ -73,8 +71,6 @@
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
 import org.jboss.metadata.ear.spec.ModuleMetaData;
 import org.jboss.metadata.ear.spec.WebModuleMetaData;
-import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
-import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
 import org.jboss.metadata.javaee.spec.Environment;
 import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
 import org.jboss.metadata.javaee.spec.PersistenceContextReferencesMetaData;
@@ -131,8 +127,6 @@
    public static final String WEB_MODULE = "org.jboss.web.AbstractWebContainer.webModule";
    public static final String ERROR = "org.jboss.web.AbstractWebContainer.error";
    
-   private static final String JNDI_DEPENDENCY_PREFIX = "jndi:";
-
    /** A mapping of deployed warUrl strings to the WebApplication object */
    protected HashMap deploymentMap = new HashMap();
    /** The parent class loader first model flag */
@@ -156,9 +150,6 @@
 
    private PersistenceUnitDependencyResolver persistenceUnitDependencyResolver;
    
-   /** EJB reference resolver */
-   private EjbReferenceResolver ejbRefResolver;
-   
    private JavaEEComponentInformer componentInformer;
 
    /**
@@ -292,12 +283,6 @@
    }
    
    @Inject
-   public void setEjbReferenceResolver(EjbReferenceResolver resolver)
-   {
-      this.ejbRefResolver = resolver;
-   }
-
-   @Inject
    public void setJavaEEComponentInformer(JavaEEComponentInformer informer)
    {
       this.componentInformer = informer;
@@ -755,8 +740,7 @@
          if (switchBoard != null)
          {
             // Setup switchboard dependency on the deployment
-            ServiceDependencyMetaData switchBoardDependency = new ServiceDependencyMetaData();
-            switchBoardDependency.setIDependOn(switchBoard.getId());
+            ServiceDependencyMetaData switchBoardDependency = new AnyStateServiceDependencyMetaData(switchBoard.getId(), ControllerState.START, ControllerState.INSTALLED);
             dependencies.add(switchBoardDependency);
             log.debug("Added switchboard dependency: " + switchBoard.getId() + " for web module: " + name);
          }
@@ -813,31 +797,6 @@
             }
          }
          
-         // JBAS-8406 Add dependency on @EJB(s). This is a bit of duplicacy, since the TomcatInjectionContainer
-         // through various handler would also do the same. But since the TomcatInjectionContainer comes too late
-         // in the picture and since we already have similar duplicacy for @PersistenceContext and @PersistenceUnit (see few lines
-         // above) and more importantly, since this works, let's just have it here. 
-         if (metaData.getJndiEnvironmentRefsGroup() != null)
-         {
-            AnnotatedEJBReferencesMetaData annotatedEjbRefs = metaData.getJndiEnvironmentRefsGroup().getAnnotatedEjbReferences();
-            if (annotatedEjbRefs != null && !annotatedEjbRefs.isEmpty())
-            {
-               for (AnnotatedEJBReferenceMetaData annotatedEjbRef : annotatedEjbRefs)
-               {
-                  // Note: @EJB(beanName="") is set as "link" in AnnotatedEJBReferenceMetadata.
-                  // Hence, we use the getLink() method to get hold of the beanName during resolution.
-                  String beanName = annotatedEjbRef.getLink();
-                  EjbReference ejbReference = new EjbReference(beanName, annotatedEjbRef.getBeanInterface().getName(), annotatedEjbRef.getMappedName());
-                  String jndiName = this.ejbRefResolver.resolveEjb(unit, ejbReference);
-                  if (jndiName != null)
-                  {
-                     ServiceDependencyMetaData sdmd = this.createJNDIDependency(jndiName);
-                     dependencies.add(sdmd);
-                  }
-               }
-            }
-         }
-
          webModule.setDependencies(dependencies);
 
          // Here's where a bit of magic happens. By attaching the ServiceMetaData
@@ -911,29 +870,24 @@
    }
    
    /**
-    * Creates and returns a {@link ServiceDependencyMetaData} corresponding to the 
-    * passed jndi name
     * 
-    * @param jndiName The jndi name 
-    * @return
-    */
-   private ServiceDependencyMetaData createJNDIDependency(String jndiName)
-   {
-      String dependency = JNDI_DEPENDENCY_PREFIX + jndiName;
-      ServiceDependencyMetaData sdmd = new InstalledServiceDependencyMetaData();
-      sdmd.setIDependOn(dependency);
-      return sdmd;
-   }
-   
-   /**
+    * Similar to {@link ServiceDependencyMetaData} except that this allows to specify the "whenRequired" and
+    * "dependentState" {@link ControllerState ControllerState} 
     * 
-    * Similar to {@link ServiceDependencyMetaData} except that this expects the
-    * dependency to be in {@link ControllerState#INSTALLED}, unlike {@link ServiceDependencyMetaData}
-    * which expects it to be either in {@link ControllerState#START} or {@link ControllerState#CREATE} 
-    * 
     */
-   private class InstalledServiceDependencyMetaData extends ServiceDependencyMetaData
+   private class AnyStateServiceDependencyMetaData extends ServiceDependencyMetaData
    {
+      
+      private ControllerState whenRequired;
+      
+      private ControllerState dependentState;
+      
+      public AnyStateServiceDependencyMetaData(String iDependOn, ControllerState whenRequired, ControllerState dependentState)
+      {
+         this.setIDependOn(iDependOn);
+         this.whenRequired = whenRequired;
+         this.dependentState = dependentState;
+      }
       /**
        * @see ServiceDependencyMetaData#visit(ServiceMetaDataVisitor)
        * 
@@ -951,9 +905,7 @@
          catch (MalformedObjectNameException ignored)
          {
          }
-         // add a dependency on INSTALLED state of the dependency item
-         visitor.addDependency(new AbstractDependencyItem(name, dependency, ControllerState.CREATE, ControllerState.INSTALLED));
-         visitor.addDependency(new AbstractDependencyItem(name, dependency, ControllerState.START, ControllerState.INSTALLED));
+         visitor.addDependency(new AbstractDependencyItem(name, dependency, this.whenRequired, this.dependentState));
          visitor.visit(this);
       }
    }
@@ -972,9 +924,9 @@
       BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(injectorMCBeanName, injector.getClass().getName());
       builder.setConstructorValue(injector);
 
-      // add dependency on INSTALLED state of SwitchBoard Barrier
-      builder.addDependency(barrier.getId());
-
+      // add dependency on SwitchBoard Barrier
+      builder.addDemand(barrier.getId(), ControllerState.CREATE, ControllerState.START, null);
+      
       // return the Injector BMD
       return builder.getBeanMetaData();
    }
@@ -1028,4 +980,6 @@
       }
       return false;   
    }
+   
+   
 }

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2010-12-12 16:19:00 UTC (rev 109857)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2010-12-12 16:29:22 UTC (rev 109858)
@@ -567,15 +567,15 @@
    {
       // TODO injection handlers should be pluggable from XML
       handlers = new ArrayList<InjectionHandler<Environment>>();
-      try
-      {
-         InjectionHandler<Environment> webEjbHandler = new WebEJBHandler<Environment>(webDD, deploymentEndpointResolver, endpointMap, unit.getRelativePath());
-         handlers.add(webEjbHandler);
-      }
-      catch (NoClassDefFoundError e)
-      {
-         log.debug("EJB injection disabled", e);
-      }
+//      try
+//      {
+//         InjectionHandler<Environment> webEjbHandler = new WebEJBHandler<Environment>(webDD, deploymentEndpointResolver, endpointMap, unit.getRelativePath());
+//         handlers.add(webEjbHandler);
+//      }
+//      catch (NoClassDefFoundError e)
+//      {
+//         log.debug("EJB injection disabled", e);
+//      }
 
       handlers.add(new DependsHandler<Environment>());
       try

Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java	2010-12-12 16:19:00 UTC (rev 109857)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java	2010-12-12 16:29:22 UTC (rev 109858)
@@ -27,7 +27,6 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -41,7 +40,6 @@
 import javax.xml.ws.WebServiceRefs;
 import javax.xml.ws.soap.MTOM;
 
-import org.jboss.classloader.spi.base.BaseClassLoader;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.logging.Logger;
@@ -55,8 +53,6 @@
 import org.jboss.switchboard.javaee.jboss.environment.JBossServiceRefType;
 import org.jboss.switchboard.mc.spi.MCBasedResourceProvider;
 import org.jboss.switchboard.spi.Resource;
-import org.jboss.vfs.VFS;
-import org.jboss.vfs.VirtualFile;
 import org.jboss.wsf.spi.SPIProvider;
 import org.jboss.wsf.spi.SPIProviderResolver;
 import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
@@ -69,8 +65,8 @@
 import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
 import org.jboss.wsf.spi.serviceref.ServiceRefHandler;
+import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
 import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type;
-import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
 
 /**
  * Service reference resource provider.
@@ -476,6 +472,12 @@
       {
          return this.target;
       }
+      
+      @Override
+      public Collection<?> getInvocationDependencies()
+      {
+         return null;
+      }
    }
 
    private void processAnnotatedElement(final AnnotatedElement anElement, final UnifiedServiceRefMetaData serviceRefUMDM)

Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java	2010-12-12 16:19:00 UTC (rev 109857)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java	2010-12-12 16:29:22 UTC (rev 109858)
@@ -21,6 +21,8 @@
  */
 package org.jboss.webservices.integration.injection;
 
+import java.util.Collection;
+
 import javax.xml.ws.WebServiceContext;
 
 import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -72,5 +74,11 @@
       {
          return this.target;
       }
+      
+      @Override
+      public Collection<?> getInvocationDependencies()
+      {
+         return null;
+      }
    }
 }



More information about the jboss-cvs-commits mailing list