Author: richard.opalka(a)jboss.com Date: 2008-05-28 06:38:08 -0400 (Wed, 28 May 2008) New Revision: 7187 Modified: stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/distro/jbossws-default-deploy.conf stack/native/trunk/src/main/distro/jbossws-deploy-macros.xml Log: [JBWS-2167] un/deploy juddi-service.sar Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2008-05-28 10:05:18 UTC (rev 7186) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-05-28 10:38:08 UTC (rev 7187) @@ -171,7 +171,7 @@ <macrodef name="macro-create-deploy-conf"> <attribute name="deploystructure"/> <sequential> - <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/> + <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**,**/juddi-service.sar/**"/> <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> <property name="jbossws.sar.dir" value=&quot;(a){deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> Modified: stack/native/trunk/src/main/distro/jbossws-default-deploy.conf =================================================================== --- stack/native/trunk/src/main/distro/jbossws-default-deploy.conf 2008-05-28 10:05:18 UTC (rev 7186) +++ stack/native/trunk/src/main/distro/jbossws-default-deploy.conf 2008-05-28 10:38:08 UTC (rev 7187) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar \ No newline at end of file +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar \ No newline at end of file Modified: stack/native/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-05-28 10:05:18 UTC (rev 7186) +++ stack/native/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-05-28 10:38:08 UTC (rev 7187) @@ -248,7 +248,24 @@ </copy> </sequential> </macrodef> + + <!-- ================================================================== --> + <!-- Deploy JUDDI Service --> + <!-- ================================================================== --> + <macrodef name="macro-deploy-juddi-sar"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <unzip dest="@{targetdir}"> + <fileset dir="@{thirdpartydir}"> + <include name="juddi-service.sar"/> + </fileset> + </unzip> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy JBossWS Service --> <!-- ================================================================== --> @@ -372,6 +389,7 @@ <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${artifactsdir}/lib"/> </target> <target name="deploy-jbossws-native50" depends="deploy-jbossws-endorsed"> @@ -382,6 +400,7 @@ <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${artifactsdir}/lib"/> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> @@ -422,6 +441,9 @@ <!-- delete jbossws.sar --> <delete dir="@{targetdir}"/> + <!-- delete juddi-service.sar --> + <delete dir="@{targetdir}/../juddi-service.sar"/> + </sequential> </macrodef>