Author: alessio.soldano(a)jboss.com Date: 2011-11-16 05:48:30 -0500 (Wed, 16 Nov 2011) New Revision: 15266 Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/dist/pom.xml 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/resources/src/main/resources/resources/jbossws-deploy-macros.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: [JBWS-3381] Support AS 7.0.1 / 7.0.2 containers + minor testsuite excludes review Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2011-11-16 10:33:37 UTC (rev 15265) +++ stack/cxf/trunk/build.xml 2011-11-16 10:48:30 UTC (rev 15266) @@ -67,12 +67,18 @@ <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> + <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> - <fail message="jboss home not set, use jboss600.home=value, jboss610.home=value, jboss700.home=value or jboss710.home=value to set"> + <fail message="jboss home not set, use jboss600.home=value, jboss610.home=value, jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set"> <condition> <and> <not> @@ -85,6 +91,12 @@ <isset property="jboss700.home"/> </not> <not> + <isset property="jboss701.home"/> + </not> + <not> + <isset property="jboss702.home"/> + </not> + <not> <isset property="jboss710.home"/> </not> </and> @@ -95,6 +107,8 @@ <echo message="jboss600.home=${jboss600.home}"/> <echo message="jboss610.home=${jboss610.home}"/> <echo message="jboss700.home=${jboss700.home}"/> + <echo message="jboss701.home=${jboss701.home}"/> + <echo message="jboss702.home=${jboss702.home}"/> <echo message="jboss710.home=${jboss710.home}"/> </target> Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2011-11-16 10:33:37 UTC (rev 15265) +++ stack/cxf/trunk/modules/dist/pom.xml 2011-11-16 10:48:30 UTC (rev 15266) @@ -42,6 +42,20 @@ <dependency> <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-server</artifactId> <version>${project.version}</version> </dependency> @@ -167,6 +181,38 @@ </exclusions> </dependency> + <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> + <!--junit--> <dependency> <groupId>junit</groupId> @@ -226,6 +272,12 @@ <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> + <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> @@ -262,6 +314,18 @@ <scope>provided</scope> </dependency> <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.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <scope>provided</scope> Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-11-16 10:33:37 UTC (rev 15265) +++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-11-16 10:48:30 UTC (rev 15266) @@ -6,10 +6,12 @@ jboss600.home=(a)jboss600.home@ jboss610.home=(a)jboss610.home@ jboss700.home=(a)jboss700.home@ +jboss701.home=(a)jboss701.home@ +jboss702.home=(a)jboss702.home@ jboss710.home=(a)jboss710.home@ -# The JBoss server under test. This can be [jboss600|jboss610|jboss700|jboss710] -jbossws.integration.target=jboss610 +# The JBoss server under test. This can be [jboss600|jboss610|jboss700|jboss701|jboss702|jboss710] +jbossws.integration.target=jboss700 # The JBoss settings jboss.server.instance=default Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-11-16 10:33:37 UTC (rev 15265) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-11-16 10:48:30 UTC (rev 15266) @@ -96,10 +96,10 @@ </target> <!-- ================================================================== --> - <!-- Prepare Deployment Structure JBoss-7.0.0 --> + <!-- Prepare Deployment Structure JBoss-7.0.x --> <!-- ================================================================== --> - <target name="deploy-structure-jboss700" depends="prepare-deploy"> + <target name="deploy-structure-jboss70x" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> <path id="jbossws-common.path"> @@ -113,6 +113,7 @@ <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> @@ -125,7 +126,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss700" depends="undeploy-jboss700,deploy-structure-jboss700,check-spring,install-spring-module" description="Deploy jbossws to jboss700"> + <target name="deploy-jboss700" depends="undeploy-jboss700,deploy-structure-jboss70x,check-spring,install-spring-module" 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}"> @@ -146,6 +147,64 @@ </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-module" 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-module" 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.0 --> <!-- ================================================================== --> @@ -163,6 +222,7 @@ <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="jboss710"/> </antcall> </target> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2011-11-16 10:33:37 UTC (rev 15265) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2011-11-16 10:48:30 UTC (rev 15266) @@ -41,11 +41,15 @@ <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/> <property name="jboss610.available.file" value="${jboss610.client}/jboss-client.jar"/> <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"/> <available property="jboss600.available" file="${jboss600.available.file}"/> <available property="jboss610.available" file="${jboss610.available.file}"/> <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}"/> <tstamp> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-11-16 10:33:37 UTC (rev 15265) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-11-16 10:48:30 UTC (rev 15266) @@ -54,7 +54,11 @@ </or> </condition> <condition property="jbossws.integration.jboss700" value="true"> - <equals arg1="${jbossws.integration.target}" arg2="jboss700"/> + <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"/> 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 2011-11-16 10:33:37 UTC (rev 15265) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-11-16 10:48:30 UTC (rev 15266) @@ -98,6 +98,8 @@ <include>org.jboss.ws:jbossws-jboss600:jar</include> <include>org.jboss.ws:jbossws-jboss610: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> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> @@ -120,6 +122,28 @@ <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> + <scope>provided</scope> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> + + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <includes> + <include>org.jboss.ws:jbossws-jboss702: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-shared-testsuite:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2011-11-16 10:33:37 UTC (rev 15265) +++ stack/cxf/trunk/modules/resources/pom.xml 2011-11-16 10:48:30 UTC (rev 15266) @@ -44,6 +44,8 @@ <configuration> <excludes> <exclude>**/jbossws-jboss700/**</exclude> + <exclude>**/jbossws-jboss701/**</exclude> + <exclude>**/jbossws-jboss702/**</exclude> </excludes> </configuration> </execution> @@ -56,6 +58,24 @@ <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> + <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> </executions> </plugin> </plugins> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-11-16 10:33:37 UTC (rev 15265) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-11-16 10:48:30 UTC (rev 15266) @@ -311,6 +311,7 @@ <attribute name="thirdpartydir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> + <attribute name="modules-jbossid"/> <sequential> <!-- libraries --> <copy todir="@{targetdir}/org/jboss/ws/jaxws-client/main" flatten="false" overwrite="true"> @@ -386,14 +387,14 @@ </copy> <!-- module.xml files --> <installModules targetDir="@{targetdir}"> - <fileset dir="@{thirdpartydir}/modules/@{jbossid}"> + <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}"> <include name="**/module.xml"/> <exclude name="**/jboss/as/webservices/**/module.xml"/> <exclude name="**/spring/**/module.xml"/> </fileset> </installModules> <copy toDir="@{targetdir}"> - <fileset dir="@{thirdpartydir}/modules/@{jbossid}"> + <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}"> <include name="**/jboss/as/webservices/**/module.xml"/> </fileset> </copy> @@ -437,7 +438,7 @@ <target name="deploy-jbossws-cxf-modules"> <fail message="installserver must be specified" unless="installserver"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> - <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/> <macro-deploy-jbossws-deployment targetdir="${installserver}/standalone/deployments/jbossws-console.war" thirdpartydir="${thirdpartydir}"/> <touch file="${installserver}/standalone/deployments/jbossws-console.war.dodeploy"/> </target> 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 2011-11-16 10:33:37 UTC (rev 15265) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-11-16 10:48:30 UTC (rev 15266) @@ -47,6 +47,24 @@ <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 Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-16 10:33:37 UTC (rev 15265) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-16 10:48:30 UTC (rev 15266) @@ -1079,7 +1079,7 @@ <!-- TODO: JMX client to AS7 server --> <exclude>org/jboss/test/ws/management/recording/**</exclude> - <!-- TODO: will we support wars bundled in jars on AS7? --> + <!--# [JBAS-9188] On AS7 We don't support nested EJB & WAR archives neither in .sar nor in .jar archives --> <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude> <!-- [AS7-1101][JBWS-3322], fixed on AS 7.0.1 & above --> @@ -1099,11 +1099,194 @@ <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> - <!-- TODO: investigate --> + <!-- # [JBWS-3205] JDKLogManager not used --> + <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</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> + + <!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 --> + <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> + + <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only --> + <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> + + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </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> + <!-- 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> + + <!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives --> + <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude> + + <!--# Seems MSFT interop. endpoints are down :(--> + <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude> + + <!-- ////////////////////////// --> + <!-- AS7 integration exclusions --> + <!-- ////////////////////////// --> + + <!-- [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/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> + + <!-- TODO: JMX client to AS7 server --> + <exclude>org/jboss/test/ws/management/recording/**</exclude> + + <!--# [JBAS-9188] On AS7 We don't support nested EJB & WAR archives neither in .sar nor in .jar archives --> + <exclude>org/jboss/test/ws/jaxws/jbws2630/**</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> - <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase*</exclude> <!-- # [JBWS-3205] JDKLogManager not used --> <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude> @@ -1123,7 +1306,7 @@ <!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 --> <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> - <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only --> + <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only --> <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> </excludes> @@ -1132,7 +1315,194 @@ </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> + <!-- 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> + + <!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives --> + <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude> + + <!--# Seems MSFT interop. endpoints are down :(--> + <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude> + + <!-- ////////////////////////// --> + <!-- AS7 integration exclusions --> + <!-- ////////////////////////// --> + + <!-- [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/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> + + <!-- TODO: JMX client to AS7 server --> + <exclude>org/jboss/test/ws/management/recording/**</exclude> + + <!--# [JBAS-9188] On AS7 We don't support nested EJB & WAR archives neither in .sar nor in .jar archives --> + <exclude>org/jboss/test/ws/jaxws/jbws2630/**</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-3205] JDKLogManager not used --> + <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</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> + + <!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 --> + <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> + + <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only --> + <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> + + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <!-- Name: jboss710 Descr: JBoss-7.1.0 specific options Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-11-16 10:33:37 UTC (rev 15265) +++ stack/cxf/trunk/pom.xml 2011-11-16 10:48:30 UTC (rev 15266) @@ -53,7 +53,11 @@ <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version> <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version> <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version> + <jbossws.jboss701.version>4.0.0-SNAPSHOT</jbossws.jboss701.version> + <jbossws.jboss702.version>4.0.0-SNAPSHOT</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.Alpha2-SNAPSHOT</jboss710.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <cxf.version>2.4.4</cxf.version> @@ -162,6 +166,28 @@ <classifier>tests-integration</classifier> </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.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <version>${jboss710.version}</version> @@ -1276,6 +1302,30 @@ </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 -->