Author: richard.opalka(a)jboss.com Date: 2011-03-01 07:23:06 -0500 (Tue, 01 Mar 2011) New Revision: 13819 Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml Log: dynamic aspects ordering + new ASIL aggregation module Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-01 11:52:34 UTC (rev 13818) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-01 12:23:06 UTC (rev 13819) @@ -37,8 +37,8 @@ <module name="org.jboss.staxmapper"/> <module name="org.jboss.as.controller"/> <module name="org.jboss.as.managed-beans"/> + <module name="org.jboss.as.server"/> <module name="org.jboss.as.ee"/> - <module name="org.jboss.as.server"/> <module name="org.jboss.as.web"/> <module name="org.jboss.threads"/> <module name="org.jboss.modules"/> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-01 12:23:06 UTC (rev 13819) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2010, Red Hat, Inc., and individual contributors + ~ as indicated by the @author tags. See the copyright.txt file in the + ~ distribution for a full listing of individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<module xmlns="urn:jboss:module:1.0" name="org.jboss.as.webservices.server.integration"> + + <resources> + </resources> + + <dependencies> + <module name="com.sun.xml.bind" services="export" export="true"/> + <module name="org.jboss.ws.spi" export="true"/> + <module name="org.jboss.ws.common" export="true"/> + <module name="org.jboss.ws.jaxws-client" services="export" export="true"> + <imports> + <include path="META-INF/cxf"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + </exports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" export="true"/> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true"> + <imports> + <include path="META-INF/cxf"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + </exports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/> + <module name="org.apache.cxf" services="export" export="true"> + <imports> + <include path="META-INF/cxf"/> + <include path="META-INF/spring.*"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF/spring.*"/> + </exports> + </module> + <module name="org.apache.xalan" services="export" export="true"/> + <module name="org.apache.xerces" services="export" export="true"/> + <module name="org.jboss.as.webservices" services="export" export="true"/> + <module name="com.sun.xml.messaging.saaj" services="export" export="true"/> + <module name="wsdl4j.wsdl4j" export="true"/> + </dependencies> +</module> Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2011-03-01 11:52:34 UTC (rev 13818) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2011-03-01 12:23:06 UTC (rev 13819) @@ -23,8 +23,9 @@ --> <deploymentAspects xmlns="urn:jboss:ws:deployment:aspects:1.0"> - <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect" priority="4"/> - <deploymentAspect class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect" priority="5"> + + <deploymentAspect class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> + <property name="provides" class="java.lang.String">ContextProperties</property> <property name="contextProperties" class="java.util.HashMap"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry> @@ -33,10 +34,67 @@ </entry> </map> </property> + <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> - <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect" priority="13"> + + <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect"> + <property name="requires" class="java.lang.String">EndpointAddress,JAXBIntros</property> + <property name="provides" class="java.lang.String">StackDescriptor</property> <property name="invokerEJB3" class="java.lang.String">org.jboss.wsf.stack.cxf.InvokerEJB3</property> <property name="invokerJSE" class="java.lang.String">org.jboss.wsf.stack.cxf.InvokerJSE</property> + <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> - <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect" priority="15"/> -</deploymentAspects> \ No newline at end of file + + <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect"> + <!--property name="requires" class="java.lang.String">JmsEndpointAddress</property--> <!-- TODO: why this requires, investigate? --> + <property name="provides" class="java.lang.String">ResourceResolver</property> + <property name="forJaxRpc" class="boolean">false</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires" class="java.lang.String">ContainerMetaData</property> + <property name="provides" class="java.lang.String">StackEndpointHandler</property> + <property name="forJaxRpc" class="boolean">false</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect"> + <property name="provides" class="java.lang.String">JAXBIntros</property> + <property name="forJaxRpc" class="boolean">false</property> + </deploymentAspect> + + <!--deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.SynchronizedBusDeploymentAspect"--> <!-- TODO: investigate why? --> + <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect"> + <property name="provides" class="java.lang.String">BusHolder</property> + <property name="requires" class="java.lang.String">ResourceResolver,StackDescriptor</property> + <property name="forJaxRpc" class="boolean">false</property> + </deploymentAspect> + + <!-- + + <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.JMSEndpointDeploymentAspect"> + <property name="provides" class="java.lang.String">BusHolder</property> + <property name="forJaxRpc" class="boolean">false</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.JMSEndpointRegistryDeploymentAspect"> + <property name="requires" class="java.lang.String">BusHolder</property> + <property name="forJaxRpc" class="boolean">false</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + <property name="requires" class="java.lang.String">RegisteredEndpoint</property> + <property name="provides" class="java.lang.String">EndpointRecordProcessors</property> + <property name="processors"> + <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor"> + <inject bean="WSMemoryBufferRecorder"/> + <inject bean="WSLogRecorder"/> + </list> + </property> + <property name="forJaxRpc" class="boolean">false</property> + </deploymentAspect> + + --> + +</deploymentAspects> + Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-03-01 11:52:34 UTC (rev 13818) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-03-01 12:23:06 UTC (rev 13819) @@ -38,7 +38,7 @@ <copy file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> </target>