[jbossws-commits] JBossWS SVN: r19140 - in stack/cxf/branches/arquillian/modules/dist: src/main/distro and 1 other directories.

Author: asoldano Date: 2014-12-12 10:06:01 -0500 (Fri, 12 Dec 2014) New Revision: 19140 Removed: stack/cxf/branches/arquillian/modules/dist/src/main/distro/Install.txt stack/cxf/branches/arquillian/modules/dist/src/main/distro/JBossORG-EULA.txt stack/cxf/branches/arquillian/modules/dist/src/main/distro/ant.properties.example stack/cxf/branches/arquillian/modules/dist/src/main/distro/build-deploy.xml stack/cxf/branches/arquillian/modules/dist/src/main/distro/build-setup.xml stack/cxf/branches/arquillian/modules/dist/src/main/distro/build-testsuite.xml stack/cxf/branches/arquillian/modules/dist/src/main/distro/build.xml stack/cxf/branches/arquillian/modules/dist/src/main/distro/test-exclude.xsl stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-bin-dist.xml stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-src-dist.xml stack/cxf/branches/arquillian/modules/dist/src/main/scripts/test-exclude.xsl Modified: stack/cxf/branches/arquillian/modules/dist/pom.xml Log: Cleanup dist module a bit.. Modified: stack/cxf/branches/arquillian/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/dist/pom.xml 2014-12-12 09:33:14 UTC (rev 19139) +++ stack/cxf/branches/arquillian/modules/dist/pom.xml 2014-12-12 15:06:01 UTC (rev 19140) @@ -160,42 +160,42 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.8.0</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>generate-exclude-file</id> - <phase>validate</phase> - <configuration> - <target> - <mkdir dir="${basedir}/target/exclude-file" /> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-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-wildfly810.txt"> - <param name="targetName" expression="wildfly810" /> - </xslt> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-wildfly900.txt"> - <param name="targetName" expression="wildfly900" /> - </xslt> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> + <inherited>false</inherited> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>resources</goal> + <goal>generate</goal> + </goals> + <phase>post-integration-test</phase> + </execution> + </executions> + <configuration> + <sourceDocumentName>JBossWS-CXF.xml</sourceDocumentName> + <sourceDirectory>${basedir}/src/main/doc</sourceDirectory> + <imageResource> + <directory>${basedir}/src/main/doc</directory> + <includes> + <include>images/*</include> + <include>author/**</include> + </includes> + </imageResource> + <formats> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + </options> + </configuration> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> @@ -313,137 +313,6 @@ </plugins> </build> </profile> - - <!-- - Name: bindist - Descr: Build the binary distribution - --> - <profile> - <id>bindist</id> - <activation> - <property> - <name>bindist</name> - </property> - </activation> - <dependencies> - <!-- Libraries required for running binary distro testsuite and not available on server--> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-wildfly800-tests-integration</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-wildfly810-tests-integration</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.wildfly</groupId> - <artifactId>wildfly-webservices-tests-integration</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <inherited>false</inherited> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>resources</goal> - <goal>generate</goal> - </goals> - <phase>prepare-package</phase> - </execution> - </executions> - <configuration> - <sourceDocumentName>JBossWS-CXF.xml</sourceDocumentName> - <sourceDirectory>${basedir}/src/main/doc</sourceDirectory> - <imageResource> - <directory>${basedir}/src/main/doc</directory> - <includes> - <include>images/*</include> - <include>author/**</include> - </includes> - </imageResource> - <formats> - <!--format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>JBossWS-CXF_Guide.pdf</finalName> - </format--> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <!-- <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> --> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - </options> - </configuration> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution-package</id> - <configuration> - <finalName>assembly</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor> - <descriptor>src/main/scripts/assembly-bin-dist.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <!-- - Name: srcdist - Descr: Build the source distribution - --> - <profile> - <id>srcdist</id> - <activation> - <property> - <name>srcdist</name> - </property> - </activation> - - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution-package</id> - <configuration> - <finalName>assembly</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor> - <descriptor>src/main/scripts/assembly-src-dist.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> Deleted: stack/cxf/branches/arquillian/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/cxf/branches/arquillian/modules/dist/src/main/distro/Install.txt 2014-12-12 09:33:14 UTC (rev 19139) +++ stack/cxf/branches/arquillian/modules/dist/src/main/distro/Install.txt 2014-12-12 15:06:01 UTC (rev 19140) @@ -1,39 +0,0 @@ - -${project.name} -http://jbossws.jboss.org - -Version: jbossws-cxf-${project.version} - -Installation instructions -========================= - -In order to install JBossWS the following steps are necessary: - -1.) Copy ant.properties.examples to ant.properties -2.) Modify the target container location in ant.properties -3.) Execute one of the following - - ant deploy-wildfly800 - ant deploy-wildfly810 - ant deploy-wildfly900 - - By default Spring Framework libraries are not installed to application -server. In order to do that, please add the -Dspring=true property option when -running the ant script: - - ant -Dspring=true deploy-jboss800 - -Please note Spring is required for advanced configuration only, whenever users -want to provide their own jbossws-cxf.xml Spring configuration file. - -4.) Execute the samples to verify your installation - - 'ant tests' - - You should see no errors. - -If you have any questions, please post to the userforum: -https://community.jboss.org/en/jbossws - -Enjoy, -The JBossWS Team Deleted: stack/cxf/branches/arquillian/modules/dist/src/main/distro/JBossORG-EULA.txt =================================================================== --- stack/cxf/branches/arquillian/modules/dist/src/main/distro/JBossORG-EULA.txt 2014-12-12 09:33:14 UTC (rev 19139) +++ stack/cxf/branches/arquillian/modules/dist/src/main/distro/JBossORG-EULA.txt 2014-12-12 15:06:01 UTC (rev 19140) @@ -1,107 +0,0 @@ -LICENSE AGREEMENT -JBOSS(r) - -This License Agreement governs the use of the Software Packages and any updates to the Software -Packages, regardless of the delivery mechanism. Each Software Package is a collective work -under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to -the user ("Client") a license to the applicable collective work(s) pursuant to the -GNU Lesser General Public License v. 2.1 except for the following Software Packages: -(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the -GNU General Public License v.2; - -(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0; - -(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the -(open source) Sleepycat License (if Client does not wish to use the open source version of this database, -it may purchase a license from Sleepycat Software); - -and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, -and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various -royalty-free patent licenses. - -Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php. - -1. The Software. "Software Packages" refer to the various software modules that are created and made available -for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages -may be comprised of hundreds of software components. The end user license agreement for each component is located in -the component's source code. With the exception of certain image files identified in Section 2 below, -the license terms for the components permit Client to copy, modify, and redistribute the component, -in both source code and binary code forms. This agreement does not limit Client's rights under, -or grant Client rights that supersede, the license terms of any particular component. - -2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright -and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall -remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the -individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates -in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages -using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's -trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by -these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. -If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at -http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted. -Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages. - -3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular -component, to the maximum extent permitted under applicable law, the Software Packages and the -components are provided and licensed "as is" without warranty of any kind, expressed or implied, -including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. -Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in -materials and manufacture under normal use for a period of 30 days from the date of delivery to Client. -Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements -or that the operation of the Software Packages will be entirely error free or appear precisely as described -in the accompanying documentation. This warranty extends only to the party that purchases the Services -pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. - -4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies -described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's -exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of -delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or -refund the money paid by Client for the Software. To the maximum extent permitted by applicable law, -Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential -damages, including lost profits or lost savings arising out of the use or inability to use the Software, -even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall -Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this -Agreement during the twelve months preceding the action. - -5. Export Control. As required by U.S. law, Client represents and warrants that it: -(a) understands that the Software Packages are subject to export controls under the -U.S. Commerce Department's Export Administration Regulations ("EAR"); - -(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations -(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); - -(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, -or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; - -(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or -biological weapons, or missile technology end-uses unless authorized by the U.S. Government by -regulation or specific license; - -(e) understands and agrees that if it is in the United States and exports or transfers the Software -Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual -reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and -address (including country) of each transferee; - -and (f) understands that countries other than the United States may restrict the import, use, or -export of encryption products and that it shall be solely responsible for compliance with any such -import, use, or export restrictions. - -6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages -that are not part of the Software Packages and which Client must install separately. These third party -programs are subject to their own license terms. The license terms either accompany the programs or -can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable -license terms for such programs, then Client may not install them. If Client wishes to install the programs -on more than one system or transfer the programs to another party, then Client must contact the licensor -of the programs. - -7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the -enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the -State of North Carolina and of the United States, without regard to any conflict of laws provisions, -except that the United Nations Convention on the International Sale of Goods shall not apply. - -Copyright 2006 Red Hat, Inc. All rights reserved. -"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc. -All other trademarks are the property of their respective owners. - - Page 1 of 1 18 October 2006 - Deleted: stack/cxf/branches/arquillian/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/branches/arquillian/modules/dist/src/main/distro/ant.properties.example 2014-12-12 09:33:14 UTC (rev 19139) +++ stack/cxf/branches/arquillian/modules/dist/src/main/distro/ant.properties.example 2014-12-12 15:06:01 UTC (rev 19140) @@ -1,24 +0,0 @@ -# -# A sample ant properties file -# - -# Optional JBoss Home -wildfly800.home=(a)wildfly800.home@ -wildfly810.home=(a)wildfly810.home@ -wildfly900.home=(a)wildfly900.home@ - -# The JBoss server under test. This can be [wildfly800|wildfly810|wildfly900] -jbossws.integration.target=wildfly800 - -# The JBoss settings -jboss.bind.address=localhost - -# Management console authentication -jbossws.deployer.authentication.username=admin -jbossws.deployer.authentication.password=admin - -# Java Compiler options -javac.debug=yes -javac.deprecation=no -javac.fail.onerror=yes -javac.verbose=no Deleted: stack/cxf/branches/arquillian/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/arquillian/modules/dist/src/main/distro/build-deploy.xml 2014-12-12 09:33:14 UTC (rev 19139) +++ stack/cxf/branches/arquillian/modules/dist/src/main/distro/build-deploy.xml 2014-12-12 15:06:01 UTC (rev 19140) @@ -1,208 +0,0 @@ -<?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> - - <!-- ================================================================== --> - <!-- Prepare Deployment Structure WildFly-8.0.x --> - <!-- ================================================================== --> - - <target name="deploy-structure-wildfly80x" depends="prepare-deploy"> - <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}" file="${target.properties.file}"/> - </target> - - <target name="deploy-wildfly800" depends="undeploy-wildfly800,deploy-structure-wildfly80x,check-spring,install-spring-module80x" description="Deploy jbossws to wildfly800"> - <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" 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="true"/> - </target> - - <!-- ================================================================== --> - <!-- Deployment wildfly810 --> - <!-- ================================================================== --> - - <target name="target-wildfly810"> - <property name="jbossws.integration.target" value="wildfly810"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-wildfly810" depends="undeploy-wildfly810,deploy-structure-wildfly80x,check-spring,install-spring-module80x" description="Deploy jbossws to wildfly810"> - <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" description="Remove jbossws from wildfly810"> - <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="prepare-deploy"> - <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}" file="${target.properties.file}"/> - </target> - <target name="deploy-wildfly900" depends="undeploy-wildfly900,deploy-structure-wildfly90x,check-spring,install-spring-module90x" description="Deploy jbossws to wildfly900"> - <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" description="Remove jbossws from wildfly900"> - <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> - -</project> Deleted: stack/cxf/branches/arquillian/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/branches/arquillian/modules/dist/src/main/distro/build-setup.xml 2014-12-12 09:33:14 UTC (rev 19139) +++ stack/cxf/branches/arquillian/modules/dist/src/main/distro/build-setup.xml 2014-12-12 15:06:01 UTC (rev 19140) @@ -1,49 +0,0 @@ -<?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> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <target name="prepare"> - - <!-- Load jbossws.integration.target properties --> - <property file="${target.properties.file}"/> - - <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> - -</project> Deleted: stack/cxf/branches/arquillian/modules/dist/src/main/distro/build-testsuite.xml =================================================================== --- stack/cxf/branches/arquillian/modules/dist/src/main/distro/build-testsuite.xml 2014-12-12 09:33:14 UTC (rev 19139) +++ stack/cxf/branches/arquillian/modules/dist/src/main/distro/build-testsuite.xml 2014-12-12 15:06:01 UTC (rev 19140) @@ -1,734 +0,0 @@ -<?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> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="tests-prepare" depends="prepare"> - - <!-- Define jboss.home --> - <condition property="jboss.home" value="${wildfly800.home}"> - <equals arg1="${jbossws.integration.target}" arg2="wildfly800"/> - </condition> - <condition property="jboss.home" value="${wildfly810.home}"> - <equals arg1="${jbossws.integration.target}" arg2="wildfly810"/> - </condition> - <condition property="jboss.home" value="${wildfly900.home}"> - <equals arg1="${jbossws.integration.target}" arg2="wildfly900"/> - </condition> - - <!-- Verify required properties that must be set before this file is imported --> - <fail message="Tests output dir not set." unless="tests.output.dir"/> - - <!-- Verify availabililty of tools.jar --> - <condition property="tools.jar" value="${java.home}/lib/tools.jar"> - <available file="${java.home}/lib/tools.jar"/> - </condition> - <condition property="tools.jar" value="${java.home}/../lib/tools.jar"> - <available file="${java.home}/../lib/tools.jar"/> - </condition> - <!-- [JBWS-2113] tools.jar not available on Mac OS X --> - <condition property="tools.jar" value="${java.home}/../Classes/classes.jar"> - <available file="${java.home}/../Classes/classes.jar"/> - </condition> - <fail message="Not available: ${java.home}/lib/tools.jar, ${java.home}/../lib/tools.jar" unless="tools.jar"/> - - <!-- Use -Ddebug=true for remote debugging --> - <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"> - <isset property="debug"/> - </condition> - <condition property="remote.debug.line" value=""> - <not> - <isset property="debug"/> - </not> - </condition> - - <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME - otherwise and initialize the node0/node1 cluster hostnames to localhost - and ${hostname} by default. If you cannot route multicast traffic between - localhost and hostname, then you need to specify node0 and node1 binding - in the local.properties that can in order to be able to run the clustering - tests. - --> - <property environment="env"/> - <condition property="hostname" value="${env.COMPUTERNAME}"> - <os family="windows"/> - </condition> - <condition property="hostname" value="${env.HOSTNAME}"> - <not> - <os family="windows"/> - </not> - </condition> - - <!-- node0 defaults --> - <property name="node0" value="${jboss.bind.address}"/> - <property name="node0.http.url" value="http://${node0}:8080"/> - <property name="node0.jndi.url" value="jnp://${node0}:1099"/> - <property name="node0.hajndi.url" value="jnp://${node0}:1100"/> - - <mkdir dir="${tests.output.dir}"/> - <delete file="${tests.output.dir}/test.log" failonerror="false"/> - - <property name="jboss.lib" value="${jboss.home}/lib"/> - - <echo/> - <echo message="-----------------------------------------------"/> - <echo message="jboss.home = ${jboss.home}"/> - <echo message="excludesfile = ${excludesfile}"/> - <echo message="java.home = ${java.home}"/> - <echo message="jboss.bind = ${jboss.bind.address}"/> - <echo message="-----------------------------------------------"/> - - <tstamp> - <format property="build.id" pattern="yyyyMMddHHmm"/> - </tstamp> - </target> - - <target name="tests-classpath" depends="tests-classpath-wildfly80x,tests-classpath-wildfly90x"> - <path id="tests.javac.classpath"> - <path refid="ws.stack.classpath"/> - <path refid="integration.target.javac.classpath"/> - </path> - <path id="tests.client.classpath"> - <path refid="ws.stack.classpath"/> - <path refid="integration.target.client.classpath"/> - </path> - </target> - - <target name="tests-classpath-wildfly80x" depends="tests-prepare" if="jbossws.integration.wildfly80x"> - - <!-- Java Endorsed --> - <condition property="endorsed.dirs" value="${jboss.home}/modules/system/layers/base/javax/xml/ws/api/main/"> - <isset property="jboss.home"/> - </condition> - - <path id="integration.target.javac.classpath"> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/activation/api/main/"> - <include name="activation-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/"> - <include name="javax.mail-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/common-core/main/"> - <include name="jboss-common-core-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logging/main/"> - <include name="jboss-logging-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/federation/main/"> - <include name="picketlink-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/ejb/api/main/"> - <include name="jboss-ejb-api_3.2_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/ejb3/main/"> - <include name="jboss-ejb3-ext-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/"> - <include name="jboss-servlet-api_3.1_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/annotation/api/main/"> - <include name="jboss-annotations-api_1.2_spec-*.jar"/> - </fileset> - </path> - - <!-- - The 's.client.classpath' contains jars that are available in the target container's client directory. - There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir. - - The 'ws.stack.classpath' contains jars that come with a specific stack distribution. - The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. - --> - <path id="integration.target.client.classpath"> - <!-- included from thirdparty local dir as it's not installed on AS - START --> - <pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/> - <!-- included from thirdparty local dir as it's not installed on AS - END --> - <pathelement location="${jboss.home}/jboss-modules.jar"/> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logging/main/"> - <include name="jboss-logging-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/controller/main/"> - <include name="wildfly-controller-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/controller-client/main/"> - <include name="wildfly-controller-client-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/wildfly/security/manager/main/"> - <include name="wildfly-security-manager-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/server/main/"> - <include name="wildfly-server-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/protocol/main/"> - <include name="wildfly-protocol-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/dmr/main/"> - <include name="jboss-dmr-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/marshalling/main/"> - <include name="jboss-marshalling-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/main/"> - <include name="slf4j-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/"> - <include name="jcl-over-slf4j-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/impl/main/"> - <include name="slf4j-jboss-logmanager-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logmanager/main/"> - <include name="jboss-logmanager-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/log4j/logmanager/main/"> - <include name="log4j-jboss-logmanager-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/"> - <include name="javax.mail-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/"> - <include name="jboss-servlet-api_3.1_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/transaction/api/main/"> - <include name="jboss-transaction-api_1.2_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/threads/main/"> - <include name="jboss-threads-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/picketbox/main/"> - <include name="picketbox-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/federation/main/"> - <include name="picketlink-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/core/main/"> - <include name="picketlink-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/ejb/api/main/"> - <include name="jboss-ejb-api_3.2_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/ejb-client/main/"> - <include name="jboss-ejb-client-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/xerces/main/"> - <include name="xercesImpl-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/common-core/main/"> - <include name="jboss-common-core-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/javassist/main/"> - <include name="javassist-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/security/jacc/api/main/"> - <include name="jboss-jacc-api*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remoting/main/"> - <include name="jboss-remoting-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/marshalling/river/main/"> - <include name="jboss-marshalling-river-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remoting-jmx/main/"> - <include name="remoting-jmx-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/sasl/main/"> - <include name="jboss-sasl-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/io/netty/main/"> - <include name="netty-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xb/main/"> - <include name="jbossxb-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/joda/time/main/"> - <include name="joda-time-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/xalan/main/"> - <include name="serializer-*.jar"/> - <include name="xalan-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/codehaus/woodstox/main/"> - <include name="woodstox-core-asl-*.jar"/> - <include name="stax2-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xnio/main/"> - <include name="xnio-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xnio/nio/main/"> - <include name="xnio-nio-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remote-naming/main/"> - <include name="jboss-remote-naming-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/bouncycastle/main/"> - <include name="bcprov-*.jar"/> - </fileset> - <pathelement location="${tools.jar}"/> - </path> - </target> - - <target name="tests-classpath-wildfly90x" depends="tests-prepare" if="jbossws.integration.wildfly90x"> - - <!-- Java Endorsed --> - <condition property="endorsed.dirs" value="${jboss.home}/modules/system/layers/base/javax/xml/ws/api/main/"> - <isset property="jboss.home"/> - </condition> - - <path id="integration.target.javac.classpath"> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/activation/api/main/"> - <include name="activation-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/"> - <include name="javax.mail-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/common-core/main/"> - <include name="jboss-common-core-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logging/main/"> - <include name="jboss-logging-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/federation/main/"> - <include name="picketlink-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/ejb/api/main/"> - <include name="jboss-ejb-api_3.2_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/ejb3/main/"> - <include name="jboss-ejb3-ext-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/"> - <include name="jboss-servlet-api_3.1_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/annotation/api/main/"> - <include name="jboss-annotations-api_1.2_spec-*.jar"/> - </fileset> - </path> - - <!-- - The 's.client.classpath' contains jars that are available in the target container's client directory. - There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir. - - The 'ws.stack.classpath' contains jars that come with a specific stack distribution. - The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. - --> - <path id="integration.target.client.classpath"> - <!-- included from thirdparty local dir as it's not installed on AS - START --> - <pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/> - <!-- included from thirdparty local dir as it's not installed on AS - END --> - <pathelement location="${jboss.home}/jboss-modules.jar"/> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logging/main/"> - <include name="jboss-logging-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/controller/main/"> - <include name="wildfly-controller-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/controller-client/main/"> - <include name="wildfly-controller-client-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/wildfly/security/manager/main/"> - <include name="wildfly-security-manager-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/server/main/"> - <include name="wildfly-server-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/protocol/main/"> - <include name="wildfly-protocol-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/dmr/main/"> - <include name="jboss-dmr-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/marshalling/main/"> - <include name="jboss-marshalling-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/main/"> - <include name="slf4j-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/"> - <include name="jcl-over-slf4j-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/impl/main/"> - <include name="slf4j-jboss-logmanager-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logmanager/main/"> - <include name="jboss-logmanager-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/log4j/logmanager/main/"> - <include name="log4j-jboss-logmanager-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/"> - <include name="javax.mail-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/"> - <include name="jboss-servlet-api_3.1_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/transaction/api/main/"> - <include name="jboss-transaction-api_1.2_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/threads/main/"> - <include name="jboss-threads-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/picketbox/main/"> - <include name="picketbox-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/federation/main/"> - <include name="picketlink-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/core/main/"> - <include name="picketlink-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/ejb/api/main/"> - <include name="jboss-ejb-api_3.2_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/ejb-client/main/"> - <include name="jboss-ejb-client-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/xerces/main/"> - <include name="xercesImpl-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/common-core/main/"> - <include name="jboss-common-core-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/javassist/main/"> - <include name="javassist-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/javax/security/jacc/api/main/"> - <include name="jboss-jacc-api*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remoting/main/"> - <include name="jboss-remoting-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/marshalling/river/main/"> - <include name="jboss-marshalling-river-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remoting-jmx/main/"> - <include name="remoting-jmx-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/sasl/main/"> - <include name="jboss-sasl-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/io/netty/main/"> - <include name="netty-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xb/main/"> - <include name="jbossxb-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/joda/time/main/"> - <include name="joda-time-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/xalan/main/"> - <include name="serializer-*.jar"/> - <include name="xalan-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/codehaus/woodstox/main/"> - <include name="woodstox-core-asl-*.jar"/> - <include name="stax2-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xnio/main/"> - <include name="xnio-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xnio/nio/main/"> - <include name="xnio-nio-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remote-naming/main/"> - <include name="jboss-remote-naming-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/system/layers/base/org/bouncycastle/main/"> - <include name="bcprov-*.jar"/> - </fileset> - <pathelement location="${tools.jar}"/> - </path> - </target> - - - <!-- ================================================================== --> - <!-- Compiling --> - <!-- ================================================================== --> - - <macrodef name="macro-compile-classes"> - <attribute name="excludesfile"/> - <attribute name="srcdir"/> - <sequential> - <mkdir dir="${tests.output.dir}/test-classes"/> - <javac destdir="${tests.output.dir}/test-classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> - <src path="@{srcdir}"/> - <classpath refid="tests.javac.classpath"/> - </javac> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <macrodef name="macro-copy-resources"> - <attribute name="srcdir"/> - <sequential> - - <!-- copy etc --> - <copy todir="${tests.output.dir}/test-classes"> - <fileset dir="@{srcdir}/etc"> - <include name="*.properties"/> - <include name="tst.policy"/> - <include name="log4j.xml"/> - </fileset> - <filterset> - <filter token="jboss.bind.address" value="${node0}"/> - <filter token="remote.protocol" value="${remote.protocol}"/> - <filter token="remote.port" value="${remote.port}"/> - </filterset> - </copy> - <copy todir="${tests.output.dir}/test-classes"> - <fileset dir="@{srcdir}/etc"> - <include name="*.keystore"/> - <include name="*.truststore"/> - </fileset> - </copy> - - <!-- copy handler definitions --> - <copy todir="${tests.output.dir}/test-classes"> - <fileset dir="@{srcdir}/java"> - <include name="**/*.xml"/> - </fileset> - </copy> - - <!-- copy non binary files --> - <copy todir="${tests.output.dir}/test-resources"> - <fileset dir="@{srcdir}/resources"> - <include name="**/*.wsdl"/> - <include name="**/*.xml"/> - </fileset> - <filterset> - <filter token="java.home" value="${java.home}"/> - <filter token="jboss.bind.address" value="${node0}"/> - <filter token="tests.output.dir" value="${tests.output.dir}"/> - <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/> - </filterset> - </copy> - - <!-- Copy binary files --> - <copy todir="${tests.output.dir}/test-resources"> - <fileset dir="@{srcdir}/resources"> - <exclude name="**/*.wsdl"/> - <exclude name="**/*.xml"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Testing --> - <!-- ================================================================== --> - - <!-- Run all unit tests and generate a report --> - <target name="tests" depends="tests-jars" description="Run all unit tests and generate a report"> - <antcall target="tests-run-internal"> - <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class org/jboss/test/ws/**/*TestCaseForked.class"/> - <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/> - <param name="haltonfailure" value="false"/> - </antcall> - <antcall target="tests-report"/> - </target> - - <!-- Run smoke test cases --> - <target name="tests-smoke" depends="tests-init" description="Run smoke unit tests"> - <antcall target="tests-run-internal"> - <param name="include.wildcard" value="org/jboss/test/ws/jaxws/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCaseForked.class"/> - <!-- - According to our commit policy, haltonfailure MUST be be true for tests-smoke - It is a prerequisite for any commit that this target passes without failure. - --> - <param name="haltonfailure" value="true"/> - </antcall> - <antcall target="tests-report"/> - </target> - - <!-- Run samples test cases --> - <target name="tests-samples" depends="tests-init" description="Run samples unit tests"> - <antcall target="tests-run-internal"> - <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/> - <param name="haltonfailure" value="false"/> - </antcall> - </target> - - <!-- Run integration test cases --> - <target name="tests-integration" depends="tests-jars" description="Run integration unit tests"> - <antcall target="tests-run-internal"> - <param name="include.wildcard" value="org/jboss/test/ws/jaxws/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class"/> - <param name="haltonfailure" value="false"/> - </antcall> - <antcall target="tests-report"/> - </target> - - <!-- - Run a collection of unit tests. - ant -Dtest=jaxws/samples/provider test - --> - <target name="test" depends="tests-init" if="test" description="Run all unit tests in a given directory"> - <antcall target="tests-run-internal"> - <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/> - <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/> - <param name="haltonfailure" value="false"/> - </antcall> - </target> - - <!-- Common test target --> - <target name="tests-run-internal" depends="tests-init"> - <mkdir dir="${tests.output.dir}/test-reports"/> - <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}" haltonfailure="${haltonfailure}"> - <jvmarg value="-Djava.security.manager"/> - <jvmarg value="-ea"/> - <!--jvmarg value="-Dcom.sun.xml.ws.transport.http.HttpAdapter.dump=true"/> - <jvmarg value="-Dcom.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true"/--> - - <sysproperty key="jdk.home" value="${env.JAVA_HOME}"/> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - <sysproperty key="appclient.output.dir" value="${tests.output.dir}/appclient-logs"/> - <sysproperty key="client.scenario" value="${client.scenario}"/> - <sysproperty key="interop" value="${interop}"/> - <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> - <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> - <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol"/> - <sysproperty key="javax.net.ssl.trustStore" value="${tests.output.dir}/test-classes/test.truststore"/> - <sysproperty key="javax.net.ssl.trustStorePassword" value="changeit"/> - <sysproperty key="javax.net.ssl.trustStoreType" value="jks"/> - <sysproperty key="javax.net.ssl.keyStore" value="${tests.output.dir}/test-classes/client.keystore"/> - <sysproperty key="javax.net.ssl.keyStorePassword" value="changeit"/> - <sysproperty key="javax.net.ssl.keyStoreType" value="jks"/> - <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> - <sysproperty key="java.security.policy" value="${tests.output.dir}/test-classes/tst.policy"/> - <sysproperty key="jboss.home" value="${jboss.home}"/> - <sysproperty key="jboss.bind.address" value="${node0}"/> - <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> - <sysproperty key="jbossws.deployer.authentication.username" value="${jbossws.deployer.authentication.username}"/> - <sysproperty key="jbossws.deployer.authentication.password" value="${jbossws.deployer.authentication.password}"/> - <sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/> - <sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/> - <sysproperty key="org.jboss.ws.testsuite.securityDomain.users.propfile" value="${tests.output.dir}/test-classes/jbossws-users.properties"/> - <sysproperty key="org.jboss.ws.testsuite.securityDomain.roles.propfile" value="${tests.output.dir}/test-classes/jbossws-roles.properties"/> - <sysproperty key="org.jboss.ws.testsuite.server.keystore" value="${tests.output.dir}/test-classes/test.keystore"/> - <sysproperty key="org.jboss.ws.testsuite.server.truststore" value="${tests.output.dir}/test-classes/test.truststore"/> - <sysproperty key="test.archive.directory" value="${tests.output.dir}/test-libs"/> - <sysproperty key="test.classes.directory" value="${tests.output.dir}/test-classes"/> - <sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/> - <sysproperty key="test.username" value="${test.username}"/> - <sysproperty key="test.password" value="${test.password}"/> - <classpath> - <path refid="tests.client.classpath"/> - <pathelement location="${tests.output.dir}/test-classes"/> - </classpath> - <formatter type="plain" usefile="true"/> - <formatter type="xml" usefile="true"/> - <batchtest todir="${tests.output.dir}/test-reports" fork="true"> - <fileset dir="${tests.output.dir}/test-classes" includes="${include.wildcard}" excludes="${exclude.wildcard}"/> - </batchtest> - </junit> - </target> - - <!-- - Run a single unit test. - ant -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test - --> - <target name="one-test" depends="tests-init" if="test" description="Run a single unit test"> - <mkdir dir="${tests.output.dir}/test-reports"/> - - <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}"> - <jvmarg line="${remote.debug.line}"/> - <jvmarg value="-Djava.security.manager"/> - <jvmarg value="-ea"/> - <!--jvmarg value="-Dcom.sun.xml.ws.transport.http.HttpAdapter.dump=true"/> - <jvmarg value="-Dcom.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true"/--> - - <sysproperty key="jdk.home" value="${env.JAVA_HOME}"/> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - <sysproperty key="appclient.output.dir" value="${tests.output.dir}/appclient-logs"/> - <sysproperty key="client.scenario" value="${client.scenario}"/> - <sysproperty key="interop" value="${interop}"/> - <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> - <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> - <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol"/> - <sysproperty key="javax.net.ssl.trustStore" value="${tests.output.dir}/test-classes/test.truststore"/> - <sysproperty key="javax.net.ssl.trustStorePassword" value="changeit"/> - <sysproperty key="javax.net.ssl.trustStoreType" value="jks"/> - <sysproperty key="javax.net.ssl.keyStore" value="${tests.output.dir}/test-classes/client.keystore"/> - <sysproperty key="javax.net.ssl.keyStorePassword" value="changeit"/> - <sysproperty key="javax.net.ssl.keyStoreType" value="jks"/> - <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> - <sysproperty key="java.security.policy" value="${tests.output.dir}/test-classes/tst.policy"/> - <sysproperty key="jboss.home" value="${jboss.home}"/> - <sysproperty key="jboss.bind.address" value="${node0}"/> - <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> - <sysproperty key="jbossws.deployer.authentication.username" value="${jbossws.deployer.authentication.username}"/> - <sysproperty key="jbossws.deployer.authentication.password" value="${jbossws.deployer.authentication.password}"/> - <sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/> - <sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/> - <sysproperty key="org.jboss.ws.testsuite.securityDomain.users.propfile" value="${tests.output.dir}/test-classes/jbossws-users.properties"/> - <sysproperty key="org.jboss.ws.testsuite.securityDomain.roles.propfile" value="${tests.output.dir}/test-classes/jbossws-roles.properties"/> - <sysproperty key="org.jboss.ws.testsuite.server.keystore" value="${tests.output.dir}/test-classes/test.keystore"/> - <sysproperty key="org.jboss.ws.testsuite.server.truststore" value="${tests.output.dir}/test-classes/test.truststore"/> - <sysproperty key="test.archive.directory" value="${tests.output.dir}/test-libs"/> - <sysproperty key="test.classes.directory" value="${tests.output.dir}/test-classes"/> - <sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/> - <sysproperty key="test.username" value="${test.username}"/> - <sysproperty key="test.password" value="${test.password}"/> - <classpath> - <path refid="tests.client.classpath"/> - <pathelement location="${tests.output.dir}/test-classes"/> - </classpath> - <formatter type="plain" usefile="true"/> - <formatter type="xml" usefile="true"/> - <test todir="${tests.output.dir}/test-reports" name="${test}" fork="true"/> - </junit> - </target> - - <!-- ================================================================== --> - <!-- Reporting --> - <!-- ================================================================== --> - - <!-- Build the tests report --> - <target name="tests-report" depends="tests-init" description="Build the tests report"> - <mkdir dir="${tests.output.dir}/test-reports"/> - <junitreport todir="${tests.output.dir}/test-reports"> - <fileset dir="${tests.output.dir}/test-reports"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="${tests.output.dir}/test-reports/html"/> - </junitreport> - <zip destfile="${tests.output.dir}/test-report-${build.id}.zip"> - <fileset dir="${tests.output.dir}" includes="test-reports/**"/> - </zip> - </target> - - <!-- ================================================================== --> - <!-- Cleaning --> - <!-- ================================================================== --> - - <target name="tests-clean" description="Delete all generated test files."> - <delete dir="${tests.output.dir}"/> - </target> - -</project> Deleted: stack/cxf/branches/arquillian/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/branches/arquillian/modules/dist/src/main/distro/build.xml 2014-12-12 09:33:14 UTC (rev 19139) +++ stack/cxf/branches/arquillian/modules/dist/src/main/distro/build.xml 2014-12-12 15:06:01 UTC (rev 19140) @@ -1,129 +0,0 @@ -<?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="." name="JBossWS-CXF"> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <property name="build.dir" value="${basedir}/build"/> - <property name="docs.dir" value="${basedir}/docs"/> - <property name="output.dir" value="${basedir}/output"/> - <property name="thirdparty.dir" value="${basedir}/deploy/lib"/> - <property name="tests.dir" value="${basedir}/tests"/> - <property name="tests.output.dir" value="${output.dir}"/> - <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="jbossws.default.modules.conf" value="${build.dir}/modules-deploy.conf"/> - <property name="target.properties.file" value="${basedir}/target.properties"/> - - <!-- Check if ant.properties is available --> - <available property="ant.properties.available" file="${basedir}/ant.properties"/> - <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> - <property file="${basedir}/ant.properties"/> - - <import file="${build.dir}/build-setup.xml"/> - <import file="${build.dir}/build-deploy.xml"/> - <import file="${build.dir}/jbossws-deploy-macros.xml"/> - <import file="${tests.dir}/ant-import/build-testsuite.xml"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="init" depends="prepare"> - - <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> - <echo message="integration.target=${jbossws.integration.target}"/> - - <condition property="jbossws.integration.wildfly80x" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="wildfly800"/> - <equals arg1="${jbossws.integration.target}" arg2="wildfly810"/> - </or> - </condition> - - <condition property="jbossws.integration.wildfly90x" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="wildfly900"/> - </or> - </condition> - - <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/> - <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> - - <property name="remote.port" value="8080"/> - <property name="remote.protocol" value="http-remoting"/> - </target> - - <target name="tests-init" depends="init,tests-classpath"> - <!-- JBossWS jars first to override META-INF/services declarations duplicated in CXF jars (alternative is using endorsing) --> - <path id="ws.stack.classpath"> - <fileset dir="${thirdparty.dir}"> - <include name="**/jbossws*.jar"/> - <exclude name="**/jbossws-jboss*.jar"/> - <exclude name="**/jbossws-wildfly*.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <exclude name="**/jbossws*.jar"/> - <exclude name="**/jboss-as-webservices-tests-integration.jar"/> - </fileset> - </path> - - <property name="jbossws.test.log" value="${tests.output.dir}"/> - </target> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> - </target> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <!-- Copy resources --> - <target name="tests-copy-resources" depends="tests-init"> - <macro-copy-resources srcdir="${tests.dir}"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources"/> - - <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> - - <!-- dummy targets --> - <target name="prepare-deploy" depends="init"/> - - <!-- ================================================================== --> - <!-- Miscellaneous --> - <!-- ================================================================== --> - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${tests.output.dir}"/> - </target> - -</project> Deleted: stack/cxf/branches/arquillian/modules/dist/src/main/distro/test-exclude.xsl =================================================================== --- stack/cxf/branches/arquillian/modules/dist/src/main/distro/test-exclude.xsl 2014-12-12 09:33:14 UTC (rev 19139) +++ stack/cxf/branches/arquillian/modules/dist/src/main/distro/test-exclude.xsl 2014-12-12 15:06:01 UTC (rev 19140) @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:m="http://maven.apache.org/POM/4.0.0"> - <xsl:param name="targetName"/> - <xsl:output method="text"/> - <xsl:template match="/"> - <xsl:for-each select="//m:profile[m:id=$targetName]/m:build/m:plugins/m:plugin[m:artifactId='maven-surefire-plugin']//m:excludes"> - <xsl:for-each select="m:exclude|comment()"> - <xsl:if test="self::comment()"> - <xsl:text>#</xsl:text> - </xsl:if> - <xsl:value-of select="."/><xsl:text>&#10;</xsl:text> - </xsl:for-each> - </xsl:for-each> - </xsl:template> -</xsl:stylesheet> Deleted: stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-bin-dist.xml 2014-12-12 09:33:14 UTC (rev 19139) +++ stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-bin-dist.xml 2014-12-12 15:06:01 UTC (rev 19140) @@ -1,130 +0,0 @@ -<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>binary-distribution</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <fileSets> - <!-- root --> - <fileSet> - <directory>src/main/distro</directory> - <outputDirectory>jbossws-cxf-bin-dist</outputDirectory> - <includes> - <include>build.xml</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/distro</directory> - <outputDirectory>jbossws-cxf-bin-dist</outputDirectory> - <filtered>true</filtered> - <includes> - <include>ant.properties.example</include> - </includes> - </fileSet> - <!-- build --> - <fileSet> - <directory>src/main/distro</directory> - <outputDirectory>jbossws-cxf-bin-dist/build</outputDirectory> - <includes> - <include>build-deploy.xml</include> - <include>build-setup.xml</include> - </includes> - </fileSet> - <fileSet> - <directory>../resources/src/main/resources/resources</directory> - <outputDirectory>jbossws-cxf-bin-dist/build</outputDirectory> - <includes> - <include>modules-deploy.conf</include> - <include>jbossws-deploy-macros.xml</include> - </includes> - </fileSet> - <!-- docs --> - <fileSet> - <directory>src/main/distro</directory> - <outputDirectory>jbossws-cxf-bin-dist/docs</outputDirectory> - <filtered>true</filtered> - <includes> - <include>Install.txt</include> - <include>ReleaseNotes.txt</include> - <include>JBossORG-EULA.txt</include> - </includes> - </fileSet> - <fileSet> - <directory>target/docbook/publish</directory> - <outputDirectory>jbossws-cxf-bin-dist/docs</outputDirectory> - </fileSet> - <!-- deploy --> - <fileSet> - <directory>target/assembly/deploy-artifacts</directory> - <outputDirectory>jbossws-cxf-bin-dist/deploy</outputDirectory> - </fileSet> - <!-- test etc --> - <fileSet> - <directory>../testsuite/cxf-tests/src/test</directory> - <outputDirectory>jbossws-cxf-bin-dist/tests</outputDirectory> - <includes> - <include>etc/**</include> - </includes> - </fileSet> - <!-- test excludes --> - <fileSet> - <directory>target/exclude-file</directory> - <outputDirectory>jbossws-cxf-bin-dist/tests/resources</outputDirectory> - <includes> - <include>test-excludes-*.txt</include> - </includes> - </fileSet> - <!-- Stack specific tests --> - <fileSet> - <directory>../testsuite/cxf-tests/src/test</directory> - <outputDirectory>jbossws-cxf-bin-dist/tests</outputDirectory> - <includes> - <include>java/org/jboss/test/ws/jaxws/samples/**</include> - <include>java/org/jboss/wsf/test/**</include> - <include>resources/jaxws/samples/**</include> - </includes> - </fileSet> - <!-- Test utils --> - <fileSet> - <directory>../test-utils/src/main</directory> - <outputDirectory>jbossws-cxf-bin-dist/tests</outputDirectory> - <includes> - <include>java/org/jboss/wsf/test/**</include> - </includes> - </fileSet> - <!-- Stack agnostic tests --> - <fileSet> - <directory>../testsuite/shared-tests/src/test</directory> - <outputDirectory>jbossws-cxf-bin-dist/tests</outputDirectory> - <includes> - <include>ant-import/**</include> - <include>java/org/jboss/test/helper/**</include> - <include>java/org/jboss/test/ws/jaxws/samples/**</include> - <include>java/org/jboss/test/ws/jaxws/smoke/**</include> - <include>java/org/jboss/test/ws/appclient/**</include> - <include>java/org/jboss/test/ws/management/**</include> - <include>java/org/jboss/test/ws/saaj/**</include> - <include>resources/jaxws/samples/**</include> - <include>resources/jaxws/smoke/**</include> - <include>resources/management/**</include> - <include>resources/saaj/**</include> - </includes> - </fileSet> - <!-- Testsuite build --> - <fileSet> - <directory>src/main/distro</directory> - <outputDirectory>jbossws-cxf-bin-dist/tests/ant-import</outputDirectory> - <includes> - <include>build-testsuite.xml</include> - </includes> - </fileSet> - <!-- Appclient patches --> - <fileSet> - <directory>../testsuite/src/test/resources/</directory> - <outputDirectory>jbossws-cxf-bin-dist/tests/etc/appclient</outputDirectory> - </fileSet> - </fileSets> -</assembly> Deleted: stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-src-dist.xml =================================================================== --- stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-src-dist.xml 2014-12-12 09:33:14 UTC (rev 19139) +++ stack/cxf/branches/arquillian/modules/dist/src/main/scripts/assembly-src-dist.xml 2014-12-12 15:06:01 UTC (rev 19140) @@ -1,38 +0,0 @@ -<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>source-distribution</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <fileSets> - <fileSet> - <directory>../../eclipse/</directory> - <outputDirectory>jbossws-cxf-src-dist/eclipse/</outputDirectory> - </fileSet> - <fileSet> - <directory>../../src/</directory> - <outputDirectory>jbossws-cxf-src-dist/src/</outputDirectory> - </fileSet> - <fileSet> - <directory>../</directory> - <outputDirectory>jbossws-cxf-src-dist/modules/</outputDirectory> - <excludes> - <exclude>**/target/**</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../../</directory> - <outputDirectory>jbossws-cxf-src-dist/</outputDirectory> - <includes> - <include>.classpath</include> - <include>.project</include> - <include>build.xml</include> - <include>pom.xml</include> - </includes> - </fileSet> - </fileSets> - -</assembly> Deleted: stack/cxf/branches/arquillian/modules/dist/src/main/scripts/test-exclude.xsl =================================================================== --- stack/cxf/branches/arquillian/modules/dist/src/main/scripts/test-exclude.xsl 2014-12-12 09:33:14 UTC (rev 19139) +++ stack/cxf/branches/arquillian/modules/dist/src/main/scripts/test-exclude.xsl 2014-12-12 15:06:01 UTC (rev 19140) @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<xsl:stylesheet version="1.0" -xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:m="http://maven.apache.org/POM/4.0.0"> -<xsl:param name="targetName"/> -<xsl:output method="text"/> -<xsl:template match="/"> - <xsl:for-each select="//m:profile[m:id=$targetName]/m:build/m:plugins/m:plugin[m:artifactId='maven-surefire-plugin']//m:excludes"> - <xsl:for-each select="m:exclude|comment()"> - <xsl:if test="self::comment()"> - <xsl:text>#</xsl:text> - </xsl:if> - <xsl:value-of select="."/><xsl:text>&#10;</xsl:text> - </xsl:for-each> - </xsl:for-each> -</xsl:template> -</xsl:stylesheet>