[jbossws-commits] JBossWS SVN: r15957 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/dist and 6 other directories.

Author: alessio.soldano(a)jboss.com Date: 2012-03-14 12:42:46 -0400 (Wed, 14 Mar 2012) New Revision: 15957 Removed: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss700/ Modified: stack/cxf/branches/jbossws-cxf-4.0.x/build.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/Install.txt stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/ant.properties.example stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-setup.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: [JBPAPP-8453] Removing jboss701,702,710 target container support Modified: stack/cxf/branches/jbossws-cxf-4.0.x/build.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/build.xml 2012-03-14 15:53:52 UTC (rev 15956) +++ stack/cxf/branches/jbossws-cxf-4.0.x/build.xml 2012-03-14 16:42:46 UTC (rev 15957) @@ -68,43 +68,20 @@ <arg line="${maven.opts} help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss701.home" value="${profiles.profile.properties.jboss701.home}"> - <isset property="profiles.profile.properties.jboss701.home"/> - </condition> - <condition property="jboss702.home" value="${profiles.profile.properties.jboss702.home}"> - <isset property="profiles.profile.properties.jboss702.home"/> - </condition> - <condition property="jboss710.home" value="${profiles.profile.properties.jboss710.home}"> - <isset property="profiles.profile.properties.jboss710.home"/> - </condition> <condition property="jboss711.home" value="${profiles.profile.properties.jboss711.home}"> <isset property="profiles.profile.properties.jboss711.home"/> </condition> - <fail message="jboss home not set, use jboss701.home=value, jboss702.home=value, jboss710.home=value or jboss711.home=value to set"> + <fail message="jboss home not set, use jboss711.home=value to set"> <condition> - <and> - <not> - <isset property="jboss701.home"/> - </not> - <not> - <isset property="jboss702.home"/> - </not> - <not> - <isset property="jboss710.home"/> - </not> - <not> - <isset property="jboss711.home"/> - </not> - </and> + <not> + <isset property="jboss711.home"/> + </not> </condition> </fail> <echo/> - <echo message="jboss701.home=${jboss701.home}"/> - <echo message="jboss702.home=${jboss702.home}"/> - <echo message="jboss710.home=${jboss710.home}"/> <echo message="jboss711.home=${jboss711.home}"/> </target> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-03-14 15:53:52 UTC (rev 15956) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-03-14 16:42:46 UTC (rev 15957) @@ -33,27 +33,6 @@ <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss701</classifier> - </dependency> - - <dependency> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-resources</artifactId> - <version>${project.version}</version> - <classifier>jboss702</classifier> - </dependency> - - <dependency> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-resources</artifactId> - <version>${project.version}</version> - <classifier>jboss710</classifier> - </dependency> - - <dependency> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-resources</artifactId> - <version>${project.version}</version> <classifier>jboss711</classifier> </dependency> @@ -136,45 +115,6 @@ <scope>provided</scope> </dependency> - <!-- Container integrations --> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss701</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss702</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> - <scope>provided</scope> - </dependency> - <!--junit--> <dependency> <groupId>junit</groupId> @@ -225,15 +165,6 @@ <configuration> <tasks> <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-jboss701.txt"> - <param name="targetName" expression="jboss701" /> - </xslt> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss702.txt"> - <param name="targetName" expression="jboss702" /> - </xslt> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss710.txt"> - <param name="targetName" expression="jboss710" /> - </xslt> <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> @@ -264,24 +195,6 @@ <dependencies> <!-- Libraries required for running binary distro testsuite and not available on server--> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss701</artifactId> - <classifier>tests-integration</classifier> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss702</artifactId> - <classifier>tests-integration</classifier> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> - <classifier>tests-integration</classifier> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <scope>provided</scope> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/Install.txt 2012-03-14 15:53:52 UTC (rev 15956) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/Install.txt 2012-03-14 16:42:46 UTC (rev 15957) @@ -13,16 +13,13 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss701 - ant deploy-jboss702 - ant deploy-jboss710 ant deploy-jboss711 By default Spring Framework libraries are not installed to application server. In order to do that, please add the -Dspring=true property option when running the ant script: - ant -Dspring=true deploy-jboss710 + ant -Dspring=true deploy-jboss711 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/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/ant.properties.example 2012-03-14 15:53:52 UTC (rev 15956) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/ant.properties.example 2012-03-14 16:42:46 UTC (rev 15957) @@ -3,13 +3,10 @@ # # Optional JBoss Home -jboss701.home=(a)jboss701.home@ -jboss702.home=(a)jboss702.home@ -jboss710.home=(a)jboss710.home@ jboss711.home=(a)jboss711.home@ -# The JBoss server under test. This can be [jboss701|jboss702|jboss710|jboss711] -jbossws.integration.target=jboss710 +# The JBoss server under test. +jbossws.integration.target=jboss711 # The JBoss settings jboss.bind.address=localhost @@ -18,10 +15,6 @@ jbossws.deployer.authentication.username=admin jbossws.deployer.authentication.password=admin -# JBoss JMX invoker authentication (AS 7.0.x) -#jmx.authentication.username=admin -#jmx.authentication.password=admin - # Java Compiler options javac.debug=yes javac.deprecation=no Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-03-14 15:53:52 UTC (rev 15956) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-03-14 16:42:46 UTC (rev 15957) @@ -25,86 +25,6 @@ <project> <!-- ================================================================== --> - <!-- Prepare Deployment Structure JBoss-7.0.x --> - <!-- ================================================================== --> - - <target name="deploy-structure-jboss70x" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - - <path id="jbossws-common.path"> - <fileset dir="${deploy.artifacts.dir}"> - <include name="**/jbossws-common-tools.jar"/> - </fileset> - </path> - <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> - - <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> - <param name="installserver" value="${deploy.structure}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="modules-jbossid" value="jboss700"/> - </antcall> - </target> - - <!-- ================================================================== --> - <!-- Deployment JBoss701 --> - <!-- ================================================================== --> - - <target name="target-jboss701"> - <property name="jbossws.integration.target" value="jboss701"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss701" depends="undeploy-jboss701,deploy-structure-jboss70x,check-spring,install-spring-module70x" description="Deploy jbossws to jboss701"> - <fail message="Not available: ${jboss701.available.file}" unless="jboss701.available"/> - <copy todir="${jboss701.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="${jboss701.home}/modules"> - <fileset dir="${deploy.structure}/modules"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> - - <target name="undeploy-jboss701" depends="target-jboss701,init" description="Remove jbossws from jboss701"> - <fail message="Not available: ${jboss701.available.file}" unless="jboss701.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss701.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> - </target> - - <!-- ================================================================== --> - <!-- Deployment JBoss702 --> - <!-- ================================================================== --> - - <target name="target-jboss702"> - <property name="jbossws.integration.target" value="jboss702"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss702" depends="undeploy-jboss702,deploy-structure-jboss70x,check-spring,install-spring-module70x" description="Deploy jbossws to jboss702"> - <fail message="Not available: ${jboss702.available.file}" unless="jboss702.available"/> - <copy todir="${jboss702.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="${jboss702.home}/modules"> - <fileset dir="${deploy.structure}/modules"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> - - <target name="undeploy-jboss702" depends="target-jboss702,init" description="Remove jbossws from jboss702"> - <fail message="Not available: ${jboss702.available.file}" unless="jboss702.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss702.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> - </target> - - <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-7.1.x --> <!-- ================================================================== --> @@ -127,35 +47,6 @@ </target> <!-- ================================================================== --> - <!-- Deployment jboss710 --> - <!-- ================================================================== --> - - <target name="target-jboss710"> - <property name="jbossws.integration.target" value="jboss710"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss710"> - <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> - <copy todir="${jboss710.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="${jboss710.home}/modules"> - <fileset dir="${deploy.structure}/modules"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> - - <target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710"> - <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> - </target> - - <!-- ================================================================== --> <!-- Deployment jboss711 --> <!-- ================================================================== --> @@ -195,14 +86,6 @@ </condition> </target> - <target name="install-spring-module70x" if="spring-required"> - <antcall target="deploy-spring-module" inheritall="false"> - <param name="installserver" value="${deploy.structure}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modules-jbossid" value="jboss700"/> - </antcall> - </target> - <target name="install-spring-module71x" if="spring-required"> <antcall target="deploy-spring-module" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-setup.xml 2012-03-14 15:53:52 UTC (rev 15956) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-setup.xml 2012-03-14 16:42:46 UTC (rev 15957) @@ -33,17 +33,10 @@ <!-- Load jbossws.integration.target properties --> <property file="${target.properties.file}"/> - <property name="jboss700.modules" value="${jboss700.home}/modules"/> <property name="jboss710.modules" value="${jboss710.home}/modules"/> - <property name="jboss701.available.file" value="${jboss701.home}/jboss-modules.jar"/> - <property name="jboss702.available.file" value="${jboss702.home}/jboss-modules.jar"/> - <property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/> <property name="jboss711.available.file" value="${jboss711.home}/jboss-modules.jar"/> - <available property="jboss701.available" file="${jboss701.available.file}"/> - <available property="jboss702.available" file="${jboss702.available.file}"/> - <available property="jboss710.available" file="${jboss710.available.file}"/> <available property="jboss711.available" file="${jboss711.available.file}"/> <tstamp> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml 2012-03-14 15:53:52 UTC (rev 15956) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml 2012-03-14 16:42:46 UTC (rev 15957) @@ -58,15 +58,8 @@ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <echo message="integration.target=${jbossws.integration.target}"/> - <condition property="jbossws.integration.jboss700" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss701"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss702"/> - </or> - </condition> <condition property="jbossws.integration.jboss710" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss710"/> <equals arg1="${jbossws.integration.target}" arg2="jboss711"/> </or> </condition> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-14 15:53:52 UTC (rev 15956) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-14 16:42:46 UTC (rev 15957) @@ -90,17 +90,6 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss*:jar:*:tests-integration</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> - <scope>provided</scope> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> - <includes> <include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*:jboss*</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-03-14 15:53:52 UTC (rev 15956) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-03-14 16:42:46 UTC (rev 15957) @@ -43,33 +43,6 @@ <phase>package</phase> </execution> <execution> - <id>jboss701</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss701</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss701/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> - <id>jboss702</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss702</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss702/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> - <id>jboss710</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss710</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> <id>jboss711</id> <goals><goal>jar</goal></goals> <phase>package</phase> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/scripts/antrun-beans-config.xml 2012-03-14 15:53:52 UTC (rev 15956) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/scripts/antrun-beans-config.xml 2012-03-14 16:42:46 UTC (rev 15957) @@ -31,33 +31,6 @@ <copy file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss701/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" - /> - <copy - file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss701/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" - /> - - <copy - file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss702/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" - /> - <copy - file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss702/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" - /> - - <copy - file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" - /> - <copy - file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" - /> - - <copy - file="${src.dir}/jbossws-cxf-config-as7.xml" tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-14 15:53:52 UTC (rev 15956) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-14 16:42:46 UTC (rev 15957) @@ -569,590 +569,7 @@ </dependencies> </profile> - <!-- - Name: jboss701 - Descr: JBoss-7.0.1.Final specific options - --> - <profile> - <id>jboss701</id> - <properties> - <jboss.version>${jboss701.version}</jboss.version> - <jbossws.integration.target>jboss701</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnp-client</artifactId> - <version>5.0.5.Final</version> - </dependency> - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0-beta-1</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArguments> - <endorseddirs>${project.build.directory}/endorsed</endorseddirs> - </compilerArguments> - </configuration> - <executions> - <execution> - <id>default-testCompile</id> - <phase>test-compile</phase> - <configuration> - <testExcludes> - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - <!-- AS7 compilation excludes --> - <exclude>org/jboss/test/ws/jaxrpc/**</exclude> - <!-- EJB3 client API dependencies --> - <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> - </testExcludes> - </configuration> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <!-- TODO: replace with maven dependencies --> - <additionalClasspathElements> - <!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> - <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> - </additionalClasspathElements> - <excludes> - <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration--> - <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude> - - <!--# [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> - - <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored--> - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</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-2397] Fix jbws1797 testcase--> - <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> - - <!--# [JBAS-8363] Virtual host issue in JBossWeb--> - <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude> - - <!--# Seems MSFT interop. endpoints are down :(--> - <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude> - - <!-- # [JBWS-3434] Apache CXF STS integration available on AS 7.1 only --> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase*</exclude> - - <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 --> - <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude> - - <!-- [JBWS-3276] fixed since AS 7.1 --> - <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude> - - <!-- TODO: Injections support for WS components --> - <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> - <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</exclude> - - <!-- @WebServiceRef / webserviceref not implemented / ready yet on AS7.0.x --> - <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude> - - <!-- TODO: EJB3 DD driven deployments --> - <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude> - - <!-- [AS7-1101][JBWS-3322], fixed on AS 7.1.0 & above --> - <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude> - - <!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' --> - <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude> - - <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher --> - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> - - <!-- # [AS7-1338] Remote JNDI support for AS7 --> - <exclude>org/jboss/test/ws/jaxrpc/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> - - <!-- # [JBWS-3225] jbossws console not yet available --> - <exclude>org/jboss/test/ws/console/**</exclude> - - <!-- # [JBWS-3227] handlers config file not found on classpath --> - <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude> - - <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 --> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude> - - <!-- JAXR not available --> - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - - <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only --> - <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> - - <!-- # [AS7-2961] Fixed on AS 7.1.0 or greater only --> - <exclude>org/jboss/test/ws/jaxws/as2961/AS2961TestCase*</exclude> - - <!-- # [AS7-3581] Fixed on AS 7.1.0 or greater only --> - <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude> - - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: jboss702 - Descr: JBoss-7.0.2.Final specific options - --> - <profile> - <id>jboss702</id> - <properties> - <jboss.version>${jboss702.version}</jboss.version> - <jbossws.integration.target>jboss702</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnp-client</artifactId> - <version>5.0.5.Final</version> - </dependency> - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0-beta-1</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArguments> - <endorseddirs>${project.build.directory}/endorsed</endorseddirs> - </compilerArguments> - </configuration> - <executions> - <execution> - <id>default-testCompile</id> - <phase>test-compile</phase> - <configuration> - <testExcludes> - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - <!-- AS7 compilation excludes --> - <exclude>org/jboss/test/ws/jaxrpc/**</exclude> - <!-- EJB3 client API dependencies --> - <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> - </testExcludes> - </configuration> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <!-- TODO: replace with maven dependencies --> - <additionalClasspathElements> - <!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> - <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> - </additionalClasspathElements> - <excludes> - <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration--> - <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude> - - <!--# [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> - - <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored--> - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</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-2397] Fix jbws1797 testcase--> - <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> - - <!--# [JBAS-8363] Virtual host issue in JBossWeb--> - <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude> - - <!--# Seems MSFT interop. endpoints are down :(--> - <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude> - - <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 --> - <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude> - - <!-- [JBWS-3276] fixed since AS 7.1 --> - <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude> - - <!-- TODO: Injections support for WS components --> - <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> - <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</exclude> - - <!-- @WebServiceRef / webserviceref not implemented / ready yet on AS7.0.x --> - <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude> - - <!-- TODO: EJB3 DD driven deployments --> - <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude> - - <!-- [AS7-1101][JBWS-3322], fixed on AS 7.1.0 & above --> - <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude> - - <!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' --> - <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude> - - <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher --> - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> - - <!-- # [AS7-1338] Remote JNDI support for AS7 --> - <exclude>org/jboss/test/ws/jaxrpc/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> - - <!-- # [JBWS-3225] jbossws console not yet available --> - <exclude>org/jboss/test/ws/console/**</exclude> - - <!-- # [JBWS-3227] handlers config file not found on classpath --> - <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude> - - <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 --> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude> - - <!-- JAXR not available --> - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - - <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only --> - <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> - - <!-- # [AS7-2961] Fixed on AS 7.1.0 or greater only --> - <exclude>org/jboss/test/ws/jaxws/as2961/AS2961TestCase*</exclude> - - <!-- # [AS7-3581] Fixed on AS 7.1.0 or greater only --> - <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude> - - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: jboss710 - Descr: JBoss-7.1.0 specific options - --> - <profile> - <id>jboss710</id> - <properties> - <jboss.version>${jboss710.version}</jboss.version> - <jbossws.integration.target>jboss710</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-transactions</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-ejb-client</artifactId> - <version>1.0.2.Final</version> - <exclusions> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.xnio</groupId> - <artifactId>xnio-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0</version> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.12.1.GA</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>${jboss.xb.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>wutka-dtdparser</groupId> - <artifactId>dtdparser121</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.remoting3</groupId> - <artifactId>remoting-jmx</artifactId> - <version>1.0.0.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - <version>3.2.1.GA</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hornetq</groupId> - <artifactId>hornetq-jms</artifactId> - <version>2.2.11.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hornetq</groupId> - <artifactId>hornetq-core</artifactId> - <version>2.2.11.Final</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArguments> - <endorseddirs>${project.build.directory}/endorsed</endorseddirs> - </compilerArguments> - </configuration> - <executions> - <execution> - <id>default-testCompile</id> - <phase>test-compile</phase> - <configuration> - <testExcludes> - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - <!-- EJB3 client API dependencies --> - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> - </testExcludes> - </configuration> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </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> - <!-- TODO: replace with maven dependencies --> - <additionalClasspathElements> - <!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> - <!-- JBossWS Native Core version overwritten by jbossws-native stack install --> - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement> - <!-- JBossWS Native Core version available on 710 --> - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.1.GA.jar</additionalClasspathElement> - <!-- JBossWS Native Core version specified through system property --> - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement> - </additionalClasspathElements> - <excludes> - <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration--> - <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude> - - <!--# [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-2397] Fix jbws1797 testcase--> - <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> - - <!-- # Seems MSFT interop. endpoints are down :(--> - <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude> - - <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher // also see compile exclude above --> - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> - - <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 --> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude> - - <!-- # TODO: JAXR not available --> - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - - <!-- # TODO: appclient --> - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude> - - <!-- # TODO: remote JNDI support (non EJB objects) --> - <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude> - - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: jboss711 Descr: JBoss-7.1.1 specific options --> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-14 15:53:52 UTC (rev 15956) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-14 16:42:46 UTC (rev 15957) @@ -64,13 +64,7 @@ <jbossws.common.version>2.0.3-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.0.3-SNAPSHOT</jbossws.shared.testsuite.version> - <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version> - <jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version> - <jbossws.jboss710.version>4.0.3-SNAPSHOT</jbossws.jboss710.version> - <jboss701.version>7.0.1.Final</jboss701.version> - <jboss702.version>7.0.2.Final</jboss702.version> - <jboss710.version>7.1.0.Final</jboss710.version> - <jboss711.version>7.1.1.Final-SNAPSHOT</jboss711.version> + <jboss711.version>7.1.1.Final</jboss711.version> <!-- replace with the EAP6 snapshot version --> <ejb.api.version>1.0.1.Final</ejb.api.version> <cxf.version>2.4.6</cxf.version> <cxf.asm.version>3.3.1</cxf.asm.version> @@ -149,39 +143,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss701</artifactId> - <version>${jbossws.jboss701.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss701</artifactId> - <version>${jbossws.jboss701.version}</version> - <classifier>tests-integration</classifier> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss702</artifactId> - <version>${jbossws.jboss702.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss702</artifactId> - <version>${jbossws.jboss702.version}</version> - <classifier>tests-integration</classifier> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> - <version>${jbossws.jboss710.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> - <version>${jbossws.jboss710.version}</version> - <classifier>tests-integration</classifier> - </dependency> - <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <version>${jboss711.version}</version> @@ -1265,42 +1226,6 @@ </profile> <!-- - Name: jboss701 - Descr: JBoss-7.0.1.Final specific options - --> - <profile> - <id>jboss701</id> - <properties> - <jbossws.integration.target>jboss701</jbossws.integration.target> - <jboss.home>${jboss701.home}</jboss.home> - </properties> - </profile> - - <!-- - Name: jboss702 - Descr: JBoss-7.0.2.Final specific options - --> - <profile> - <id>jboss702</id> - <properties> - <jbossws.integration.target>jboss702</jbossws.integration.target> - <jboss.home>${jboss702.home}</jboss.home> - </properties> - </profile> - - <!-- - Name: jboss710 - Descr: JBoss-7.1.0 specific options - --> - <profile> - <id>jboss710</id> - <properties> - <jbossws.integration.target>jboss710</jbossws.integration.target> - <jboss.home>${jboss710.home}</jboss.home> - </properties> - </profile> - - <!-- Name: jboss711 Descr: JBoss-7.1.1 specific options -->