7:38 p.m.
Author: asoldano
Date: 2014-12-05 13:38:46 -0500 (Fri, 05 Dec 2014)
New Revision: 19124
Added:
stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-test-server.xml
stack/cxf/branches/arquillian/modules/dist/src/main/scripts/build-deploy.xml
Modified:
stack/cxf/branches/arquillian/modules/dist/pom.xml
stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/arquillian/modules/testsuite/pom.xml
stack/cxf/branches/arquillian/pom.xml
Log:
Initial changes for automatically fetching wildfly instance to run testsuites - WIP
Modified: stack/cxf/branches/arquillian/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/dist/pom.xml 2014-12-04 14:27:34 UTC (rev
19123)
+++ stack/cxf/branches/arquillian/modules/dist/pom.xml 2014-12-05 18:38:46 UTC (rev
19124)
@@ -144,7 +144,7 @@
<executions>
<execution>
<id>distribution-package</id>
- <phase>package</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>single</goal>
</goals>
@@ -195,12 +195,135 @@
</execution>
</executions>
</plugin>
-
+
</plugins>
</build>
<profiles>
- <!--
+
+ <!--
+ Name: download
+ Descr: Download WildFly
+ -->
+ <profile>
+ <id>download</id>
+ <activation>
+<!-- <file>
+ <missing>${jboss.home}/bin/standalone.sh</missing>
+ </file>
+ <property>
+ <name>!wildfly900.home</name>
+ </property> -->
+ <property>
+ <name>!server.home</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-dist</artifactId>
+ <version>${jboss.version}</version>
+ <type>zip</type>
+ <overWrite>false</overWrite>
+
<outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+
<jboss.home>${project.build.directory}/wildfly-${jboss.version}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
+ Name: deploy
+ Descr: Deploy stack on WildFly instance
+ -->
+ <profile>
+ <id>deploy</id>
+ <activation>
+ <property>
+ <name>!no-deploy</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <property name="jbossws.integration.target"
value="${jbossws.integration.target}"/>
+ <property name="jboss.home"
value="${jboss.home}"/>
+ <ant antfile="src/main/scripts/build-deploy.xml"/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: zip-test-server
+ Descr: Deploy stack on WildFly instance
+ -->
+ <profile>
+ <id>zip-test-server</id>
+ <activation>
+ <property>
+ <name>!no-zip-test-server</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dist-test-server</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>true</appendAssemblyId>
+ <descriptors>
+
<descriptor>src/main/scripts/assembly-test-server.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
Name: bindist
Descr: Build the binary distribution
-->
Modified:
stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
---
stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-12-04
14:27:34 UTC (rev 19123)
+++
stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-12-05
18:38:46 UTC (rev 19124)
@@ -23,6 +23,14 @@
<include>**/module.xml</include>
</includes>
</fileSet>
+ <!-- modules-deploy.conf file -->
+ <fileSet>
+ <directory>../resources/src/main/resources/resources</directory>
+ <outputDirectory>deploy-artifacts</outputDirectory>
+ <includes>
+ <include>modules-deploy.conf</include>
+ </includes>
+ </fileSet>
</fileSets>
<dependencySets>
Added:
stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-test-server.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-test-server.xml
(rev 0)
+++
stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-test-server.xml 2014-12-05
18:38:46 UTC (rev 19124)
@@ -0,0 +1,17 @@
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl...
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p...
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+
+ <id>test-server</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>wildfly*/**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on:
stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-test-server.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/arquillian/modules/dist/src/main/scripts/build-deploy.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/dist/src/main/scripts/build-deploy.xml
(rev 0)
+++
stack/cxf/branches/arquillian/modules/dist/src/main/scripts/build-deploy.xml 2014-12-05
18:38:46 UTC (rev 19124)
@@ -0,0 +1,612 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<project basedir="." default="deploy">
+
+ <property name="output.dir"
value="${basedir}/target/output"/>
+ <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-wildfly800-if-available"
if="wildfly800.available">
+ <antcall target="deploy-wildfly800"/>
+ </target>
+
+ <target name="deploy-wildfly810-if-available"
if="wildfly810.available">
+ <antcall target="deploy-wildfly810"/>
+ </target>
+
+ <target name="deploy-wildfly900-if-available"
if="wildfly900.available">
+ <antcall target="deploy-wildfly900"/>
+ </target>
+
+ <target name="prepare">
+ <condition property="wildfly800.home"
value="${jboss.home}">
+ <equals arg1="${jbossws.integration.target}"
arg2="wildfly800"/>
+ </condition>
+ <condition property="wildfly810.home"
value="${jboss.home}">
+ <equals arg1="${jbossws.integration.target}"
arg2="wildfly810"/>
+ </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="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="wildfly900.available"
file="${wildfly900.available.file}"/>
+ <tstamp>
+ <format property="build.id" pattern="yyyyMMddHHmm"/>
+ </tstamp>
+ </target>
+
+ <target name="init" depends="prepare">
+
+ <fail message="jbossws.integration.target not set"
unless="jbossws.integration.target"/>
+ <echo message="integration.target=${jbossws.integration.target}"/>
+
+ <property name="deploy.structure"
value="${output.dir}/deploy-${jbossws.integration.target}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Structure WildFly-8.0.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-wildfly80x" depends="init">
+ <delete dir="${deploy.structure}"/>
+
+ <path id="jboss.ant.tasks.classpath">
+ <fileset dir="${deploy.artifacts.dir}">
+ <include name="**/jbossws-common-tools.jar"/>
+ <include name="**/jandex.jar"/>
+ </fileset>
+ </path>
+ <taskdef name="installModules"
classname="org.jboss.ws.tools.ant.InstallModulesTask"
classpathref="jboss.ant.tasks.classpath"/>
+ <taskdef name="jandex"
classname="org.jboss.jandex.JandexAntTask"
classpathref="jboss.ant.tasks.classpath"/>
+
+ <jandex run="true" verbose="false"
newJar="true">
+ <fileset dir="${deploy.artifacts.dir}/lib">
+ <include name="cxf*security.jar"/>
+ </fileset>
+ </jandex>
+ <antcall target="deploy-jbossws-cxf-modules-as8"
inheritall="false">
+ <param name="installserver"
value="${deploy.structure}/modules/system/layers/base"/>
+ <param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
+ <param name="jbossid"
value="${jbossws.integration.target}"/>
+ <param name="modules-jbossid" value="wildfly800"/>
+ </antcall>
+ <copy toDir="${deploy.structure}/modules/system/layers/base">
+ <fileset dir="${deploy.artifacts.dir}/modules/wildfly800">
+ <include name="**/jboss/as/webservices/main/module.xml"/>
+ <include
name="**/jboss/as/webservices/server/integration/main/module.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment wildfly800 -->
+ <!-- ================================================================== -->
+
+ <target name="target-wildfly800">
+ <property name="jbossws.integration.target"
value="wildfly800"/>
+ <echo
message="jbossws.integration.target=${jbossws.integration.target}"/>
+ </target>
+
+ <target name="deploy-wildfly800"
depends="undeploy-wildfly800,deploy-structure-wildfly80x,check-spring,install-spring-module80x">
+ <fail message="Not available: ${wildfly800.available.file}"
unless="wildfly800.available"/>
+ <copy todir="${wildfly800.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="${wildfly800.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-wildfly800"
depends="target-wildfly800,init">
+ <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="true"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment wildfly810 -->
+ <!-- ================================================================== -->
+
+ <target name="target-wildfly810">
+ <property name="jbossws.integration.target"
value="wildfly810"/>
+ <echo
message="jbossws.integration.target=${jbossws.integration.target}"/>
+ </target>
+
+ <target name="deploy-wildfly810"
depends="undeploy-wildfly810,deploy-structure-wildfly80x,check-spring,install-spring-module80x">
+ <fail message="Not available: ${wildfly810.available.file}"
unless="wildfly810.available"/>
+ <copy todir="${wildfly810.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="${wildfly810.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-wildfly810"
depends="target-wildfly810,init">
+ <fail message="Not available: ${wildfly810.available.file}"
unless="wildfly810.available"/>
+ <macro-undeploy-jbossws-modules
targetdir="${wildfly810.home}/modules/system/layers/base"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="true"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Structure WildFly-9.0.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-wildfly90x" depends="init">
+ <delete dir="${deploy.structure}"/>
+ <path id="jboss.ant.tasks.classpath">
+ <fileset dir="${deploy.artifacts.dir}">
+ <include name="**/jbossws-common-tools.jar"/>
+ <include name="**/jandex.jar"/>
+ </fileset>
+ </path>
+ <taskdef name="installModules"
classname="org.jboss.ws.tools.ant.InstallModulesTask"
classpathref="jboss.ant.tasks.classpath"/>
+ <taskdef name="jandex"
classname="org.jboss.jandex.JandexAntTask"
classpathref="jboss.ant.tasks.classpath"/>
+ <jandex run="true" verbose="false"
newJar="true">
+ <fileset dir="${deploy.artifacts.dir}/lib">
+ <include name="cxf*security.jar"/>
+ </fileset>
+ </jandex>
+ <antcall target="deploy-jbossws-cxf-modules-as9"
inheritall="false">
+ <param name="installserver"
value="${deploy.structure}/modules/system/layers/base"/>
+ <param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
+ <param name="jbossid"
value="${jbossws.integration.target}"/>
+ <param name="modules-jbossid" value="wildfly900"/>
+ </antcall>
+ <copy toDir="${deploy.structure}/modules/system/layers/base">
+ <fileset dir="${deploy.artifacts.dir}/modules/wildfly900">
+ <include name="**/jboss/as/webservices/main/module.xml"/>
+ <include
name="**/jboss/as/webservices/server/integration/main/module.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment wildfly900 -->
+ <!-- ================================================================== -->
+
+ <target name="target-wildfly900">
+ <property name="jbossws.integration.target"
value="wildfly900"/>
+ <echo
message="jbossws.integration.target=${jbossws.integration.target}"/>
+ </target>
+ <target name="deploy-wildfly900"
depends="undeploy-wildfly900,deploy-structure-wildfly90x,check-spring,install-spring-module90x">
+ <fail message="Not available: ${wildfly900.available.file}"
unless="wildfly900.available"/>
+ <copy todir="${wildfly900.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="${wildfly900.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-wildfly900"
depends="target-wildfly900,init">
+ <fail message="Not available: ${wildfly900.available.file}"
unless="wildfly900.available"/>
+ <macro-undeploy-jbossws-modules
targetdir="${wildfly900.home}/modules/system/layers/base"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="false"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Spring -->
+ <!-- ================================================================== -->
+ <target name="check-spring">
+ <condition property="spring-required">
+ <and>
+ <istrue value="${spring}"/>
+ </and>
+ </condition>
+ </target>
+
+ <target name="install-spring-module80x"
if="spring-required">
+ <antcall target="deploy-spring-module" inheritall="false">
+ <param name="installserver"
value="${deploy.structure}/modules/system/layers/base"/>
+ <param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
+ <param name="modules-jbossid" value="wildfly800"/>
+ </antcall>
+ </target>
+
+ <target name="install-spring-module90x"
if="spring-required">
+ <antcall target="deploy-spring-module" inheritall="false">
+ <param name="installserver"
value="${deploy.structure}/modules/system/layers/base"/>
+ <param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
+ <param name="modules-jbossid" value="wildfly900"/>
+ </antcall>
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- || M A C R O s || -->
+ <!-- ================================================================== -->
+ <!-- ================================================================== -->
+
+
+ <!-- ================================================================== -->
+ <!-- Modules -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-modules-as9">
+ <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">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-cxf-client.jar"/>
+ <include name="**/jbossws-cxf-jaspi.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/jaxws-undertow-httpspi/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jaxws-undertow-httpspi.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-server/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-cxf-server.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-factories/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-cxf-factories.jar"/>
+ </fileset>
+ </copy>
+ <copy
todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-cxf-transports-undertow.jar"/>
+ </fileset>
+ </copy>
+ <copy
todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-cxf-transports-udp.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/cxf/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/cxf-core*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/cxf/impl/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/cxf-*.jar"/>
+ <exclude name="**/cxf-core*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/api/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-api.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/common/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-common.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/tools/common/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-common-tools.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/spi/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-spi.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/httpcomponents/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/httpcore.jar"/>
+ <include name="**/httpcore-nio.jar"/>
+ <include name="**/httpasyncclient.jar"/>
+ <include name="**/httpclient.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/neethi/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/neethi.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/santuario/xmlsec/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/xmlsec.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/ws/security/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/wss4j-*.jar"/>
+ <include name="**/jasypt.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/ws/xmlschema/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/xmlschema-core.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/opensaml/main" flatten="false"
overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/opensaml.jar"/>
+ <include name="**/openws.jar"/>
+ <include name="**/xmltooling.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/as/webservices/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-cxf-resources-(a){jbossid}.jar"/>
+ <include name="**/jbossws-(a){jbossid}-server-integration.jar"/>
+ </fileset>
+ </copy>
+ <!-- module.xml files -->
+ <installModules targetDir="@{targetdir}">
+ <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}">
+ <include name="**/module.xml"/>
+ <exclude name="**/jboss/as/webservices/**/module.xml"/>
+ <exclude name="**/spring/**/module.xml"/>
+ </fileset>
+ </installModules>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-modules-as8">
+ <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">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-cxf-client.jar"/>
+ <include name="**/jbossws-cxf-jaspi.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/jaxws-undertow-httpspi/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jaxws-undertow-httpspi.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-server/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-cxf-server.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-factories/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-cxf-factories.jar"/>
+ </fileset>
+ </copy>
+ <copy
todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-cxf-transports-undertow.jar"/>
+ </fileset>
+ </copy>
+ <copy
todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-cxf-transports-udp.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/cxf/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/cxf-core*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/cxf/impl/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/cxf-*.jar"/>
+ <exclude name="**/cxf-core*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/api/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-api.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/common/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-common.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/tools/common/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-common-tools.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/spi/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-spi.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/httpcomponents/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/httpcore.jar"/>
+ <include name="**/httpcore-nio.jar"/>
+ <include name="**/httpasyncclient.jar"/>
+ <include name="**/httpclient.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/neethi/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/neethi.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/santuario/xmlsec/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/xmlsec.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/ws/security/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/wss4j-*.jar"/>
+ <include name="**/jasypt.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/ws/xmlschema/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/xmlschema-core.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/opensaml/main" flatten="false"
overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/opensaml.jar"/>
+ <include name="**/openws.jar"/>
+ <include name="**/xmltooling.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/as/webservices/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-cxf-resources-(a){jbossid}.jar"/>
+ <include name="**/jbossws-(a){jbossid}-server-integration.jar"/>
+ </fileset>
+ </copy>
+ <!-- module.xml files -->
+ <installModules targetDir="@{targetdir}">
+ <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}">
+ <include name="**/module.xml"/>
+ <exclude name="**/jboss/as/webservices/**/module.xml"/>
+ <exclude name="**/spring/**/module.xml"/>
+ </fileset>
+ </installModules>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy JBossWS -->
+ <!-- ================================================================== -->
+
+ <target name="check-parameters">
+ <fail message="installserver must be specified"
unless="installserver"/>
+ <fail message="artifactsdir must be specified"
unless="artifactsdir"/>
+ <fail message="thirdpartydir must be specified"
unless="thirdpartydir"/>
+ <fail message="modifyjbossintegration must be specified"
unless="modifyjbossintegration"/>
+ </target>
+
+ <target name="deploy-jbossws-cxf-modules-as8">
+ <fail message="installserver must be specified"
unless="installserver"/>
+ <fail message="thirdpartydir must be specified"
unless="thirdpartydir"/>
+ <macro-deploy-jbossws-modules-as8 targetdir="${installserver}"
thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"
modules-jbossid="${modules-jbossid}"/>
+ </target>
+
+ <target name="deploy-jbossws-cxf-modules-as9">
+ <fail message="installserver must be specified"
unless="installserver"/>
+ <fail message="thirdpartydir must be specified"
unless="thirdpartydir"/>
+ <macro-deploy-jbossws-modules-as9 targetdir="${installserver}"
thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"
modules-jbossid="${modules-jbossid}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Install Spring -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-install-spring-modules">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="modules-jbossid"/>
+ <sequential>
+ <!-- libraries -->
+ <copy todir="@{targetdir}/org/springframework/spring/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/spring-*.jar"/>
+ </fileset>
+ </copy>
+ <!-- module.xml files -->
+ <installModules targetDir="@{targetdir}">
+ <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}">
+ <include name="**/spring/**/module.xml"/>
+ </fileset>
+ </installModules>
+ </sequential>
+ </macrodef>
+
+ <target name="deploy-spring-module">
+ <fail message="installserver must be specified"
unless="installserver"/>
+ <fail message="thirdpartydir must be specified"
unless="thirdpartydir"/>
+ <macro-install-spring-modules targetdir="${installserver}"
thirdpartydir="${thirdpartydir}"
modules-jbossid="${modules-jbossid}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Undeploy JBossWS -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-undeploy-jbossws-modules">
+ <attribute name="defaultmodulesconf"/>
+ <attribute name="targetdir"/>
+ <attribute name="modifyjbossintegration"/>
+
+ <sequential>
+ <loadfile property="jbossws.modules.conf"
srcfile="(a){targetdir}/org/jboss/as/webservices/jbossws-modules.conf"
failonerror="false"/>
+ <loadfile property="jbossws.modules.conf"
srcfile="@{defaultmodulesconf}" failonerror="false"/>
+
+ <delete includeemptydirs="true" verbose="true">
+ <fileset dir="@{targetdir}">
+ <include
name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/>
+ <include
name="**/org/jboss/as/webservices/main/jbossws-jboss*"/>
+ </fileset>
+ </delete>
+ <property name="jboss.modules" value="@{targetdir}"/>
+ <antcall target="remove-jboss-integration-module">
+ <param name="modifyjbossintegration"
value="@{modifyjbossintegration}"/>
+ </antcall>
+
+ <!-- delete content of last deployment -->
+ <delete includeemptydirs="true" verbose="true">
+ <fileset dir="@{targetdir}"
includes="${jbossws.modules.conf}"/>
+ </delete>
+ </sequential>
+ </macrodef>
+
+ <target name="remove-jboss-integration-module"
depends="process-jboss-integration" if="fixintegration">
+ <delete verbose="true">
+ <fileset dir="${jboss.modules}">
+ <include
name="**/org/jboss/as/webservices/main/jboss-as-webservices-server-integration*"/>
+ <include
name="**/org/jboss/as/webservices/main/wildfly-webservices-server-integration*"/>
+ </fileset>
+ </delete>
+ </target>
+
+ <target name="process-jboss-integration">
+ <condition property="fixintegration">
+ <and>
+ <istrue value="${modifyjbossintegration}"/>
+ </and>
+ </condition>
+ </target>
+
+</project>
Property changes on:
stack/cxf/branches/arquillian/modules/dist/src/main/scripts/build-deploy.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2014-12-04 14:27:34
UTC (rev 19123)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2014-12-05 18:38:46
UTC (rev 19124)
@@ -74,7 +74,7 @@
<executions>
<execution>
<id>testsuite-default</id>
- <phase>generate-resources</phase>
+ <phase>pre-integration-test</phase>
<goals>
<goal>execute</goal>
</goals>
@@ -93,7 +93,7 @@
</execution>
<execution>
<id>testsuite-ssl-mutual-auth</id>
- <phase>generate-resources</phase>
+ <phase>pre-integration-test</phase>
<goals>
<goal>execute</goal>
</goals>
@@ -110,7 +110,7 @@
</execution>
<execution>
<id>testsuite-default-config-tests</id>
- <phase>generate-resources</phase>
+ <phase>pre-integration-test</phase>
<goals>
<goal>execute</goal>
</goals>
Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2014-12-04 14:27:34 UTC (rev
19123)
+++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2014-12-05 18:38:46 UTC (rev
19124)
@@ -489,6 +489,52 @@
<!-- Profiles -->
<profiles>
+
+
+ <!--
+ Name: download
+ Descr: Download WildFly
+ -->
+ <profile>
+ <id>download</id>
+ <activation>
+ <property>
+ <name>!server.home</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-dist</artifactId>
+ <classifier>test-server</classifier>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <overWrite>false</overWrite>
+
<outputDirectory>${project.build.directory}/test-server</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+
<jboss.home>${project.build.directory}/test-server/jbossws-cxf-dist-${project.version}/wildfly-${jboss.version}</jboss.home>
+ </properties>
+ </profile>
<!--
Name: debug
@@ -631,7 +677,6 @@
<profile>
<id>wildfly800</id>
<properties>
- <jbossws.integration.target>wildfly800</jbossws.integration.target>
<remote.port>8080</remote.port>
<remote.protocol>http-remoting</remote.protocol>
</properties>
@@ -731,7 +776,6 @@
<profile>
<id>wildfly810</id>
<properties>
- <jbossws.integration.target>wildfly810</jbossws.integration.target>
<remote.port>8080</remote.port>
<remote.protocol>http-remoting</remote.protocol>
</properties>
@@ -831,7 +875,6 @@
<profile>
<id>wildfly900</id>
<properties>
- <jbossws.integration.target>wildfly900</jbossws.integration.target>
<remote.port>8080</remote.port>
<remote.protocol>http-remoting</remote.protocol>
</properties>
Modified: stack/cxf/branches/arquillian/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/pom.xml 2014-12-04 14:27:34 UTC (rev 19123)
+++ stack/cxf/branches/arquillian/pom.xml 2014-12-05 18:38:46 UTC (rev 19124)
@@ -1384,7 +1384,7 @@
<id>wildfly800</id>
<properties>
<jbossws.integration.target>wildfly800</jbossws.integration.target>
- <jboss.home>${wildfly800.home}</jboss.home>
+ <jboss.home>${server.home}</jboss.home>
<jboss.version>${wildfly800.version}</jboss.version>
</properties>
</profile>
@@ -1401,7 +1401,22 @@
<jboss.version>${wildfly810.version}</jboss.version>
</properties>
</profile>
-
+<!-- <profile>
+ <id>wildfly810-download</id>
+ <activation>
+ <file>
+ <missing>${jboss.home}/bin/standalone.sh</missing>
+ </file>
+ <property>
+ <name>jbossws.integration.target</name>
+ <value>wildfly810</value>
+ </property>
+ </activation>
+ <properties>
+
<wildfly810.home>${project.build.directory}/wildfly-${jboss.version}</wildfly810.home>
+ </properties>
+ </profile> -->
+
<!--
Name: wildfly900
Descr: WildFly-9.0.0 specific options