Author: asoldano Date: 2014-02-18 10:57:13 -0500 (Tue, 18 Feb 2014) New Revision: 18393 Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/distro/Install.txt stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml stack/cxf/trunk/modules/dist/src/main/distro/build.xml stack/cxf/trunk/modules/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 wildfly801 target and wildfly800 ASIL Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2014-02-18 15:33:56 UTC (rev 18392) +++ stack/cxf/trunk/build.xml 2014-02-18 15:57:13 UTC (rev 18393) @@ -74,9 +74,12 @@ <condition property="wildfly800.home" value="${profiles.profile.properties.wildfly800.home}"> <isset property="profiles.profile.properties.wildfly800.home"/> </condition> + <condition property="wildfly801.home" value="${profiles.profile.properties.wildfly801.home}"> + <isset property="profiles.profile.properties.wildfly801.home"/> + </condition> - <fail message="Application server home not set, jboss720.home=value or wildfly800.home=value to set"> + <fail message="Application server home not set, jboss720.home=value, wildfly800.home=value or wildfly801.home=value to set"> <condition> <and> <not> @@ -85,6 +88,9 @@ <not> <isset property="wildfly800.home"/> </not> + <not> + <isset property="wildfly801.home"/> + </not> </and> </condition> </fail> @@ -92,6 +98,7 @@ <echo/> <echo message="jboss720.home=${jboss720.home}"/> <echo message="wildfly800.home=${wildfly800.home}"/> + <echo message="wildfly801.home=${wildfly801.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 2014-02-18 15:33:56 UTC (rev 18392) +++ stack/cxf/trunk/modules/dist/pom.xml 2014-02-18 15:57:13 UTC (rev 18393) @@ -56,6 +56,13 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-resources</artifactId> + <version>${project.version}</version> + <classifier>wildfly801</classifier> + </dependency> + + <dependency> + <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-server</artifactId> <version>${project.version}</version> </dependency> @@ -122,6 +129,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly800-server-integration</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss</groupId> <artifactId>jandex</artifactId> </dependency> @@ -186,6 +198,9 @@ <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-wildfly800.txt"> <param name="targetName" expression="wildfly800" /> </xslt> + <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-wildfly801.txt"> + <param name="targetName" expression="wildfly801" /> + </xslt> </target> </configuration> <goals> @@ -218,6 +233,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly800-tests-integration</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.wildfly</groupId> <artifactId>wildfly-webservices-tests-integration</artifactId> <scope>provided</scope> Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2014-02-18 15:33:56 UTC (rev 18392) +++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2014-02-18 15:57:13 UTC (rev 18393) @@ -15,6 +15,7 @@ ant deploy-jboss720 ant deploy-wildfly800 + ant deploy-wildfly801 By default Spring Framework libraries are not installed to application server. In order to do that, please add the -Dspring=true property option when Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2014-02-18 15:33:56 UTC (rev 18392) +++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2014-02-18 15:57:13 UTC (rev 18393) @@ -5,8 +5,9 @@ # Optional JBoss Home jboss720.home=(a)jboss720.home@ wildfly800.home=(a)wildfly800.home@ +wildfly801.home=(a)wildfly801.home@ -# The JBoss server under test. This can be [jboss712|jboss713|jboss720|wildfly800] +# The JBoss server under test. This can be [jboss720|wildfly800|wildfly801] jbossws.integration.target=jboss720 # The JBoss settings Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2014-02-18 15:33:56 UTC (rev 18392) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2014-02-18 15:57:13 UTC (rev 18393) @@ -123,7 +123,7 @@ </target> <!-- ================================================================== --> - <!-- Deployment wildfly800 --> + <!-- Deployment wildfly800 --> <!-- ================================================================== --> <target name="target-wildfly800"> @@ -148,10 +148,39 @@ <target name="undeploy-wildfly800" depends="target-wildfly800,init" description="Remove jbossws from wildfly800"> <fail message="Not available: ${wildfly800.available.file}" unless="wildfly800.available"/> - <macro-undeploy-jbossws-modules targetdir="${wildfly800.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <macro-undeploy-jbossws-modules targetdir="${wildfly800.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target> <!-- ================================================================== --> + <!-- Deployment wildfly801 --> + <!-- ================================================================== --> + + <target name="target-wildfly801"> + <property name="jbossws.integration.target" value="wildfly801"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-wildfly801" depends="undeploy-wildfly801,deploy-structure-wildfly80x,check-spring,install-spring-module80x" description="Deploy jbossws to wildfly801"> + <fail message="Not available: ${wildfly801.available.file}" unless="wildfly801.available"/> + <copy todir="${wildfly801.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="${wildfly801.home}/modules/system/layers/base/"> + <fileset dir="${deploy.structure}/modules/system/layers/base"> + <include name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </installModules> + </target> + + <target name="undeploy-wildfly801" depends="target-wildfly801,init" description="Remove jbossws from wildfly801"> + <fail message="Not available: ${wildfly801.available.file}" unless="wildfly801.available"/> + <macro-undeploy-jbossws-modules targetdir="${wildfly801.home}/modules/system/layers/base" 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 2014-02-18 15:33:56 UTC (rev 18392) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2014-02-18 15:57:13 UTC (rev 18393) @@ -35,9 +35,11 @@ <property name="jboss720.available.file" value="${jboss720.home}/jboss-modules.jar"/> <property name="wildfly800.available.file" value="${wildfly800.home}/jboss-modules.jar"/> + <property name="wildfly801.available.file" value="${wildfly801.home}/jboss-modules.jar"/> <available property="jboss720.available" file="${jboss720.available.file}"/> <available property="wildfly800.available" file="${wildfly800.available.file}"/> + <available property="wildfly801.available" file="${wildfly801.available.file}"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-02-18 15:33:56 UTC (rev 18392) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-02-18 15:57:13 UTC (rev 18393) @@ -37,6 +37,9 @@ <condition property="jboss.home" value="${wildfly800.home}"> <equals arg1="${jbossws.integration.target}" arg2="wildfly800"/> </condition> + <condition property="jboss.home" value="${wildfly801.home}"> + <equals arg1="${jbossws.integration.target}" arg2="wildfly801"/> + </condition> <!-- Verify required properties that must be set before this file is imported --> <fail message="Tests output dir not set." unless="tests.output.dir"/> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2014-02-18 15:33:56 UTC (rev 18392) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2014-02-18 15:57:13 UTC (rev 18393) @@ -66,6 +66,7 @@ <condition property="jbossws.integration.wildfly80x" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="wildfly800"/> + <equals arg1="${jbossws.integration.target}" arg2="wildfly801"/> </or> </condition> 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 2014-02-18 15:33:56 UTC (rev 18392) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-02-18 15:57:13 UTC (rev 18393) @@ -111,7 +111,7 @@ <includes> <include>org.wildfly:wildfly-webservices-tests-integration:jar</include> </includes> - <outputFileNameMapping>jbossws-wildfly800-tests-integration.jar</outputFileNameMapping> + <outputFileNameMapping>jbossws-wildfly801-tests-integration.jar</outputFileNameMapping> <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2014-02-18 15:33:56 UTC (rev 18392) +++ stack/cxf/trunk/modules/resources/pom.xml 2014-02-18 15:57:13 UTC (rev 18393) @@ -68,6 +68,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-wildfly800/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>wildfly801</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>wildfly801</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-wildfly801/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> 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 2014-02-18 15:33:56 UTC (rev 18392) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2014-02-18 15:57:13 UTC (rev 18393) @@ -42,6 +42,11 @@ file="${src.dir}/jbossws-cxf-config-as8.xml" tofile="${dest.dir}/jbossws-wildfly800/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> + + <copy + file="${src.dir}/jbossws-cxf-config-as8.xml" + tofile="${dest.dir}/jbossws-wildfly801/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + /> </target> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2014-02-18 15:33:56 UTC (rev 18392) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-02-18 15:57:13 UTC (rev 18393) @@ -695,6 +695,94 @@ </properties> <dependencies> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly800-tests-integration</artifactId> + </dependency> + <!-- LittleProxy depencency declared in this profile as other profiles require different exclusions --> + <dependency> + <groupId>org.littleshoot</groupId> + <artifactId>littleproxy</artifactId> + <version>${org.littleshoot.littleproxy.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache-core</artifactId> + </exclusion> + <!-- Let the container messaging subsystem control the Netty dependency version --> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerArguments> + <endorseddirs>${project.build.directory}/endorsed</endorseddirs> + </compilerArguments> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> + <excludes combine.children="append"> + <!--# JAX-RPC removed in EE 7 --> + <exclude>org/jboss/test/ws/jaxrpc/**</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> + + <!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed --> + <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> + + <!-- # [JBWS-3620] Authentication failures w/ Undertow --> + <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude> + + <!-- Manually setup KDC before run this test--> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: wildfly801 + Descr: WildFly-8.0.1 specific options + --> + <profile> + <id>wildfly801</id> + <properties> + <jboss.version>${wildfly801.version}</jboss.version> + <jbossws.integration.target>wildfly801</jbossws.integration.target> + <remote.port>8080</remote.port> + <remote.protocol>http-remoting</remote.protocol> + </properties> + <dependencies> + <dependency> <groupId>org.wildfly</groupId> <artifactId>wildfly-webservices-tests-integration</artifactId> <version>${jboss.version}</version> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2014-02-18 15:33:56 UTC (rev 18392) +++ stack/cxf/trunk/pom.xml 2014-02-18 15:57:13 UTC (rev 18393) @@ -64,9 +64,11 @@ <jbossws.common.version>2.3.0-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version> <jbossws.jboss720.version>4.3.0-SNAPSHOT</jbossws.jboss720.version> + <jbossws.wildfly800.version>4.3.0-SNAPSHOT</jbossws.wildfly800.version> <jbossws.native.version>4.2.0.CR1</jbossws.native.version> <jboss720.version>7.2.0.Final</jboss720.version> - <wildfly800.version>8.0.0.Final-SNAPSHOT</wildfly800.version> + <wildfly800.version>8.0.0.Final</wildfly800.version> + <wildfly801.version>8.0.1.Final-SNAPSHOT</wildfly801.version> <ejb.api.version>1.0.2.Final</ejb.api.version> <cxf.version>2.7.10</cxf.version> <cxf.asm.version>3.3.1</cxf.asm.version> @@ -145,9 +147,19 @@ <version>${jbossws.jboss720.version}</version> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly800-server-integration</artifactId> + <version>${jbossws.wildfly800.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly800-tests-integration</artifactId> + <version>${jbossws.wildfly800.version}</version> + </dependency> + <dependency> <groupId>org.wildfly</groupId> <artifactId>wildfly-webservices-tests-integration</artifactId> - <version>${wildfly800.version}</version> + <version>${wildfly801.version}</version> </dependency> <dependency> <groupId>org.jboss.ws.projects</groupId> @@ -1382,6 +1394,18 @@ </profile> <!-- + Name: wildfly801 + Descr: WildFly-8.0.1 specific options + --> + <profile> + <id>wildfly801</id> + <properties> + <jbossws.integration.target>wildfly801</jbossws.integration.target> + <jboss.home>${wildfly801.home}</jboss.home> + </properties> + </profile> + + <!-- Name: smoketest Descr: Executes the smoke tests -->