Author: alessio.soldano(a)jboss.com Date: 2012-02-21 04:57:17 -0500 (Tue, 21 Feb 2012) New Revision: 15695 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/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: Adding jboss711 target and removing 700 Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2012-02-21 09:56:44 UTC (rev 15694) +++ stack/cxf/trunk/build.xml 2012-02-21 09:57:17 UTC (rev 15695) @@ -68,9 +68,6 @@ <arg line="${maven.opts} help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}"> - <isset property="profiles.profile.properties.jboss700.home"/> - </condition> <condition property="jboss701.home" value="${profiles.profile.properties.jboss701.home}"> <isset property="profiles.profile.properties.jboss701.home"/> </condition> @@ -80,15 +77,15 @@ <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 jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set"> + <fail message="jboss home not set, use jboss701.home=value, jboss702.home=value, jboss710.home=value or jboss711.home=value to set"> <condition> <and> <not> - <isset property="jboss700.home"/> - </not> - <not> <isset property="jboss701.home"/> </not> <not> @@ -97,15 +94,18 @@ <not> <isset property="jboss710.home"/> </not> + <not> + <isset property="jboss711.home"/> + </not> </and> </condition> </fail> <echo/> - <echo message="jboss700.home=${jboss700.home}"/> <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> <target name="init" depends="mvn-settings,prepare,os-init"> Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2012-02-21 09:56:44 UTC (rev 15694) +++ stack/cxf/trunk/modules/dist/pom.xml 2012-02-21 09:57:17 UTC (rev 15695) @@ -33,13 +33,6 @@ <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss700</classifier> - </dependency> - - <dependency> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-resources</artifactId> - <version>${project.version}</version> <classifier>jboss701</classifier> </dependency> @@ -138,22 +131,6 @@ <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss700</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-jboss701</artifactId> <scope>provided</scope> <exclusions> @@ -234,9 +211,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-jboss700.txt"> - <param name="targetName" expression="jboss700" /> - </xslt> <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> @@ -246,6 +220,9 @@ <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> </tasks> </configuration> <goals> @@ -274,12 +251,6 @@ <!-- Libraries required for running binary distro testsuite and not available on server--> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss700</artifactId> - <classifier>tests-integration</classifier> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss701</artifactId> <classifier>tests-integration</classifier> <scope>provided</scope> Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2012-02-21 09:56:44 UTC (rev 15694) +++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2012-02-21 09:57:17 UTC (rev 15695) @@ -13,16 +13,16 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss700 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-jboss700 + ant -Dspring=true deploy-jboss710 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 2012-02-21 09:56:44 UTC (rev 15694) +++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2012-02-21 09:57:17 UTC (rev 15695) @@ -3,13 +3,13 @@ # # Optional JBoss Home -jboss700.home=(a)jboss700.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 [jboss700|jboss701|jboss702|jboss710] -jbossws.integration.target=jboss700 +jbossws.integration.target=jboss710 # 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 2012-02-21 09:56:44 UTC (rev 15694) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-02-21 09:57:17 UTC (rev 15695) @@ -47,35 +47,6 @@ </target> <!-- ================================================================== --> - <!-- Deployment JBoss700 --> - <!-- ================================================================== --> - - <target name="target-jboss700"> - <property name="jbossws.integration.target" value="jboss700"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss700" depends="undeploy-jboss700,deploy-structure-jboss70x,check-spring,install-spring-module70x" description="Deploy jbossws to jboss700"> - <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/> - <copy todir="${jboss700.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="${jboss700.home}/modules"> - <fileset dir="${deploy.structure}/modules"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> - - <target name="undeploy-jboss700" depends="target-jboss700,init" description="Remove jbossws from jboss700"> - <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss700.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> - </target> - - <!-- ================================================================== --> <!-- Deployment JBoss701 --> <!-- ================================================================== --> @@ -134,10 +105,10 @@ </target> <!-- ================================================================== --> - <!-- Prepare Deployment Structure JBoss-7.1.0 --> + <!-- Prepare Deployment Structure JBoss-7.1.x --> <!-- ================================================================== --> - <target name="deploy-structure-jboss710" depends="prepare-deploy"> + <target name="deploy-structure-jboss71x" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> <path id="jbossws-common.path"> @@ -164,7 +135,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss710,check-spring,install-spring-module71x" description="Deploy jbossws to jboss710"> + <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}"> @@ -185,6 +156,35 @@ </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}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + </target> + + <!-- ================================================================== --> <!-- Spring --> <!-- ================================================================== --> <target name="check-spring"> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2012-02-21 09:56:44 UTC (rev 15694) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2012-02-21 09:57:17 UTC (rev 15695) @@ -36,15 +36,15 @@ <property name="jboss700.modules" value="${jboss700.home}/modules"/> <property name="jboss710.modules" value="${jboss710.home}/modules"/> - <property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/> <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="jboss700.available" file="${jboss700.available.file}"/> <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> <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 2012-02-21 09:56:44 UTC (rev 15694) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-02-21 09:57:17 UTC (rev 15695) @@ -60,13 +60,15 @@ <condition property="jbossws.integration.jboss700" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss700"/> <equals arg1="${jbossws.integration.target}" arg2="jboss701"/> <equals arg1="${jbossws.integration.target}" arg2="jboss702"/> </or> </condition> <condition property="jbossws.integration.jboss710" value="true"> - <equals arg1="${jbossws.integration.target}" arg2="jboss710"/> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss710"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss711"/> + </or> </condition> <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.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 2012-02-21 09:56:44 UTC (rev 15694) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-21 09:57:17 UTC (rev 15695) @@ -79,7 +79,6 @@ <include>org.opensaml:xmltooling:jar</include> <include>joda-time:joda-time:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> - <include>org.jboss.ws:jbossws-jboss700:jar</include> <include>org.jboss.ws:jbossws-jboss701:jar</include> <include>org.jboss.ws:jbossws-jboss702:jar</include> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> @@ -93,17 +92,6 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss700: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:jbossws-jboss701:jar:*:tests-integration</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2012-02-21 09:56:44 UTC (rev 15694) +++ stack/cxf/trunk/modules/resources/pom.xml 2012-02-21 09:57:17 UTC (rev 15695) @@ -43,22 +43,12 @@ <phase>package</phase> <configuration> <excludes> - <exclude>**/jbossws-jboss700/**</exclude> <exclude>**/jbossws-jboss701/**</exclude> <exclude>**/jbossws-jboss702/**</exclude> </excludes> </configuration> </execution> <execution> - <id>jboss700</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss700</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss700/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> <id>jboss701</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 2012-02-21 09:56:44 UTC (rev 15694) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2012-02-21 09:57:17 UTC (rev 15695) @@ -31,15 +31,6 @@ <copy file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" - /> - <copy - file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" - /> - - <copy - file="${src.dir}/jbossws-cxf-config-as7.xml" tofile="${dest.dir}/jbossws-jboss701/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy @@ -65,6 +56,15 @@ 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 + file="${src.dir}/jbossws-jaxrpc-config-as7.xml" + tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" + /> + </target> </project> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-21 09:56:44 UTC (rev 15694) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-21 09:57:17 UTC (rev 15695) @@ -552,15 +552,16 @@ </dependencies> </profile> + <!-- - Name: jboss700 - Descr: JBoss-7.0.0.Final specific options + Name: jboss701 + Descr: JBoss-7.0.1.Final specific options --> <profile> - <id>jboss700</id> + <id>jboss701</id> <properties> - <jboss.version>${jboss700.version}</jboss.version> - <jbossws.integration.target>jboss700</jbossws.integration.target> + <jboss.version>${jboss701.version}</jboss.version> + <jbossws.integration.target>jboss701</jbossws.integration.target> </properties> <dependencies> <dependency> @@ -660,6 +661,9 @@ <!--# 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> + <!-- ////////////////////////// --> <!-- AS7 integration exclusions --> <!-- ////////////////////////// --> @@ -676,7 +680,7 @@ <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 --> + <!-- @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> @@ -687,20 +691,12 @@ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude> - <!-- # [JBWS-3330] fixed on AS 7.0.1 & above --> - <exclude>org/jboss/test/ws/management/recording/**</exclude> - - <!-- [AS7-1101][JBWS-3322], fixed on AS 7.0.1 & above --> + <!-- [AS7-1101][JBWS-3322], fixed on AS 7.1.0 & above --> <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude> <!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' --> <exclude>org/jboss/test/ws/jaxws/jbws3140/**</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> - <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher --> <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> @@ -742,16 +738,16 @@ </plugins> </build> </profile> - + <!-- - Name: jboss701 - Descr: JBoss-7.0.1.Final specific options + Name: jboss702 + Descr: JBoss-7.0.2.Final specific options --> <profile> - <id>jboss701</id> + <id>jboss702</id> <properties> - <jboss.version>${jboss701.version}</jboss.version> - <jbossws.integration.target>jboss701</jbossws.integration.target> + <jboss.version>${jboss702.version}</jboss.version> + <jbossws.integration.target>jboss702</jbossws.integration.target> </properties> <dependencies> <dependency> @@ -928,31 +924,51 @@ </plugins> </build> </profile> - + <!-- - Name: jboss702 - Descr: JBoss-7.0.2.Final specific options + Name: jboss710 + Descr: JBoss-7.1.0 specific options --> <profile> - <id>jboss702</id> + <id>jboss710</id> <properties> - <jboss.version>${jboss702.version}</jboss.version> - <jbossws.integration.target>jboss702</jbossws.integration.target> + <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.naming</groupId> - <artifactId>jnp-client</artifactId> - <version>5.0.5.Final</version> + <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> @@ -960,6 +976,11 @@ <version>2.0.0-beta-1</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> @@ -969,6 +990,69 @@ </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> </dependencies> <build> <plugins> @@ -986,11 +1070,8 @@ <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> + <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> </testExcludes> </configuration> <goals> @@ -1002,11 +1083,16 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> + <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 --> - <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> + <!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> + <!-- 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 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 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--> @@ -1019,9 +1105,6 @@ <!--# [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> @@ -1031,83 +1114,32 @@ <!--# [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 :(--> + <!-- # 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> + <!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 --> + <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> <!-- ////////////////////////// --> <!-- AS7 integration exclusions --> <!-- ////////////////////////// --> - <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 --> - <exclude>org/jboss/test/ws/jaxws/jbws3367/**</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-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 --> + <!-- # TODO: JAXR not available --> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - <!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 --> - <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> + <!-- # TODO: appclient --> + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude> - <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only --> - <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> + <!-- # TODO: remote JNDI support (non EJB objects) --> + <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</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> @@ -1116,14 +1148,14 @@ </profile> <!-- - Name: jboss710 - Descr: JBoss-7.1.0 specific options + Name: jboss711 + Descr: JBoss-7.1.1 specific options --> <profile> - <id>jboss710</id> + <id>jboss711</id> <properties> - <jboss.version>${jboss710.version}</jboss.version> - <jbossws.integration.target>jboss710</jbossws.integration.target> + <jboss.version>${jboss711.version}</jboss.version> + <jbossws.integration.target>jboss711</jbossws.integration.target> </properties> <dependencies> <dependency> @@ -1277,7 +1309,7 @@ <!-- 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 available on 710 --> + <!-- JBossWS Native Core version available on 711 --> <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 overwritten by jbossws-native stack install --> <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-02-21 09:56:44 UTC (rev 15694) +++ stack/cxf/trunk/pom.xml 2012-02-21 09:57:17 UTC (rev 15695) @@ -64,13 +64,12 @@ <jbossws.common.version>2.0.2-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version> - <jbossws.jboss700.version>4.0.1.GA</jbossws.jboss700.version> <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version> <jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version> - <jboss700.version>7.0.0.Final</jboss700.version> <jboss701.version>7.0.1.Final</jboss701.version> <jboss702.version>7.0.2.Final</jboss702.version> - <jboss710.version>7.1.0.Final-SNAPSHOT</jboss710.version> + <jboss710.version>7.1.0.Final</jboss710.version> + <jboss711.version>7.1.1.Final-SNAPSHOT</jboss711.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <cxf.version>2.5.2</cxf.version> <cxf.asm.version>3.3</cxf.asm.version> @@ -151,17 +150,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss700</artifactId> - <version>${jbossws.jboss700.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss700</artifactId> - <version>${jbossws.jboss700.version}</version> - <classifier>tests-integration</classifier> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss701</artifactId> <version>${jbossws.jboss701.version}</version> </dependency> @@ -182,6 +170,8 @@ <version>${jbossws.jboss702.version}</version> <classifier>tests-integration</classifier> </dependency> + <!-- TODO Move dependency below to jboss711.version and add dependency on org.jboss.ws:jbossws-jboss710:${jbossws.jboss710.version} + when 710 container integration is needed and created --> <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> @@ -1353,18 +1343,6 @@ </profile> <!-- - Name: jboss700 - Descr: JBoss-7.0.0.Final specific options - --> - <profile> - <id>jboss700</id> - <properties> - <jbossws.integration.target>jboss700</jbossws.integration.target> - <jboss.home>${jboss700.home}</jboss.home> - </properties> - </profile> - - <!-- Name: jboss701 Descr: JBoss-7.0.1.Final specific options --> @@ -1401,6 +1379,18 @@ </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: smoketest Descr: Executes the smoke tests -->