[jboss-cvs] JBossAS SVN: r86958 - in branches/Branch_5_x/webservices/src: resources/jbossws-jboss50.deployer/META-INF and 1 other directory.

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

Author: richard.opalka at jboss.com
Date: 2009-04-08 08:39:20 -0400 (Wed, 08 Apr 2009)
New Revision: 86958

Modified:
   branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java
   branches/Branch_5_x/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2074] more work on dynamic endpoints

Modified: branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java
===================================================================
--- branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java	2009-04-08 12:24:41 UTC (rev 86957)
+++ branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java	2009-04-08 12:39:20 UTC (rev 86958)
@@ -55,16 +55,15 @@
    {
       super.create(dep);
 
-      DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class);
-      if (unit == null)
-         throw new IllegalStateException();
+      JBossWebMetaData webMD = dep.getAttachment(JBossWebMetaData.class);
+      if (webMD == null)
+         throw new IllegalStateException("JBossWebMetaData not found");
       
       List<InjectionMetaData> injectionMD = new LinkedList<InjectionMetaData>();
       DeploymentType deploymentType = dep.getType();
 
       if (deploymentType == DeploymentType.JAXWS_JSE)
       {
-         JBossWebMetaData webMD = unit.getAttachment(JBossWebMetaData.class);
          injectionMD.addAll(buildInjectionMetaData(webMD.getEnvironmentEntries()));
       }
       else if (deploymentType == DeploymentType.JAXWS_EJB3)

Modified: branches/Branch_5_x/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml	2009-04-08 12:24:41 UTC (rev 86957)
+++ branches/Branch_5_x/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml	2009-04-08 12:39:20 UTC (rev 86958)
@@ -198,7 +198,7 @@
   </bean>
   
   <bean name="WSInjectionMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.InjectionMetaDataDeploymentAspect">
-    <property name="requires">ContainerMetaData</property>
+    <property name="requires">WebMetaData</property>
     <property name="provides">InjectionMetaData</property>
   </bean>  
 
@@ -252,6 +252,7 @@
   
   <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.tomcat.ModifyWebMetaDataDeploymentAspect">
     <property name="requires">ContextProperties, StackDescriptor</property>
+    <property name="provides">WebMetaData</property>
     <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property>
   </bean>
   
@@ -345,6 +346,7 @@
     <property name="aspects">
       <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
         <inject bean="WSDynamicEndpointDeploymentAspect"/>
+        <inject bean="WSInjectionMetaDataDeploymentAspect"/>
         <inject bean="WSEndpointAPIDeploymentAspect"/>
         <inject bean="WSVirtualHostDeploymentAspect"/>
         <inject bean="WSEndpointAddressDeploymentAspect"/>