Author: richard.opalka(a)jboss.com Date: 2008-02-06 12:38:49 -0500 (Wed, 06 Feb 2008) New Revision: 5604 Modified: stack/metro/trunk/src/main/distro/bin-dist-deploy.xml Log: [JBWS-1982] fix Modified: stack/metro/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-06 17:37:25 UTC (rev 5603) +++ stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-06 17:38:49 UTC (rev 5604) @@ -14,24 +14,9 @@ <project> <!-- ================================================================== --> - <!-- Deployment --> + <!-- Deployment JBoss422 --> <!-- ================================================================== --> - <!-- Deploy jbossws/sunri to jboss500 --> - <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/sunri to jboss500"> - <macro-deploy-sunri500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss500.home}"/> - </target> - <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss500.home}" thirdpartylibs="${lib.dir}"/> - </target> - - <!-- Remove jbossws/sunri from jboss500 --> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss500"> - <macro-undeploy-sunri500/> - <macro-undeploy-framework jbosshome="${jboss500.home}"/> - </target> - <!-- Deploy jbossws/sunri to jboss422 --> <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/sunri to jboss422"> <macro-deploy-sunri422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> @@ -42,14 +27,18 @@ </target> <!-- Remove jbossws/sunri from jboss422 --> - <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/sunri from jboss422"> + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss422"> + <macro-undeploy-cxf422/> <macro-undeploy-sunri422/> + <macro-undeploy-native422/> + <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> - <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> - </target> + <!-- ================================================================== --> + <!-- Deployment JBoss423 --> + <!-- ================================================================== --> + <!-- Deploy jbossws/sunri to jboss423 --> <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/sunri to jboss423"> <macro-deploy-sunri423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> @@ -60,12 +49,34 @@ </target> <!-- Remove jbossws/sunri from jboss423 --> - <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws/sunri from jboss423"> + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/sunri from jboss423"> + <macro-undeploy-cxf423/> <macro-undeploy-sunri423/> + <macro-undeploy-native423/> + <macro-undeploy-endorsed jbosshome="${jboss423.home}"/> <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> - <target name="undeploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss423.home}"/> + + <!-- ================================================================== --> + <!-- Deployment JBoss500 --> + <!-- ================================================================== --> + + <!-- Deploy jbossws/sunri to jboss500 --> + <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/sunri to jboss500"> + <macro-deploy-sunri500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> + <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss500.home}"/> </target> + <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-deploy-endorsed jbosshome="${jboss500.home}" thirdpartylibs="${lib.dir}"/> + </target> -</project> \ No newline at end of file + <!-- Remove jbossws/sunri from jboss500 --> + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss500"> + <macro-undeploy-cxf500/> + <macro-undeploy-sunri500/> + <macro-undeploy-native500/> + <macro-undeploy-endorsed jbosshome="${jboss500.home}"/> + <macro-undeploy-framework jbosshome="${jboss500.home}"/> + </target> + +</project>