[jbossws-commits] JBossWS SVN: r13911 - in stack/cxf/branches/spring-as7: modules/resources/src/main/resources/modules/org/apache/cxf/main and 5 other directories.

Author: alessio.soldano(a)jboss.com Date: 2011-03-21 15:55:21 -0400 (Mon, 21 Mar 2011) New Revision: 13911 Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml stack/cxf/branches/spring-as7/modules/testsuite/pom.xml stack/cxf/branches/spring-as7/pom.xml Log: synch with AS7 Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-03-21 15:02:52 UTC (rev 13910) +++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-03-21 19:55:21 UTC (rev 13911) @@ -34,6 +34,7 @@ <module name="javax.jws.api" /> <module name="javax.mail.api" /> <module name="javax.servlet.api" /> + <module name="javax.wsdl4j.api" /> <module name="javax.xml.bind.api" services="import"/> <module name="com.sun.xml.bind" services="import"/> <module name="javax.xml.soap.api" /> @@ -41,7 +42,6 @@ <module name="javax.xml.ws.api" /> <module name="org.apache.neethi" /> <module name="org.apache.ws.commons.xmlschema" /> - <module name="wsdl4j.wsdl4j" /> <module name="org.apache.ws.security" /> <module name="org.apache.santuario.xmlsec" /> <module name="org.springframework.spring" optional="true"/> Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-21 15:02:52 UTC (rev 13910) +++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-21 19:55:21 UTC (rev 13911) @@ -36,7 +36,7 @@ <module name="org.jboss.metadata"/> <module name="org.jboss.staxmapper"/> <module name="org.jboss.as.controller"/> - <module name="org.jboss.as.managed-beans"/> + <module name="org.jboss.as.ejb3"/> <module name="org.jboss.as.server"/> <module name="org.jboss.as.ee"/> <module name="org.jboss.as.naming"/> Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-21 15:02:52 UTC (rev 13910) +++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-21 19:55:21 UTC (rev 13911) @@ -28,6 +28,7 @@ </resources> <dependencies> + <module name="javax.wsdl4j.api" export="true"/> <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"/> @@ -67,7 +68,6 @@ <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"/> <module name="org.apache.ws.security" export="true"/> <module name="org.apache.santuario.xmlsec" export="true"/> <module name="org.springframework.spring" optional="true" export="true"> Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-03-21 15:02:52 UTC (rev 13910) +++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-03-21 19:55:21 UTC (rev 13911) @@ -33,12 +33,12 @@ <module name="javax.annotation.api"/> <module name="javax.ejb.api"/> <module name="javax.servlet.api"/> + <module name="javax.wsdl4j.api"/> <module name="javax.xml.ws.api"/> <module name="org.jboss.ws.api"/> <module name="org.jboss.ws.spi"/> <module name="org.jboss.logging"/> <module name="org.jboss.common-core"/> <module name="org.apache.xerces" services="import"/> - <module name="wsdl4j.wsdl4j" /> </dependencies> </module> Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-03-21 15:02:52 UTC (rev 13910) +++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-03-21 19:55:21 UTC (rev 13911) @@ -32,6 +32,7 @@ <module name="javax.api" /> <module name="javax.servlet.api" /> <module name="javax.jws.api" /> + <module name="javax.wsdl4j.api" /> <module name="javax.xml.bind.api" /> <module name="javax.xml.stream.api" /> <module name="javax.xml.ws.api" /> @@ -54,7 +55,6 @@ </module> <module name="org.jboss.common-core" /> <module name="org.jboss.logging" /> - <module name="wsdl4j.wsdl4j" /> <module name="org.apache.ws.security" /> <module name="org.springframework.spring" optional="true" /> </dependencies> Modified: stack/cxf/branches/spring-as7/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/spring-as7/modules/testsuite/pom.xml 2011-03-21 15:02:52 UTC (rev 13910) +++ stack/cxf/branches/spring-as7/modules/testsuite/pom.xml 2011-03-21 19:55:21 UTC (rev 13911) @@ -818,7 +818,7 @@ <profile> <id>jboss700</id> <properties> - <jboss.version>7.0.0.Alpha2-SNAPSHOT</jboss.version> + <jboss.version>7.0.0.Beta2-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss700</jbossws.integration.target> </properties> <dependencies> Modified: stack/cxf/branches/spring-as7/pom.xml =================================================================== --- stack/cxf/branches/spring-as7/pom.xml 2011-03-21 15:02:52 UTC (rev 13910) +++ stack/cxf/branches/spring-as7/pom.xml 2011-03-21 19:55:21 UTC (rev 13911) @@ -55,7 +55,7 @@ <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version> --> <!-- END --> - <jboss700.version>7.0.0.Alpha2-SNAPSHOT</jboss700.version> + <jboss700.version>7.0.0.Beta2-SNAPSHOT</jboss700.version> <cxf.version>2.3.4-SNAPSHOT</cxf.version> <cxf.stax.version>1.0.1</cxf.stax.version> <cxf.asm.version>3.3</cxf.asm.version>