Author: asoldano Date: 2014-12-18 04:22:40 -0500 (Thu, 18 Dec 2014) New Revision: 19152 Removed: stack/cxf/branches/arquillian/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: Removing file not needed anymore Deleted: stack/cxf/branches/arquillian/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/arquillian/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-12-17 15:29:10 UTC (rev 19151) +++ stack/cxf/branches/arquillian/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-12-18 09:22:40 UTC (rev 19152) @@ -1,376 +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> - - <!-- ================================================================== --> - <!-- 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=&quot;**/jbossws-cxf-resources-(a){jbossid}.jar&quot;/&gt; - <include name=&quot;**/jbossws-(a){jbossid}-server-integration.jar&quot;/&gt; - </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=&quot;**/jbossws-cxf-resources-(a){jbossid}.jar&quot;/&gt; - <include name=&quot;**/jbossws-(a){jbossid}-server-integration.jar&quot;/&gt; - </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=&quot;(a){targetdir}/org/jboss/as/webservices/jbossws-modules.conf&quot; 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>