[jbossws-commits] JBossWS SVN: r19407 - in stack/cxf/branches/arquillian: modules/dist and 4 other directories.

Author: asoldano Date: 2015-01-21 09:45:11 -0500 (Wed, 21 Jan 2015) New Revision: 19407 Modified: stack/cxf/branches/arquillian/build.xml stack/cxf/branches/arquillian/modules/dist/pom.xml stack/cxf/branches/arquillian/modules/dist/src/main/scripts/build-deploy.xml stack/cxf/branches/arquillian/modules/resources/pom.xml stack/cxf/branches/arquillian/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/branches/arquillian/modules/testsuite/pom.xml stack/cxf/branches/arquillian/pom.xml Log: [JBWS-3859] Adding WildFly 8.2 ASIL Modified: stack/cxf/branches/arquillian/build.xml =================================================================== --- stack/cxf/branches/arquillian/build.xml 2015-01-21 14:05:16 UTC (rev 19406) +++ stack/cxf/branches/arquillian/build.xml 2015-01-21 14:45:11 UTC (rev 19407) @@ -74,12 +74,15 @@ <condition property="wildfly810.home" value="${profiles.profile.properties.wildfly810.home}"> <isset property="profiles.profile.properties.wildfly810.home"/> </condition> + <condition property="wildfly820.home" value="${profiles.profile.properties.wildfly820.home}"> + <isset property="profiles.profile.properties.wildfly820.home"/> + </condition> <condition property="wildfly900.home" value="${profiles.profile.properties.wildfly900.home}"> <isset property="profiles.profile.properties.wildfly900.home"/> </condition> - <fail message="Application server home not set, wildfly800.home=value, wildfly810.home=value or wildfly900.home to set"> + <fail message="Application server home not set, wildfly800.home=value, wildfly810.home=value, wildfly820.home=value or wildfly900.home to set"> <condition> <and> <not> @@ -89,6 +92,9 @@ <isset property="wildfly810.home"/> </not> <not> + <isset property="wildfly820.home"/> + </not> + <not> <isset property="wildfly900.home"/> </not> </and> @@ -98,6 +104,7 @@ <echo/> <echo message="wildfly800.home=${wildfly800.home}"/> <echo message="wildfly810.home=${wildfly810.home}"/> + <echo message="wildfly820.home=${wildfly820.home}"/> <echo message="wildfly900.home=${wildfly900.home}"/> </target> Modified: stack/cxf/branches/arquillian/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/dist/pom.xml 2015-01-21 14:05:16 UTC (rev 19406) +++ stack/cxf/branches/arquillian/modules/dist/pom.xml 2015-01-21 14:45:11 UTC (rev 19407) @@ -260,6 +260,27 @@ </profile> <!-- + Name: wildfly820 + Descr: WildFly-8.2.0 specific dependencies + --> + <profile> + <id>wildfly820</id> + <dependencies> + <dependency> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-resources</artifactId> + <version>${project.version}</version> + <classifier>wildfly820</classifier> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly820-server-integration</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + + <!-- Name: wildfly900 Descr: WildFly-9.0.0 specific dependencies --> Modified: stack/cxf/branches/arquillian/modules/dist/src/main/scripts/build-deploy.xml =================================================================== --- stack/cxf/branches/arquillian/modules/dist/src/main/scripts/build-deploy.xml 2015-01-21 14:05:16 UTC (rev 19406) +++ stack/cxf/branches/arquillian/modules/dist/src/main/scripts/build-deploy.xml 2015-01-21 14:45:11 UTC (rev 19407) @@ -28,7 +28,7 @@ <property name="deploy.artifacts.dir" value="${basedir}/target/assembly/deploy-artifacts"/> <property name="jbossws.default.modules.conf" value="${basedir}/target/assembly/deploy-artifacts/modules-deploy.conf"/> - <target name="deploy" depends="prepare,deploy-wildfly800-if-available,deploy-wildfly810-if-available,deploy-wildfly900-if-available" description="Deploy jbossws to wildfly"/> + <target name="deploy" depends="prepare,deploy-wildfly800-if-available,deploy-wildfly810-if-available,deploy-wildfly820-if-available,deploy-wildfly900-if-available" description="Deploy jbossws to wildfly"/> <target name="deploy-wildfly800-if-available" if="wildfly800.available"> <antcall target="deploy-wildfly800"/> @@ -38,6 +38,10 @@ <antcall target="deploy-wildfly810"/> </target> + <target name="deploy-wildfly820-if-available" if="wildfly820.available"> + <antcall target="deploy-wildfly820"/> + </target> + <target name="deploy-wildfly900-if-available" if="wildfly900.available"> <antcall target="deploy-wildfly900"/> </target> @@ -49,14 +53,19 @@ <condition property="wildfly810.home" value="${jboss.home}"> <equals arg1="${jbossws.integration.target}" arg2="wildfly810"/> </condition> + <condition property="wildfly820.home" value="${jboss.home}"> + <equals arg1="${jbossws.integration.target}" arg2="wildfly820"/> + </condition> <condition property="wildfly900.home" value="${jboss.home}"> <equals arg1="${jbossws.integration.target}" arg2="wildfly900"/> </condition> <property name="wildfly800.available.file" value="${wildfly800.home}/jboss-modules.jar"/> <property name="wildfly810.available.file" value="${wildfly810.home}/jboss-modules.jar"/> + <property name="wildfly820.available.file" value="${wildfly820.home}/jboss-modules.jar"/> <property name="wildfly900.available.file" value="${wildfly900.home}/jboss-modules.jar"/> <available property="wildfly800.available" file="${wildfly800.available.file}"/> <available property="wildfly810.available" file="${wildfly810.available.file}"/> + <available property="wildfly820.available" file="${wildfly820.available.file}"/> <available property="wildfly900.available" file="${wildfly900.available.file}"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> @@ -165,6 +174,35 @@ </target> <!-- ================================================================== --> + <!-- Deployment wildfly820 --> + <!-- ================================================================== --> + + <target name="target-wildfly820"> + <property name="jbossws.integration.target" value="wildfly820"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}"/> + </target> + + <target name="deploy-wildfly820" depends="undeploy-wildfly820,deploy-structure-wildfly80x,check-spring,install-spring-module80x"> + <fail message="Not available: ${wildfly820.available.file}" unless="wildfly820.available"/> + <copy todir="${wildfly820.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="${wildfly820.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-wildfly820" depends="target-wildfly820,init"> + <fail message="Not available: ${wildfly820.available.file}" unless="wildfly820.available"/> + <macro-undeploy-jbossws-modules targetdir="${wildfly820.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> + </target> + + <!-- ================================================================== --> <!-- Prepare Deployment Structure WildFly-9.0.x --> <!-- ================================================================== --> Modified: stack/cxf/branches/arquillian/modules/resources/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/resources/pom.xml 2015-01-21 14:05:16 UTC (rev 19406) +++ stack/cxf/branches/arquillian/modules/resources/pom.xml 2015-01-21 14:45:11 UTC (rev 19407) @@ -69,6 +69,15 @@ </configuration> </execution> <execution> + <id>wildfly820</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>wildfly820</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-wildfly820/jbossws.beans</classesDirectory> + </configuration> + </execution> + <execution> <id>wildfly900</id> <goals><goal>jar</goal></goals> <phase>package</phase> Modified: stack/cxf/branches/arquillian/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/branches/arquillian/modules/server/src/main/scripts/antrun-beans-config.xml 2015-01-21 14:05:16 UTC (rev 19406) +++ stack/cxf/branches/arquillian/modules/server/src/main/scripts/antrun-beans-config.xml 2015-01-21 14:45:11 UTC (rev 19407) @@ -40,6 +40,11 @@ /> <copy + file="${src.dir}/jbossws-cxf-config-as8.xml" + tofile="${dest.dir}/jbossws-wildfly820/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + /> + + <copy file="${src.dir}/jbossws-cxf-config-as9.xml" tofile="${dest.dir}/jbossws-wildfly900/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-21 14:05:16 UTC (rev 19406) +++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-21 14:45:11 UTC (rev 19407) @@ -704,6 +704,68 @@ </profile> <!-- + Name: wildfly820 + Descr: WildFly-8.2.0 specific options + --> + <profile> + <id>wildfly820</id> + <dependencies> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly820-tests-integration</artifactId> + </dependency> + <!-- Arquillian container integration --> + <dependency> + <groupId>org.wildfly.arquillian</groupId> + <artifactId>wildfly-arquillian-container-managed</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.protocol</groupId> + <artifactId>arquillian-protocol-servlet</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </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> + </plugins> + </build> + </profile> + + <!-- Descr: WildFly-9.0.0 specific options --> <profile> Modified: stack/cxf/branches/arquillian/pom.xml =================================================================== --- stack/cxf/branches/arquillian/pom.xml 2015-01-21 14:05:16 UTC (rev 19406) +++ stack/cxf/branches/arquillian/pom.xml 2015-01-21 14:45:11 UTC (rev 19407) @@ -67,8 +67,10 @@ <jbossws.common.tools.version>1.2.1.CR1</jbossws.common.tools.version> <jbossws.wildfly800.version>5.0.0-SNAPSHOT</jbossws.wildfly800.version> <jbossws.wildfly810.version>5.0.0-SNAPSHOT</jbossws.wildfly810.version> + <jbossws.wildfly820.version>5.0.0-SNAPSHOT</jbossws.wildfly820.version> <wildfly800.version>8.0.0.Final</wildfly800.version> <wildfly810.version>8.1.0.Final</wildfly810.version> + <wildfly820.version>8.2.0.Final</wildfly820.version> <wildfly900.version>9.0.0.Alpha2-SNAPSHOT</wildfly900.version> <ejb.api.version>1.0.2.Final</ejb.api.version> <cxf.version>3.0.3</cxf.version> @@ -159,6 +161,16 @@ <version>${jbossws.wildfly810.version}</version> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly820-server-integration</artifactId> + <version>${jbossws.wildfly820.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly820-tests-integration</artifactId> + <version>${jbossws.wildfly820.version}</version> + </dependency> + <dependency> <groupId>org.wildfly</groupId> <artifactId>wildfly-webservices-tests-integration</artifactId> <version>${wildfly900.version}</version> @@ -1410,6 +1422,24 @@ </profile> <!-- + Name: wildfly820 + Descr: WildFly-8.2.0 specific options + --> + <profile> + <id>wildfly820</id> + <properties> + <jbossws.integration.target>wildfly820</jbossws.integration.target> + <jboss.home>${server.home}</jboss.home> + <jboss.version>${wildfly820.version}</jboss.version> + <additionalJvmArgs>-Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</additionalJvmArgs> + </properties> + <modules> + <module>modules/dist</module> + <module>modules/testsuite</module> + </modules> + </profile> + + <!-- Name: wildfly900 Descr: WildFly-9.0.0 specific options -->