[jbossws-commits] JBossWS SVN: r9761 - in container/jboss50/branches: jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF and 2 other directories.

Author: richard.opalka(a)jboss.com Date: 2009-04-08 08:32:16 -0400 (Wed, 08 Apr 2009) New Revision: 9761 Modified: container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java container/jboss50/branches/jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java container/jboss50/branches/jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml Log: [JBWS-2074] more work on dynamic endpoint Modified: container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java =================================================================== --- container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java 2009-04-08 11:07:16 UTC (rev 9760) +++ container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java 2009-04-08 12:32:16 UTC (rev 9761) @@ -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: container/jboss50/branches/jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml =================================================================== --- container/jboss50/branches/jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-04-08 11:07:16 UTC (rev 9760) +++ container/jboss50/branches/jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-04-08 12:32:16 UTC (rev 9761) @@ -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"/> Modified: container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java =================================================================== --- container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java 2009-04-08 11:07:16 UTC (rev 9760) +++ container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java 2009-04-08 12:32:16 UTC (rev 9761) @@ -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: container/jboss50/branches/jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml =================================================================== --- container/jboss50/branches/jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-04-08 11:07:16 UTC (rev 9760) +++ container/jboss50/branches/jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-04-08 12:32:16 UTC (rev 9761) @@ -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"/>