[jbossws-commits] JBossWS SVN: r16184 - in stack/cxf/trunk: modules/dist and 18 other directories.

Author: alessio.soldano(a)jboss.com Date: 2012-04-19 07:24:18 -0400 (Thu, 19 Apr 2012) New Revision: 16184 Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-services/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-services/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-services/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/main/module.xml Modified: stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/distro/build.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3473] Adding jbossws-native dependency into jbossws-cxf for installing/updating native-core as part of jbws-cxf deploy and for simplyfing testsuite dependencies configuration now that jbossws-native has been slimmed down Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2012-04-19 11:17:05 UTC (rev 16183) +++ stack/cxf/trunk/modules/dist/pom.xml 2012-04-19 11:24:18 UTC (rev 16184) @@ -69,6 +69,16 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-services</artifactId> + </dependency> + <!--test-suite--> <dependency> <groupId>org.jboss.ws</groupId> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-04-19 11:17:05 UTC (rev 16183) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-04-19 11:24:18 UTC (rev 16184) @@ -76,9 +76,11 @@ <target name="tests-init" depends="init,tests-classpath"> <!-- JBossWS jars first to override META-INF/services declarations duplicated in CXF jars (alternative is using endorsing) --> + <!-- Avoid including jbossws-native-services.jar, we just need and want jbossws-native-core for jaxrpc tests --> <path id="ws.stack.classpath"> <fileset dir="${thirdparty.dir}"> <include name="**/jbossws*.jar"/> + <exclude name="**/jbossws-native-services.jar"/> <exclude name="**/jbossws-jboss*.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-19 11:17:05 UTC (rev 16183) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-19 11:24:18 UTC (rev 16184) @@ -34,6 +34,8 @@ <include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include> <include>org.jboss.ws.cxf:jbossws-cxf-server:jar</include> <include>org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar</include> + <include>org.jboss.ws.native:jbossws-native-core:jar</include> + <include>org.jboss.ws.native:jbossws-native-services:jar</include> <include>org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:jar</include> <include>org.jboss.com.sun.httpserver:httpserver:jar</include> <include>org.apache.cxf:cxf-*</include> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2012-04-19 11:17:05 UTC (rev 16183) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2012-04-19 11:24:18 UTC (rev 16184) @@ -35,7 +35,6 @@ <module name="org.jboss.ws.api" export="true"/> <module name="org.jboss.ws.spi" export="true"/> <module name="org.jboss.ws.common" services="import" export="true"/> - <module name="org.jboss.ws.native.jbossws-native-factories" services="export" export="true"/> <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true"> <imports> <include path="META-INF"/> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-19 11:24:18 UTC (rev 16184) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2011, 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.ws.native.jbossws-native-core"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.servlet.api" /> + <module name="javax.mail.api" /> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.rpc.api" /> + <module name="org.apache.xerces" services="import"/> + <module name="org.javassist" /> + <module name="org.jboss.netty" /> + <module name="org.jboss.xb" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="org.jboss.ws.native.jbossws-native-services" services="import"/> + <module name="org.jboss.common-core" /> + <module name="org.jboss.logging" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-services/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-services/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-services/main/module.xml 2012-04-19 11:24:18 UTC (rev 16184) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2011, 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.ws.native.jbossws-native-services"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + + </dependencies> +</module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2012-04-19 11:17:05 UTC (rev 16183) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2012-04-19 11:24:18 UTC (rev 16184) @@ -35,7 +35,6 @@ <module name="org.jboss.ws.api" export="true"/> <module name="org.jboss.ws.spi" export="true"/> <module name="org.jboss.ws.common" services="import" export="true"/> - <module name="org.jboss.ws.native.jbossws-native-factories" services="export" export="true"/> <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true"> <imports> <include path="META-INF"/> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-19 11:24:18 UTC (rev 16184) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2011, 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.1" name="org.jboss.ws.native.jbossws-native-core"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.servlet.api" /> + <module name="javax.mail.api" /> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.rpc.api" /> + <module name="org.apache.xerces" services="import"/> + <module name="org.javassist" /> + <module name="org.jboss.netty" /> + <module name="org.jboss.xb" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="org.jboss.ws.native.jbossws-native-services" services="import"/> + <module name="org.jboss.common-core" /> + <module name="org.jboss.logging" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/main/module.xml 2012-04-19 11:24:18 UTC (rev 16184) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2011, 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.1" name="org.jboss.ws.native.jbossws-native-services"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + + </dependencies> +</module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-19 11:17:05 UTC (rev 16183) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-19 11:24:18 UTC (rev 16184) @@ -83,8 +83,18 @@ <include name="**/jbossws-cxf-transports-httpserver.jar"/> </fileset> </copy> - <copy todir="@{targetdir}/org/apache/cxf//main" flatten="false" overwrite="true"> + <copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-core/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-native-core.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-services/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-native-services.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/apache/cxf/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> <include name="**/cxf-*.jar"/> </fileset> </copy> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2012-04-19 11:17:05 UTC (rev 16183) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2012-04-19 11:24:18 UTC (rev 16184) @@ -1 +1 @@ -org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/opensaml/**, org/springframework/spring/** \ No newline at end of file +org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/opensaml/**, org/springframework/spring/**, org/jboss/ws/native/** \ No newline at end of file Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-04-19 11:17:05 UTC (rev 16183) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-04-19 11:24:18 UTC (rev 16184) @@ -78,6 +78,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -651,11 +656,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <!-- TODO: replace with maven dependencies --> - <additionalClasspathElements> - <!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> - <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> - </additionalClasspathElements> <excludes> <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration--> <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> @@ -931,16 +931,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <!-- TODO: replace with maven dependencies --> - <additionalClasspathElements> - <!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> - <!-- JBossWS Native Core version overwritten by jbossws-native stack install --> - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement> - <!-- JBossWS Native Core version available on 710 --> - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.1.GA.jar</additionalClasspathElement> - <!-- JBossWS Native Core version specified through system property --> - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement> - </additionalClasspathElements> <excludes> <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration--> <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> @@ -1165,16 +1155,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <!-- TODO: replace with maven dependencies --> - <additionalClasspathElements> - <!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> - <!-- JBossWS Native Core version overwritten by jbossws-native stack install --> - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement> - <!-- JBossWS Native Core version available on 711 --> - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.2.GA.jar</additionalClasspathElement> - <!-- JBossWS Native Core version specified through system property --> - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement> - </additionalClasspathElements> <excludes> <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration--> <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> @@ -1389,16 +1369,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <!-- TODO: replace with maven dependencies --> - <additionalClasspathElements> - <!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> - <!-- JBossWS Native Core version overwritten by jbossws-native stack install --> - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement> - <!-- JBossWS Native Core version available on 712 --> - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.2.GA.jar</additionalClasspathElement> - <!-- JBossWS Native Core version specified through system property --> - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement> - </additionalClasspathElements> <excludes> <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration--> <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-04-19 11:17:05 UTC (rev 16183) +++ stack/cxf/trunk/pom.xml 2012-04-19 11:24:18 UTC (rev 16184) @@ -61,12 +61,13 @@ <properties> <jbossws.api.version>1.0.0.GA</jbossws.api.version> <jbossws.spi.version>2.1.0-SNAPSHOT</jbossws.spi.version> - <jbossws.common.version>2.0.2.GA</jbossws.common.version> <!-- TODO [JBWS-3473] move back to 2.1.0-SNAPSHOT --> + <jbossws.common.version>2.1.0-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.1.0-SNAPSHOT</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.1.0-SNAPSHOT</jbossws.shared.testsuite.version> <jbossws.jboss702.version>4.1.0-SNAPSHOT</jbossws.jboss702.version> <jbossws.jboss710.version>4.1.0-SNAPSHOT</jbossws.jboss710.version> <jbossws.jboss711.version>4.1.0-SNAPSHOT</jbossws.jboss711.version> + <jbossws.native.version>4.1.0-SNAPSHOT</jbossws.native.version> <jboss702.version>7.0.2.Final</jboss702.version> <jboss710.version>7.1.0.Final</jboss710.version> <jboss711.version>7.1.1.Final</jboss711.version> @@ -1115,7 +1116,53 @@ <scope>provided</scope> </dependency> + <!-- JBossWS Native dependencies for installation and testsuite only --> <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-core</artifactId> + <version>${jbossws.native.version}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + </exclusion> + <exclusion> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + <exclusion> + <groupId>wsdl4j</groupId> + <artifactId>wsdl4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-services</artifactId> + <version>${jbossws.native.version}</version> + </dependency> + + <dependency> <groupId>javax.jws</groupId> <artifactId>jsr181-api</artifactId> <version>${jsr181.api.version}</version>