[jbossws-commits] JBossWS SVN: r11482 - in stack/cxf/branches/jaxrpc-cxf/modules/server/src/main: resources and 1 other directory.

Author: alessio.soldano(a)jboss.com Date: 2010-01-25 05:27:01 -0500 (Mon, 25 Jan 2010) New Revision: 11482 Modified: stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ResourceResolverDeploymentAspect.java stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/resources/jbossws-cxf-config-as6.xml Log: Using new AbstractDeploymentAspect, moving WSAspectizedDeployer to stack specific config, providing sensible values for isForJaxWs / isForJaxRpc Modified: stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2010-01-25 10:23:26 UTC (rev 11481) +++ stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2010-01-25 10:27:01 UTC (rev 11482) @@ -31,10 +31,10 @@ import javax.xml.ws.soap.SOAPBinding; import org.jboss.logging.Logger; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.common.integration.WSConstants; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.stack.cxf.metadata.services.DDBeans; @@ -46,7 +46,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 10-May-2007 */ -public class DescriptorDeploymentAspect extends DeploymentAspect +public class DescriptorDeploymentAspect extends AbstractDeploymentAspect { // provide logging private final Logger log = Logger.getLogger(DescriptorDeploymentAspect.class); Modified: stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ResourceResolverDeploymentAspect.java =================================================================== --- stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ResourceResolverDeploymentAspect.java 2010-01-25 10:23:26 UTC (rev 11481) +++ stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ResourceResolverDeploymentAspect.java 2010-01-25 10:27:01 UTC (rev 11482) @@ -21,9 +21,9 @@ */ package org.jboss.wsf.stack.cxf; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.ResourceResolver; @@ -36,7 +36,7 @@ * @author alessio.soldano(a)jboss.com * @since 19-Nov-2009 */ -public class ResourceResolverDeploymentAspect extends DeploymentAspect +public class ResourceResolverDeploymentAspect extends AbstractDeploymentAspect { @Override public void start(Deployment dep) Modified: stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/resources/jbossws-cxf-config-as6.xml =================================================================== --- stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-01-25 10:23:26 UTC (rev 11481) +++ stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-01-25 10:27:01 UTC (rev 11482) @@ -1,7 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <deployment xmlns="urn:jboss:bean-deployer:2.0"> - + + <!-- WSDeploymentAspectDeployers factory --> + <bean name="WSAspectizedDeployersFactory" class="org.jboss.webservices.integration.deployers.WSAspectizedDeployersFactory"> + <constructor> + <parameter> + <inject bean="Deployers"/> + </parameter> + </constructor> + <incallback method="addDeployer"/> + <uncallback method="removeDeployer"/> + <property name="includeJaxRpc">false</property> + </bean> + <!-- The registry for web service endpoints --> <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> @@ -35,6 +47,7 @@ </entry> </map> </property> + <property name="forJaxRpc">false</property> </bean> <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect"> @@ -42,16 +55,19 @@ <property name="provides">StackDescriptor</property> <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property> <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property> + <property name="forJaxRpc">false</property> </bean> <bean name="ResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.ResourceResolverDeploymentAspect"> <property name="requires">JmsEndpointAddress</property> <property name="provides">ResourceResolver</property> + <property name="forJaxRpc">false</property> </bean> <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">StackEndpointHandler</property> + <property name="forJaxRpc">false</property> </bean> <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect"> @@ -64,10 +80,12 @@ <inject bean="WSLogRecorder"/> </list> </property> + <property name="forJaxRpc">false</property> </bean> <bean name="WSCXFJAXBIntroDeploymentAspect" class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect"> <property name="provides">JAXBIntros</property> + <property name="forJaxRpc">false</property> </bean> </deployment>