Author: richard.opalka(a)jboss.com Date: 2009-01-09 18:33:37 -0500 (Fri, 09 Jan 2009) New Revision: 9007 Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: [JBWS-2431] fix native AS 4.2.x deployment Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-01-09 17:56:34 UTC (rev 9006) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-01-09 23:33:37 UTC (rev 9007) @@ -558,11 +558,12 @@ <!-- Deploy JBossWS --> <!-- ================================================================== --> - <target name="deploy-jbossws-native42" depends="check-parameters"> + <available classname="java.io.Console" property="HAVE_JDK16_OR_ABOVE"/> + + <target name="deploy-jbossws-native42" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> @@ -601,6 +602,10 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> + <target name="deploy-jbossws-endorsed" if="HAVE_JDK16_OR_ABOVE"> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> + </target> + <target name="check-parameters"> <fail message="artifactsdir must be specified" unless="artifactsdir"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>