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

Author: alessio.soldano(a)jboss.com Date: 2013-02-20 11:04:11 -0500 (Wed, 20 Feb 2013) New Revision: 17335 Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/cxf/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/cxf/impl/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/cxf/impl/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/cxf/impl/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/cxf/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/cxf/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/neethi/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/neethi/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/neethi/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/santuario/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/santuario/xmlsec/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/santuario/xmlsec/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/santuario/xmlsec/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/ws/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/ws/security/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/ws/security/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/ws/security/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/ws/xmlschema/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/ws/xmlschema/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/ws/xmlschema/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/integration/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/integration/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/integration/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/jaxrpc-integration/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/jaxrpc-integration/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/api/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/api/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/api/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/common/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/common/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/common/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-client/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-client/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-factories/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-factories/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-server/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-server/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/jaxws-client/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/jaxws-client/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/jaxws-client/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/jaxws-jboss-httpserver-httpspi/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-core/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-core/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-services/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-services/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-services/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/saaj-impl/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/saaj-impl/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/saaj-impl/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/spi/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/spi/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/spi/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/common/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/common/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/common/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/wsconsume/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/wsconsume/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/wsconsume/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/wsprovide/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/wsprovide/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/wsprovide/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/opensaml/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/opensaml/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/opensaml/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/springframework/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/springframework/spring/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/springframework/spring/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/springframework/spring/main/module.xml stack/cxf/trunk/modules/testsuite/src/test/resources/jboss800/ stack/cxf/trunk/modules/testsuite/src/test/resources/jboss800/appclient-ws.xml Removed: stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/ Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/distro/Install.txt stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml stack/cxf/trunk/modules/dist/src/main/distro/build-setup.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/pom.xml stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3600] Adding jboss800 target, removing jboss711 Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2013-02-20 16:02:00 UTC (rev 17334) +++ stack/cxf/trunk/build.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -68,9 +68,6 @@ <arg line="${maven.opts} help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss711.home" value="${profiles.profile.properties.jboss711.home}"> - <isset property="profiles.profile.properties.jboss711.home"/> - </condition> <condition property="jboss712.home" value="${profiles.profile.properties.jboss712.home}"> <isset property="profiles.profile.properties.jboss712.home"/> </condition> @@ -80,15 +77,15 @@ <condition property="jboss720.home" value="${profiles.profile.properties.jboss720.home}"> <isset property="profiles.profile.properties.jboss720.home"/> </condition> + <condition property="jboss800.home" value="${profiles.profile.properties.jboss800.home}"> + <isset property="profiles.profile.properties.jboss800.home"/> + </condition> - <fail message="jboss home not set, use jboss711.home=value, jboss712.home=value, jboss713.home=value or jboss720.home=value to set"> + <fail message="jboss home not set, jboss712.home=value, jboss713.home=value, jboss720.home=value or jboss800.home=value to set"> <condition> <and> <not> - <isset property="jboss711.home"/> - </not> - <not> <isset property="jboss712.home"/> </not> <not> @@ -97,15 +94,18 @@ <not> <isset property="jboss720.home"/> </not> + <not> + <isset property="jboss800.home"/> + </not> </and> </condition> </fail> <echo/> - <echo message="jboss711.home=${jboss711.home}"/> <echo message="jboss712.home=${jboss712.home}"/> <echo message="jboss713.home=${jboss713.home}"/> <echo message="jboss720.home=${jboss720.home}"/> + <echo message="jboss800.home=${jboss800.home}"/> </target> <target name="init" depends="mvn-settings,prepare,os-init"> Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2013-02-20 16:02:00 UTC (rev 17334) +++ stack/cxf/trunk/modules/dist/pom.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -32,28 +32,28 @@ <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss711</classifier> + <classifier>jboss712</classifier> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss712</classifier> + <classifier>jboss713</classifier> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss713</classifier> + <classifier>jboss720</classifier> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss720</classifier> + <classifier>jboss800</classifier> </dependency> <dependency> @@ -133,17 +133,17 @@ <!-- container integration --> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711-server-integration</artifactId> + <artifactId>jbossws-jboss712-server-integration</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-server-integration</artifactId> + <artifactId>jbossws-jboss713-server-integration</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-server-integration</artifactId> + <artifactId>jbossws-jboss720-server-integration</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -199,9 +199,6 @@ <configuration> <target> <mkdir dir="${basedir}/target/exclude-file" /> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss711.txt"> - <param name="targetName" expression="jboss711" /> - </xslt> <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss712.txt"> <param name="targetName" expression="jboss712" /> </xslt> @@ -211,6 +208,9 @@ <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss720.txt"> <param name="targetName" expression="jboss720" /> </xslt> + <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss800.txt"> + <param name="targetName" expression="jboss800" /> + </xslt> </target> </configuration> <goals> @@ -239,17 +239,17 @@ <!-- Libraries required for running binary distro testsuite and not available on server--> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711-tests-integration</artifactId> + <artifactId>jbossws-jboss712-tests-integration</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-tests-integration</artifactId> + <artifactId>jbossws-jboss713-tests-integration</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-tests-integration</artifactId> + <artifactId>jbossws-jboss720-tests-integration</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2013-02-20 16:02:00 UTC (rev 17334) +++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2013-02-20 16:04:11 UTC (rev 17335) @@ -13,10 +13,10 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss711 ant deploy-jboss712 ant deploy-jboss713 ant deploy-jboss720 + ant deploy-jboss800 By default Spring Framework libraries are not installed to application server. In order to do that, please add the -Dspring=true property option when Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2013-02-20 16:02:00 UTC (rev 17334) +++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2013-02-20 16:04:11 UTC (rev 17335) @@ -3,12 +3,12 @@ # # Optional JBoss Home -jboss711.home=(a)jboss711.home@ jboss712.home=(a)jboss712.home@ jboss713.home=(a)jboss713.home@ jboss720.home=(a)jboss720.home@ +jboss800.home=(a)jboss800.home@ -# The JBoss server under test. This can be [jboss711|jboss712|jboss713|jboss720] +# The JBoss server under test. This can be [jboss712|jboss713|jboss720|jboss800] jbossws.integration.target=jboss713 # The JBoss settings Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-02-20 16:02:00 UTC (rev 17334) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -59,35 +59,6 @@ </target> <!-- ================================================================== --> - <!-- Deployment jboss711 --> - <!-- ================================================================== --> - - <target name="target-jboss711"> - <property name="jbossws.integration.target" value="jboss711"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss711" depends="undeploy-jboss711,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss711"> - <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/> - <copy todir="${jboss711.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"> - <exclude name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> - <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS --> - <installModules targetDir="${jboss711.home}/modules"> - <fileset dir="${deploy.structure}/modules"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> - - <target name="undeploy-jboss711" depends="target-jboss711,init" description="Remove jbossws from jboss711"> - <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss711.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> - </target> - - <!-- ================================================================== --> <!-- Deployment jboss712 --> <!-- ================================================================== --> @@ -205,10 +176,73 @@ <target name="undeploy-jboss720" depends="target-jboss720,init" description="Remove jbossws from jboss720"> <fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss720.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <macro-undeploy-jbossws-modules targetdir="${jboss720.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target> <!-- ================================================================== --> + <!-- Prepare Deployment Structure JBoss-8.0.x --> + <!-- ================================================================== --> + + <target name="deploy-structure-jboss80x" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + + <path id="jboss.ant.tasks.classpath"> + <fileset dir="${deploy.artifacts.dir}"> + <include name="**/jbossws-common-tools.jar"/> + <include name="**/jandex.jar"/> + </fileset> + </path> + <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jboss.ant.tasks.classpath"/> + <taskdef name="jandex" classname="org.jboss.jandex.JandexAntTask" classpathref="jboss.ant.tasks.classpath"/> + + <jandex run="true" verbose="false" newJar="true"> + <fileset dir="${deploy.artifacts.dir}/lib"> + <include name="cxf*security.jar"/> + </fileset> + </jandex> + <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> + <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> + <param name="modules-jbossid" value="jboss800"/> + </antcall> + <copy toDir="${deploy.structure}/modules/system/layers/base"> + <fileset dir="${deploy.artifacts.dir}/modules/jboss800"> + <include name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </copy> + </target> + + <!-- ================================================================== --> + <!-- Deployment jboss800 --> + <!-- ================================================================== --> + + <target name="target-jboss800"> + <property name="jbossws.integration.target" value="jboss800"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-jboss800" depends="undeploy-jboss800,deploy-structure-jboss80x,check-spring,install-spring-module80x" description="Deploy jbossws to jboss800"> + <fail message="Not available: ${jboss800.available.file}" unless="jboss800.available"/> + <copy todir="${jboss800.home}" overwrite="true" verbose="true"> + <fileset dir="${deploy.structure}"> + <exclude name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </copy> + <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS --> + <installModules targetDir="${jboss800.home}/modules/system/layers/base/"> + <fileset dir="${deploy.structure}/modules/system/layers/base"> + <include name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </installModules> + </target> + + <target name="undeploy-jboss800" depends="target-jboss800,init" description="Remove jbossws from jboss800"> + <fail message="Not available: ${jboss800.available.file}" unless="jboss800.available"/> + <macro-undeploy-jbossws-modules targetdir="${jboss800.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + </target> + + <!-- ================================================================== --> <!-- Spring --> <!-- ================================================================== --> <target name="check-spring"> @@ -235,4 +269,12 @@ </antcall> </target> + <target name="install-spring-module80x" if="spring-required"> + <antcall target="deploy-spring-module" inheritall="false"> + <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + <param name="modules-jbossid" value="jboss800"/> + </antcall> + </target> + </project> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2013-02-20 16:02:00 UTC (rev 17334) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -33,15 +33,15 @@ <!-- Load jbossws.integration.target properties --> <property file="${target.properties.file}"/> - <property name="jboss711.available.file" value="${jboss711.home}/jboss-modules.jar"/> <property name="jboss712.available.file" value="${jboss712.home}/jboss-modules.jar"/> <property name="jboss713.available.file" value="${jboss713.home}/jboss-modules.jar"/> <property name="jboss720.available.file" value="${jboss720.home}/jboss-modules.jar"/> + <property name="jboss800.available.file" value="${jboss800.home}/jboss-modules.jar"/> - <available property="jboss711.available" file="${jboss711.available.file}"/> <available property="jboss712.available" file="${jboss712.available.file}"/> <available property="jboss713.available" file="${jboss713.available.file}"/> <available property="jboss720.available" file="${jboss720.available.file}"/> + <available property="jboss800.available" file="${jboss800.available.file}"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-02-20 16:02:00 UTC (rev 17334) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -59,7 +59,6 @@ <condition property="jbossws.integration.jboss71x" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss711"/> <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> <equals arg1="${jbossws.integration.target}" arg2="jboss713"/> </or> @@ -71,6 +70,12 @@ </or> </condition> + <condition property="jbossws.integration.jboss80x" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss800"/> + </or> + </condition> + <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/> <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> </target> 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 2013-02-20 16:02:00 UTC (rev 17334) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -103,7 +103,7 @@ <includes> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> - <outputFileNameMapping>jbossws-jboss720-tests-integration.jar</outputFileNameMapping> + <outputFileNameMapping>jbossws-jboss800-tests-integration.jar</outputFileNameMapping> <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2013-02-20 16:02:00 UTC (rev 17334) +++ stack/cxf/trunk/modules/resources/pom.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -51,15 +51,6 @@ <phase>package</phase> </execution> <execution> - <id>jboss711</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss711</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss711/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> <id>jboss712</id> <goals><goal>jar</goal></goals> <phase>package</phase> @@ -86,6 +77,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss720/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>jboss800</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss800</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss800/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/cxf/impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/cxf/impl/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/cxf/impl/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2012, 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.apache.cxf.impl"> + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="asm.asm" /> + <module name="javax.api" /> + <module name="javax.annotation.api" /> + <module name="javax.jms.api" /> + <module name="javax.jws.api" /> + <module name="javax.mail.api" /> + <module name="javax.resource.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" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.ws.api" /> + <module name="org.apache.commons.lang" /> + <module name="org.apache.neethi" /> + <module name="org.apache.velocity" /> + <module name="org.apache.xml-resolver" /> + <module name="org.apache.ws.xmlschema" /> + <module name="org.apache.ws.security" /> + <module name="org.apache.santuario.xmlsec" /> + <module name="org.joda.time" /> + <module name="org.opensaml" /> + <module name="org.springframework.spring" optional="true"/> + <module name="org.apache.cxf" export="true"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/cxf/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/cxf/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -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.apache.cxf"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="org.apache.cxf.impl" services="import"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF/"/> + </imports> + </module> + <module name="asm.asm" /> + <module name="javax.api" /> + <module name="javax.annotation.api" /> + <module name="javax.mail.api" /> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.bind.api" services="import"/> + <module name="com.sun.xml.bind" services="import"/> + <module name="org.apache.neethi" /> + <module name="org.apache.ws.xmlschema" /> + <module name="org.springframework.spring" optional="true" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/neethi/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/neethi/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/neethi/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,38 @@ +<?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.apache.neethi"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.stream.api" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/santuario/xmlsec/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/santuario/xmlsec/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/santuario/xmlsec/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,39 @@ +<?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.apache.santuario.xmlsec"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="org.apache.commons.logging" /> + <module name="org.apache.xalan" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/ws/security/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/ws/security/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/ws/security/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,39 @@ +<?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.apache.ws.security"> + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.xml.rpc.api" /> + <module name="org.apache.commons.logging" /> + <module name="org.apache.santuario.xmlsec" /> + <module name="org.apache.xalan" /> + <module name="org.joda.time" /> + <module name="org.opensaml" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/ws/xmlschema/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/ws/xmlschema/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/apache/ws/xmlschema/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,37 @@ +<?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.apache.ws.xmlschema"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,64 @@ +<?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.1" name="org.jboss.as.webservices"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.annotation.api"/> + <module name="javax.api"/> + <module name="javax.ejb.api"/> + <module name="javax.jws.api"/> + <module name="javax.servlet.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.ejb3"/> + <module name="org.jboss.invocation"/> + <module name="org.jboss.jandex"/> + <module name="org.jboss.metadata"/> + <module name="org.jboss.staxmapper"/> + <module name="org.jboss.as.controller"/> + <module name="org.jboss.as.ejb3"/> + <module name="org.jboss.as.server"/> + <module name="org.jboss.as.ee"/> + <module name="org.jboss.as.naming"/> + <module name="org.jboss.as.security"/> + <module name="org.jboss.as.web"/> + <module name="org.jboss.threads"/> + <module name="org.jboss.modules"/> + <module name="org.jboss.msc"/> + <module name="org.jboss.vfs"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.common" services="import" /> + <module name="org.jboss.ws.spi" /> + <module name="org.picketbox" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/integration/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/integration/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,90 @@ +<?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.1" name="org.jboss.as.webservices.server.integration"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + </resources> + + <dependencies> + <module name="javax.api" export="true"/> + <module name="javax.jws.api" export="true"/> + <module name="javax.wsdl4j.api" export="true"/> + <module name="javax.xml.ws.api" export="true"/> + <module name="com.sun.xml.bind" services="export" export="true"/> + <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.jaxws-client" services="export" export="true"> + <imports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </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"/> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </exports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/> + <!-- Do not import services from cxf module directly, those need to come from jbossws --> + <module name="org.apache.cxf.impl" export="true"> + <imports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </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="org.apache.ws.security" export="true"/> + <module name="org.apache.santuario.xmlsec" export="true"/> + <module name="org.springframework.spring" optional="true" export="true"> + <imports> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF"/> + </exports> + </module> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,52 @@ +<?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.1" name="org.jboss.as.webservices.server.jaxrpc-integration"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <dependencies> + <module name="javax.api" export="true"/> + <module name="javax.wsdl4j.api" export="true"/> + <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-core" services="export" export="true"> + <imports> + <include path="META-INF"/> + <include path="dtd"/> + <include path="schema"/> + </imports> + <exports> + <include path="META-INF"/> + <include path="dtd"/> + <include path="schema"/> + </exports> + </module> + <module name="org.jboss.ws.native.jbossws-native-services" services="export" export="true"/> + <module name="org.apache.xerces" services="export" export="true"/> + <module name="org.jboss.as.webservices" services="export" export="true"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/api/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/api/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/api/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,40 @@ +<?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.1" name="org.jboss.ws.api"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.soap.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.modules"/> + <module name="org.jboss.ws.jaxws-client" services="import"/> + </dependencies> + +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/common/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/common/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/common/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,51 @@ +<?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.1" name="org.jboss.ws.common"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.annotation.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.ejb.api"/> + <module name="javax.jws.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="org.jboss.jaxbintros"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,50 @@ +<?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.cxf.jbossws-cxf-client"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <!-- JAXB API + REF IMPL --> + <module name="javax.xml.bind.api" export="true"/> + <module name="com.sun.xml.bind" export="true" services="export"/> + <module name="javax.xml.ws.api" export="true"/> + <module name="javax.jws.api" export="true"/> + <!-- WSDL4J API --> + <module name="javax.wsdl4j.api" export="true"/> + <!-- JBossWS API --> + <module name="org.jboss.ws.api" export="true" /> + <!-- JBossWS JAXWS client --> + <module name="org.jboss.ws.jaxws-client" export="true" services="export" /> + <!-- JBossWS configuration of Apache CXF --> + <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" /> + <!-- Apache CXF APIs only --> + <module name="org.apache.cxf" export="true" /> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true" services="export" /> + <module name="org.jboss.jaxbintros" export="true"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,36 @@ +<?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.cxf.jbossws-cxf-factories"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies/> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,67 @@ +<?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.cxf.jbossws-cxf-server"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <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" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="org.jboss.ws.jaxws-client" /> + <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/> + <!-- do not import services from cxf, those need to come from jbossws --> + <module name="org.apache.cxf.impl"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF/"/> + </imports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF/"/> + </imports> + </module> + <module name="org.jboss.common-core" /> + <module name="org.jboss.logging" /> + <module name="org.apache.ws.security" /> + <module name="org.picketbox" /> + <module name="org.springframework.spring" optional="true" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -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.cxf.jbossws-cxf-transports-httpserver"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="javax.annotation.api" /> + <module name="javax.xml.ws.api" /> + <module name="org.jboss.ws.jaxws-jboss-httpserver-httpspi" /> + <module name="org.apache.cxf.impl" services="import"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF/"/> + </imports> + </module> + <module name="org.jboss.com.sun.httpserver"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/jaxws-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/jaxws-client/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/jaxws-client/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,63 @@ +<?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.jaxws-client"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.xml.bind.api" /> + <module name="com.sun.xml.bind" services="import"/> + <module name="javax.xml.ws.api" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/> + <!-- do not import services from cxf, those need to come from jbossws --> + <module name="org.apache.cxf.impl"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF/"/> + </imports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF/"/> + </imports> + </module> + <module name="org.apache.log4j" /> + <module name="org.apache.neethi" /> + <module name="org.jboss.logging" /> + <module name="org.springframework.spring" optional="true" /> + <module name="javax.wsdl4j.api" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,39 @@ +<?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.1" name="org.jboss.ws.jaxws-jboss-httpserver-httpspi"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.xml.ws.api" /> + <module name="org.jboss.com.sun.httpserver"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-core/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-core/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,53 @@ +<?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"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <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/jboss800/org/jboss/ws/native/jbossws-native-services/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-services/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-services/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -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"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/saaj-impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/saaj-impl/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/saaj-impl/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,39 @@ +<?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.saaj-impl"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="com.sun.xml.messaging.saaj" services="import"/> + </dependencies> + +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/spi/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/spi/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/spi/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,44 @@ +<?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.1" name="org.jboss.ws.spi"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.servlet.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.ws.api"/> + <module name="org.jboss.as.webservices"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/common/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/common/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/common/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,46 @@ +<?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.tools.common"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="gnu.getopt"/> + <module name="org.apache.log4j"/> + <module name="org.jboss.as.webservices.server.integration" services="import"> + <imports> + <include path="META-INF"/> + <include path="META-INF/cxf"/> + </imports> + </module> + </dependencies> + +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/wsconsume/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/wsconsume/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/wsconsume/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,38 @@ +<?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.tools.wsconsume"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <main-class name="org.jboss.ws.tools.cmd.WSConsume"/> + + <dependencies> + <module name="org.jboss.logmanager" services="import"/> + <module name="org.jboss.ws.tools.common"/> + </dependencies> + +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/wsprovide/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/wsprovide/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/tools/wsprovide/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,38 @@ +<?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.tools.wsprovide"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <main-class name="org.jboss.ws.tools.cmd.WSProvide"/> + + <dependencies> + <module name="org.jboss.logmanager" services="import"/> + <module name="org.jboss.ws.tools.common"/> + </dependencies> + +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/opensaml/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/opensaml/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/opensaml/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2012, 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.opensaml"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.slf4j"/> + <module name="org.apache.santuario.xmlsec"/> + <module name="org.apache.ws.security" /> + <module name="org.joda.time"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/springframework/spring/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/springframework/spring/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/springframework/spring/main/module.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,38 @@ +<?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.springframework.spring"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.jms.api" /> + <module name="javax.annotation.api" /> + <module name="org.apache.commons.logging" /> + <module name="org.jboss.vfs" /> + </dependencies> +</module> Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2013-02-20 16:02:00 UTC (rev 17334) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2013-02-20 16:04:11 UTC (rev 17335) @@ -24,7 +24,6 @@ import static org.jboss.wsf.stack.cxf.Loggers.METADATA_LOGGER; import static org.jboss.wsf.stack.cxf.Messages.MESSAGES; -import java.io.IOException; import java.net.URL; import java.util.HashMap; import java.util.LinkedList; 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 2013-02-20 16:02:00 UTC (rev 17334) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -31,38 +31,38 @@ <copy file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss713/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss713/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss713/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss713/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss800/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss800/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" /> </target> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-02-20 16:02:00 UTC (rev 17334) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -605,19 +605,19 @@ </profile> <!-- - Name: jboss711 - Descr: JBoss-7.1.1 specific options + Name: jboss712 + Descr: JBoss-7.1.2 specific options --> <profile> - <id>jboss711</id> + <id>jboss712</id> <properties> - <jboss.version>${jboss711.version}</jboss.version> - <jbossws.integration.target>jboss711</jbossws.integration.target> + <jboss.version>${jboss712.version}</jboss.version> + <jbossws.integration.target>jboss712</jbossws.integration.target> </properties> <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711-tests-integration</artifactId> + <artifactId>jbossws-jboss712-tests-integration</artifactId> </dependency> </dependencies> <build> @@ -649,7 +649,6 @@ <!-- # [JBWS-3493] WS-Trust tests w/ PicketLink STS require PL 2.1.2.Final or greater --> <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService*</exclude> <!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed --> <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> @@ -664,19 +663,19 @@ </profile> <!-- - Name: jboss712 - Descr: JBoss-7.1.2 specific options + Name: jboss713 + Descr: JBoss-7.1.3 specific options --> <profile> - <id>jboss712</id> + <id>jboss713</id> <properties> - <jboss.version>${jboss712.version}</jboss.version> - <jbossws.integration.target>jboss712</jbossws.integration.target> + <jboss.version>${jboss713.version}</jboss.version> + <jbossws.integration.target>jboss713</jbossws.integration.target> </properties> <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-tests-integration</artifactId> + <artifactId>jbossws-jboss713-tests-integration</artifactId> </dependency> </dependencies> <build> @@ -722,19 +721,19 @@ </profile> <!-- - Name: jboss713 - Descr: JBoss-7.1.3 specific options + Name: jboss720 + Descr: JBoss-7.2.0 specific options --> <profile> - <id>jboss713</id> + <id>jboss720</id> <properties> - <jboss.version>${jboss713.version}</jboss.version> - <jbossws.integration.target>jboss713</jbossws.integration.target> + <jboss.version>${jboss720.version}</jboss.version> + <jbossws.integration.target>jboss720</jbossws.integration.target> </properties> <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-tests-integration</artifactId> + <artifactId>jbossws-jboss720-tests-integration</artifactId> </dependency> </dependencies> <build> @@ -764,14 +763,8 @@ <!--# [JBWS-2480] Soap attachments are dropped on server response--> <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - <!-- # [JBWS-3493] WS-Trust tests w/ PicketLink STS require PL 2.1.2.Final or greater --> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> - <!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed --> <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> - - <!--# [JBWS-3441] Support CDI interceptors for POJO JAX-WS services --> - <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> </excludes> </configuration> </plugin> @@ -780,14 +773,14 @@ </profile> <!-- - Name: jboss720 - Descr: JBoss-7.2.0 specific options + Name: jboss800 + Descr: JBoss-8.0.0 specific options --> <profile> - <id>jboss720</id> + <id>jboss800</id> <properties> - <jboss.version>${jboss720.version}</jboss.version> - <jbossws.integration.target>jboss720</jbossws.integration.target> + <jboss.version>${jboss800.version}</jboss.version> + <jbossws.integration.target>jboss800</jbossws.integration.target> </properties> <dependencies> <dependency> Added: stack/cxf/trunk/modules/testsuite/src/test/resources/jboss800/appclient-ws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/src/test/resources/jboss800/appclient-ws.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/src/test/resources/jboss800/appclient-ws.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -0,0 +1,115 @@ +<!-- + ~ 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. + --> + +<server xmlns="urn:jboss:domain:1.3"> + + <extensions> + <extension module="org.jboss.as.connector"/> + <extension module="org.jboss.as.ee"/> + <extension module="org.jboss.as.ejb3"/> + <extension module="org.jboss.as.logging"/> + <extension module="org.jboss.as.naming"/> + <extension module="org.jboss.as.remoting"/> + <extension module="org.jboss.as.security"/> + <extension module="org.jboss.as.webservices"/> + </extensions> + + <profile> + <subsystem xmlns="urn:jboss:domain:logging:1.1"> + <console-handler name="CONSOLE"> + <level name="INFO"/> + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> + </formatter> + </console-handler> + + <periodic-rotating-file-handler name="FILE"> + <level name="INFO"/> + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> + </formatter> + <file relative-to="jboss.server.log.dir" path="appclient.log"/> + <suffix value=".yyyy-MM-dd"/> + <append value="true"/> + </periodic-rotating-file-handler> + + <logger category="com.arjuna"> + <level name="WARN"/> + </logger> + <logger category="sun.rmi"> + <level name="WARN"/> + </logger> + <logger category="jacorb"> + <level name="WARN"/> + </logger> + <!-- set jacorb.config to ERROR to avoid the "jacorb.properties not found" messages during startup --> + <logger category="jacorb.config"> + <level name="ERROR"/> + </logger> + + <root-logger> + <level name="INFO"/> + <handlers> + <handler name="CONSOLE"/> + <handler name="FILE"/> + </handlers> + </root-logger> + </subsystem> + <subsystem xmlns="urn:jboss:domain:ee:1.0"/> + <subsystem xmlns="urn:jboss:domain:ejb3:1.2" /> + <subsystem xmlns="urn:jboss:domain:naming:1.0"/> + <subsystem xmlns="urn:jboss:domain:security:1.0"> + <security-domains> + <security-domain name="other" cache-type="default"> + <authentication> + <login-module code="UsersRoles" flag="required"/> + </authentication> + </security-domain> + <security-domain name="jboss-web-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + <security-domain name="jboss-ejb-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + </security-domains> + </subsystem> + <subsystem xmlns="urn:jboss:domain:remoting:1.1"> + <connector name="remoting-connector" socket-binding="remoting"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:webservices:1.1"/> + </profile> + + <interfaces> + <interface name="public"> + <inet-address value="${jboss.bind.address:127.0.0.1}"/> + </interface> + </interfaces> + + <socket-binding-group name="standard-sockets" default-interface="public"> + <socket-binding name="remoting" port="4448"/> + </socket-binding-group> + +</server> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2013-02-20 16:02:00 UTC (rev 17334) +++ stack/cxf/trunk/pom.xml 2013-02-20 16:04:11 UTC (rev 17335) @@ -64,14 +64,14 @@ <jbossws.common.version>2.2.0-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.2.0-SNAPSHOT</jbossws.shared.testsuite.version> - <jbossws.jboss711.version>4.1.1.Final</jbossws.jboss711.version> <jbossws.jboss712.version>4.1.1.Final</jbossws.jboss712.version> <jbossws.jboss713.version>4.1.1.Final</jbossws.jboss713.version> + <jbossws.jboss720.version>4.2.0-SNAPSHOT</jbossws.jboss720.version> <jbossws.native.version>4.1.1.Final</jbossws.native.version> - <jboss711.version>7.1.1.Final</jboss711.version> <jboss712.version>7.1.2.Final</jboss712.version> <jboss713.version>7.1.3.Final</jboss713.version> - <jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version> + <jboss720.version>7.2.0.Final</jboss720.version> + <jboss800.version>8.0.0.Alpha1-SNAPSHOT</jboss800.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <cxf.version>2.7.3-SNAPSHOT</cxf.version> <cxf.asm.version>3.3.1</cxf.asm.version> @@ -150,16 +150,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711-server-integration</artifactId> - <version>${jbossws.jboss711.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711-tests-integration</artifactId> - <version>${jbossws.jboss711.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss712-server-integration</artifactId> <version>${jbossws.jboss712.version}</version> </dependency> @@ -179,9 +169,19 @@ <version>${jbossws.jboss713.version}</version> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss720-server-integration</artifactId> + <version>${jbossws.jboss720.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss720-tests-integration</artifactId> + <version>${jbossws.jboss720.version}</version> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss720.version}</version> + <version>${jboss800.version}</version> </dependency> <dependency> <groupId>org.jboss.ws.projects</groupId> @@ -1346,18 +1346,6 @@ </profile> <!-- - Name: jboss711 - Descr: JBoss-7.1.1 specific options - --> - <profile> - <id>jboss711</id> - <properties> - <jbossws.integration.target>jboss711</jbossws.integration.target> - <jboss.home>${jboss711.home}</jboss.home> - </properties> - </profile> - - <!-- Name: jboss712 Descr: JBoss-7.1.2 specific options --> @@ -1382,8 +1370,8 @@ </profile> <!-- - Name: jboss720 - Descr: JBoss-7.2.0 specific options + Name: jboss711 + Descr: JBoss-7.1.1 specific options --> <profile> <id>jboss720</id> @@ -1394,6 +1382,18 @@ </profile> <!-- + Name: jboss800 + Descr: JBoss-8.0.0 specific options + --> + <profile> + <id>jboss800</id> + <properties> + <jbossws.integration.target>jboss800</jbossws.integration.target> + <jboss.home>${jboss800.home}</jboss.home> + </properties> + </profile> + + <!-- Name: smoketest Descr: Executes the smoke tests -->