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

Author: asoldano Date: 2013-12-13 07:26:19 -0500 (Fri, 13 Dec 2013) New Revision: 18177 Removed: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/ stack/cxf/trunk/modules/testsuite/src/test/resources/jboss712/ stack/cxf/trunk/modules/testsuite/src/test/resources/jboss713/ 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-testsuite.xml stack/cxf/trunk/modules/dist/src/main/distro/build.xml stack/cxf/trunk/modules/resources/pom.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java stack/cxf/trunk/pom.xml Log: [JBWS-3740] Drop AS 7.1.x support Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/build.xml 2013-12-13 12:26:19 UTC (rev 18177) @@ -68,12 +68,6 @@ <arg line="${maven.opts} help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss712.home" value="${profiles.profile.properties.jboss712.home}"> - <isset property="profiles.profile.properties.jboss712.home"/> - </condition> - <condition property="jboss713.home" value="${profiles.profile.properties.jboss713.home}"> - <isset property="profiles.profile.properties.jboss713.home"/> - </condition> <condition property="jboss720.home" value="${profiles.profile.properties.jboss720.home}"> <isset property="profiles.profile.properties.jboss720.home"/> </condition> @@ -82,16 +76,10 @@ </condition> - <fail message="Application server home not set, jboss712.home=value, jboss713.home=value, jboss720.home=value or wildfly800.home=value to set"> + <fail message="Application server home not set, jboss720.home=value or wildfly800.home=value to set"> <condition> <and> <not> - <isset property="jboss712.home"/> - </not> - <not> - <isset property="jboss713.home"/> - </not> - <not> <isset property="jboss720.home"/> </not> <not> @@ -102,8 +90,6 @@ </fail> <echo/> - <echo message="jboss712.home=${jboss712.home}"/> - <echo message="jboss713.home=${jboss713.home}"/> <echo message="jboss720.home=${jboss720.home}"/> <echo message="wildfly800.home=${wildfly800.home}"/> </target> Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/dist/pom.xml 2013-12-13 12:26:19 UTC (rev 18177) @@ -38,20 +38,6 @@ <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss712</classifier> - </dependency> - - <dependency> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-resources</artifactId> - <version>${project.version}</version> - <classifier>jboss713</classifier> - </dependency> - - <dependency> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-resources</artifactId> - <version>${project.version}</version> <classifier>jboss720</classifier> </dependency> @@ -126,16 +112,6 @@ <!-- container integration --> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-server-integration</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-server-integration</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss720-server-integration</artifactId> <scope>provided</scope> </dependency> @@ -198,12 +174,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-jboss712.txt"> - <param name="targetName" expression="jboss712" /> - </xslt> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss713.txt"> - <param name="targetName" expression="jboss713" /> - </xslt> <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> @@ -238,16 +208,6 @@ <!-- Libraries required for running binary distro testsuite and not available on server--> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-tests-integration</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-tests-integration</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss720-tests-integration</artifactId> <scope>provided</scope> </dependency> Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2013-12-13 12:26:19 UTC (rev 18177) @@ -13,8 +13,6 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss712 - ant deploy-jboss713 ant deploy-jboss720 ant deploy-wildfly800 @@ -22,7 +20,7 @@ server. In order to do that, please add the -Dspring=true property option when running the ant script: - ant -Dspring=true deploy-jboss713 + ant -Dspring=true deploy-jboss720 Please note Spring is required for advanced configuration only, whenever users want to provide their own jbossws-cxf.xml Spring configuration file. Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2013-12-13 12:26:19 UTC (rev 18177) @@ -3,13 +3,11 @@ # # Optional JBoss Home -jboss712.home=(a)jboss712.home@ -jboss713.home=(a)jboss713.home@ jboss720.home=(a)jboss720.home@ wildfly800.home=(a)wildfly800.home@ # The JBoss server under test. This can be [jboss712|jboss713|jboss720|wildfly800] -jbossws.integration.target=jboss713 +jbossws.integration.target=jboss720 # The JBoss settings jboss.bind.address=localhost Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-12-13 12:26:19 UTC (rev 18177) @@ -25,98 +25,6 @@ <project> <!-- ================================================================== --> - <!-- Prepare Deployment Structure JBoss-7.1.x --> - <!-- ================================================================== --> - - <target name="deploy-structure-jboss71x" 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-as7" inheritall="false"> - <param name="installserver" value="${deploy.structure}/modules"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="modules-jbossid" value="jboss710"/> - </antcall> - <copy toDir="${deploy.structure}/modules"> - <fileset dir="${deploy.artifacts.dir}/modules/jboss710"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> - </target> - - <!-- ================================================================== --> - <!-- Deployment jboss712 --> - <!-- ================================================================== --> - - <target name="target-jboss712"> - <property name="jbossws.integration.target" value="jboss712"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss712" depends="undeploy-jboss712,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss712"> - <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/> - <copy todir="${jboss712.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="${jboss712.home}/modules"> - <fileset dir="${deploy.structure}/modules"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> - - <target name="undeploy-jboss712" depends="target-jboss712,init" description="Remove jbossws from jboss712"> - <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss712.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> - </target> - - <!-- ================================================================== --> - <!-- Deployment jboss713 --> - <!-- ================================================================== --> - - <target name="target-jboss713"> - <property name="jbossws.integration.target" value="jboss713"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss713" depends="undeploy-jboss713,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss713"> - <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/> - <copy todir="${jboss713.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="${jboss713.home}/modules"> - <fileset dir="${deploy.structure}/modules"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> - - <target name="undeploy-jboss713" depends="target-jboss713,init" description="Remove jbossws from jboss713"> - <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss713.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> - </target> - - <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-7.2.x --> <!-- ================================================================== --> @@ -254,14 +162,6 @@ </condition> </target> - <target name="install-spring-module71x" if="spring-required"> - <antcall target="deploy-spring-module" inheritall="false"> - <param name="installserver" value="${deploy.structure}/modules"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modules-jbossid" value="jboss710"/> - </antcall> - </target> - <target name="install-spring-module72x" if="spring-required"> <antcall target="deploy-spring-module" inheritall="false"> <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2013-12-13 12:26:19 UTC (rev 18177) @@ -33,13 +33,9 @@ <!-- Load jbossws.integration.target properties --> <property file="${target.properties.file}"/> - <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="wildfly800.available.file" value="${wildfly800.home}/jboss-modules.jar"/> - <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="wildfly800.available" file="${wildfly800.available.file}"/> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2013-12-13 12:26:19 UTC (rev 18177) @@ -31,12 +31,6 @@ <target name="tests-prepare" depends="prepare"> <!-- Define jboss.home --> - <condition property="jboss.home" value="${jboss712.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> - </condition> - <condition property="jboss.home" value="${jboss713.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss713"/> - </condition> <condition property="jboss.home" value="${jboss720.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss720"/> </condition> @@ -120,7 +114,7 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss71x,tests-classpath-jboss72x,tests-classpath-wildfly80x"> + <target name="tests-classpath" depends="tests-classpath-jboss72x,tests-classpath-wildfly80x"> <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="integration.target.javac.classpath"/> @@ -130,169 +124,6 @@ <path refid="integration.target.client.classpath"/> </path> </target> - - <target name="tests-classpath-jboss71x" depends="tests-prepare" if="jbossws.integration.jboss71x"> - - <!-- Java Endorsed --> - <condition property="endorsed.dirs" value="${jboss.home}/modules/javax/xml/ws/api/main/"> - <isset property="jboss.home"/> - </condition> - - <path id="integration.target.javac.classpath"> - <fileset dir="${jboss.home}/modules/javax/activation/api/main/"> - <include name="activation-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/mail/api/main/"> - <include name="mail-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/"> - <include name="jboss-common-core-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/logging/main/"> - <include name="jboss-logging-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/picketlink/main/"> - <include name="picketlink-core*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/ejb/api/main/"> - <include name="jboss-ejb-api_3.1_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/ejb3/main/"> - <include name="jboss-ejb3-ext-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/servlet/api/main/"> - <include name="jboss-servlet-api_3.0_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/annotation/api/main/"> - <include name="jboss-annotations-api_1.1_spec-*.jar"/> - </fileset> - </path> - - <!-- - The 's.client.classpath' contains jars that are available in the target container's client directory. - There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir. - - The 'ws.stack.classpath' contains jars that come with a specific stack distribution. - The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. - --> - <path id="integration.target.client.classpath"> - <!-- included from thirdparty local dir as it's not installed on AS - START --> - <pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/> - <!-- included from thirdparty local dir as it's not installed on AS - END --> - <pathelement location="${jboss.home}/jboss-modules.jar"/> - <fileset dir="${jboss.home}/modules/org/jboss/logging/main/"> - <include name="jboss-logging-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/as/controller/main/"> - <include name="jboss-as-controller-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/as/controller-client/main/"> - <include name="jboss-as-controller-client-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/as/server/main/"> - <include name="jboss-as-server-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/as/protocol/main/"> - <include name="jboss-as-protocol-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/dmr/main/"> - <include name="jboss-dmr-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/marshalling/main/"> - <include name="jboss-marshalling-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/slf4j/main/"> - <include name="slf4j-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/slf4j/jcl-over-slf4j/main/"> - <include name="jcl-over-slf4j-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/slf4j/impl/main/"> - <include name="slf4j-jboss-logmanager-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/logmanager/main/"> - <include name="jboss-logmanager-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/apache/log4j/main/"> - <include name="log4j-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/mail/api/main/"> - <include name="mail-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/servlet/api/main/"> - <include name="jboss-servlet-api_3.0_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/transaction/api/main/"> - <include name="jboss-transaction-api_1.1_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/threads/main/"> - <include name="jboss-threads-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/picketbox/main/"> - <include name="picketbox-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/picketlink/main/"> - <include name="picketlink-core*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/ejb/api/main/"> - <include name="jboss-ejb-api_3.1_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/ejb-client/main/"> - <include name="jboss-ejb-client-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/apache/xerces/main/"> - <include name="xercesImpl-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/"> - <include name="jboss-common-core-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/javassist/main/"> - <include name="javassist-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/security/jacc/api/main/"> - <include name="jboss-jacc-api*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/remoting3/main/"> - <include name="jboss-remoting-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/marshalling/river/main/"> - <include name="jboss-marshalling-river-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/remoting3/remoting-jmx/main/"> - <include name="remoting-jmx-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/sasl/main/"> - <include name="jboss-sasl-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/netty/main/"> - <include name="netty-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/xb/main/"> - <include name="jbossxb-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/joda/time/main/"> - <include name="joda-time-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/apache/xalan/main/"> - <include name="serializer-*.jar"/> - <include name="xalan-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/codehaus/woodstox/main/"> - <include name="woodstox-core-asl-*.jar"/> - <include name="stax2-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/xnio/main/"> - <include name="xnio-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/xnio/nio/main/"> - <include name="xnio-nio-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/remote-naming/main/"> - <include name="jboss-remote-naming-*.jar"/> - </fileset> - <pathelement location="${tools.jar}"/> - </path> - </target> <target name="tests-classpath-jboss72x" depends="tests-prepare" if="jbossws.integration.jboss72x"> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-12-13 12:26:19 UTC (rev 18177) @@ -57,13 +57,6 @@ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <echo message="integration.target=${jbossws.integration.target}"/> - <condition property="jbossws.integration.jboss71x" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss713"/> - </or> - </condition> - <condition property="jbossws.integration.jboss72x" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss720"/> Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/resources/pom.xml 2013-12-13 12:26:19 UTC (rev 18177) @@ -51,24 +51,6 @@ <phase>package</phase> </execution> <execution> - <id>jboss712</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss712</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss712/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> - <id>jboss713</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss713</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss713/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> <id>jboss720</id> <goals><goal>jar</goal></goals> <phase>package</phase> 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-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2013-12-13 12:26:19 UTC (rev 18177) @@ -31,24 +31,6 @@ <copy file="${src.dir}/jbossws-cxf-config-as7.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-jboss712/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" - /> - <copy - file="${src.dir}/jbossws-jaxrpc-config-as7.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-jboss720/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java 2013-12-13 12:26:19 UTC (rev 18177) @@ -107,15 +107,11 @@ * @throws Exception */ public void testDefaultClientConfigurationInContainer() throws Exception { - if (!isTargetJBoss71()) { - assertEquals("1", runTestInContainer("testDefaultClientConfiguration")); - } + assertEquals("1", runTestInContainer("testDefaultClientConfiguration")); } public void testDefaultClientConfigurationOnDispatchInContainer() throws Exception { - if (!isTargetJBoss71()) { - assertEquals("1", runTestInContainer("testDefaultClientConfigurationOnDispatch")); - } + assertEquals("1", runTestInContainer("testDefaultClientConfigurationOnDispatch")); } /** Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2013-12-13 12:26:19 UTC (rev 18177) @@ -55,13 +55,11 @@ * @throws Exception */ public void testDefaultClientValidation() throws Exception { - if (!isTargetJBoss71()) { - try { - JBossWSTestHelper.deploy("jaxws-samples-schemavalidation.war"); - assertEquals("1", runInContainer("testDefaultClientValidation")); - } finally { - JBossWSTestHelper.undeploy("jaxws-samples-schemavalidation.war"); - } + try { + JBossWSTestHelper.deploy("jaxws-samples-schemavalidation.war"); + assertEquals("1", runInContainer("testDefaultClientValidation")); + } finally { + JBossWSTestHelper.undeploy("jaxws-samples-schemavalidation.war"); } } Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-12-13 12:26:19 UTC (rev 18177) @@ -614,146 +614,6 @@ </profile> <!-- - Name: jboss712 - Descr: JBoss-7.1.2 specific options - --> - <profile> - <id>jboss712</id> - <properties> - <jboss.version>${jboss712.version}</jboss.version> - <jbossws.integration.target>jboss712</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-tests-integration</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArguments> - <endorseddirs>${project.build.directory}/endorsed</endorseddirs> - </compilerArguments> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <excludes> - <!--# [CXF-1519] Explicitly set the namespace of a WebFault--> - <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> - - <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements--> - <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> - - <!--# [JBWS-2561] XOP request not properly inlined--> - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - - <!--# [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> - - <!--# [AS7-537] Fixed on AS 8 or greater --> - <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> - - <!--# [JBWS-3560] fastinfoset module is required in as712 --> - <exclude>org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase*</exclude> - - <!--# [WFLY-308] Provide facility for running ejb3 ws endpoints authorization independently --> - <exclude>org/jboss/test/ws/jaxws/handlerauth/HandlerAuthTestCase*</exclude> - - <!-- Manually setup KDC before run this test--> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: jboss713 - Descr: JBoss-7.1.3 specific options - --> - <profile> - <id>jboss713</id> - <properties> - <jboss.version>${jboss713.version}</jboss.version> - <jbossws.integration.target>jboss713</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-tests-integration</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArguments> - <endorseddirs>${project.build.directory}/endorsed</endorseddirs> - </compilerArguments> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <excludes> - <!--# [CXF-1519] Explicitly set the namespace of a WebFault--> - <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> - - <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements--> - <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> - - <!--# [JBWS-2561] XOP request not properly inlined--> - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - - <!--# [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> - - <!--# [AS7-537] Fixed on AS 8 or greater --> - <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> - - <!--# [JBWS-3560] fastinfoset module is required in as713 --> - <exclude>org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase*</exclude> - - <!--# [WFLY-308] Provide facility for running ejb3 ws endpoints authorization independently --> - <exclude>org/jboss/test/ws/jaxws/handlerauth/HandlerAuthTestCase*</exclude> - - <!-- Manually setup KDC before run this test--> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: jboss720 Descr: JBoss-7.2.0 specific options --> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2013-12-13 12:26:19 UTC (rev 18177) @@ -777,19 +777,6 @@ <include name="jboss-webservices.xml" /> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2241-as71.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2241/EJB3Bean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2241/EJB3RemoteInterface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2241/EndpointInterface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2241/EndpointService.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2241/META-INF-as71"> - <include name="jboss.xml" /> - <include name="jboss-ejb3.xml" /> - <include name="jboss-webservices.xml" /> - </metainf> - </jar> <!-- jaxws-jbws2250 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2250.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2250/WEB-INF/web.xml"> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2013-12-13 12:26:19 UTC (rev 18177) @@ -122,15 +122,11 @@ * @throws Exception */ public void testDefaultClientConfigurationInContainer() throws Exception { - if (!isTargetJBoss71()) { - assertEquals("1", runTestInContainer("testDefaultClientConfiguration")); - } + assertEquals("1", runTestInContainer("testDefaultClientConfiguration")); } public void testDefaultClientConfigurationOnDispatchInContainer() throws Exception { - if (!isTargetJBoss71()) { - assertEquals("1", runTestInContainer("testDefaultClientConfigurationOnDispatch")); - } + assertEquals("1", runTestInContainer("testDefaultClientConfigurationOnDispatch")); } /** Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2013-12-13 12:26:19 UTC (rev 18177) @@ -43,7 +43,7 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS2241TestCase.class, isTargetJBoss71() ? "jaxws-jbws2241-as71.jar" : "jaxws-jbws2241.jar", true); + return new JBossWSTestSetup(JBWS2241TestCase.class, "jaxws-jbws2241.jar", true); } private EndpointInterface getPort(String user, String pwd) throws MalformedURLException { Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2013-12-13 12:26:19 UTC (rev 18177) @@ -207,11 +207,6 @@ return JBossWSTestHelper.isTargetJBoss7(); } - public static boolean isTargetJBoss71() - { - return JBossWSTestHelper.isTargetJBoss71(); - } - public static boolean isTargetJBoss72() { return JBossWSTestHelper.isTargetJBoss72(); Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2013-12-13 12:26:19 UTC (rev 18177) @@ -151,36 +151,18 @@ return target.startsWith("jboss7"); } - public static boolean isTargetJBoss71() - { - String target = getIntegrationTarget(); - return target.startsWith("jboss71"); - } - public static boolean isTargetJBoss72() { String target = getIntegrationTarget(); return target.startsWith("jboss72"); } - @Deprecated - public static boolean isTargetJBoss8() - { - return isTargetJBoss8(); - } - public static boolean isTargetWildFly8() { String target = getIntegrationTarget(); return target.startsWith("wildfly8"); } - @Deprecated - public static boolean isTargetJBoss80() - { - return isTargetWildFly80(); - } - public static boolean isTargetWildFly80() { String target = getIntegrationTarget(); Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2013-12-13 09:57:24 UTC (rev 18176) +++ stack/cxf/trunk/pom.xml 2013-12-13 12:26:19 UTC (rev 18177) @@ -63,12 +63,8 @@ <jbossws.spi.version>2.3.0-SNAPSHOT</jbossws.spi.version> <jbossws.common.version>2.3.0-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version> - <jbossws.jboss712.version>4.2.1.Final</jbossws.jboss712.version> - <jbossws.jboss713.version>4.2.1.Final</jbossws.jboss713.version> <jbossws.jboss720.version>4.3.0-SNAPSHOT</jbossws.jboss720.version> <jbossws.native.version>4.1.2.Final</jbossws.native.version> - <jboss712.version>7.1.2.Final</jboss712.version> - <jboss713.version>7.1.3.Final</jboss713.version> <jboss720.version>7.2.0.Final</jboss720.version> <wildfly800.version>8.0.0.Beta2-SNAPSHOT</wildfly800.version> <ejb.api.version>1.0.2.Final</ejb.api.version> @@ -138,26 +134,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-server-integration</artifactId> - <version>${jbossws.jboss712.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-tests-integration</artifactId> - <version>${jbossws.jboss712.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-server-integration</artifactId> - <version>${jbossws.jboss713.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-tests-integration</artifactId> - <version>${jbossws.jboss713.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss720-server-integration</artifactId> <version>${jbossws.jboss720.version}</version> </dependency> @@ -1358,34 +1334,10 @@ </profile> <!-- - Name: jboss712 - Descr: JBoss-7.1.2 specific options + Name: jboss720 + Descr: JBoss-7.2.0 specific options --> <profile> - <id>jboss712</id> - <properties> - <jbossws.integration.target>jboss712</jbossws.integration.target> - <jboss.home>${jboss712.home}</jboss.home> - </properties> - </profile> - - <!-- - Name: jboss713 - Descr: JBoss-7.1.3 specific options - --> - <profile> - <id>jboss713</id> - <properties> - <jbossws.integration.target>jboss713</jbossws.integration.target> - <jboss.home>${jboss713.home}</jboss.home> - </properties> - </profile> - - <!-- - Name: jboss711 - Descr: JBoss-7.1.1 specific options - --> - <profile> <id>jboss720</id> <properties> <jbossws.integration.target>jboss720</jbossws.integration.target>