Author: richard.opalka(a)jboss.com Date: 2010-01-21 11:07:58 -0500 (Thu, 21 Jan 2010) New Revision: 11468 Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: refactoring - COMMON, FRAMEWORK and ASIL have to be in AS/common/lib not in deployers folder Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-01-21 16:07:42 UTC (rev 11467) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-01-21 16:07:58 UTC (rev 11468) @@ -185,6 +185,7 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.server.lib.patternset"/> + <include name="**/jbossws-${jbossid}.jar"/> </fileset> </copy> </sequential> @@ -251,12 +252,6 @@ <include name="META-INF/**"/> </fileset> </copy> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> - </fileset> - </copy> <antcall target="modify-jboss-integration"> <param name="targetdir" value="@{targetdir}"/> </antcall> @@ -265,11 +260,6 @@ <target name="modify-jboss-integration" depends="process-jboss-integration" if="fixintegration"> <sequential> - <copy todir="${targetdir}" flatten="true" overwrite="true"> - <fileset dir="${thirdpartydir}"> - <include name="**/jbossws-${jbossid}.jar"/> - </fileset> - </copy> <copy todir="${targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="${artifactsdir}/resources/jbossws-${jbossid}"> <include name="**/stack-agnostic-jboss-beans.xml"/> @@ -344,6 +334,9 @@ <fileset dir="${jboss.home}/client"> <include name="**/jbossws-jboss*.jar"/> </fileset> + <fileset dir="${jboss.home}/common"> + <include name="**/jbossws-jboss*.jar"/> + </fileset> </delete> </target>