Author: thomas.diesler(a)jboss.com Date: 2007-12-12 08:58:45 -0500 (Wed, 12 Dec 2007) New Revision: 5268 Modified: stack/metro/trunk/ant-import/build-deploy.xml stack/metro/trunk/ant-import/macros-deploy-sunri.xml Log: Add deploy-jboss423 Modified: stack/metro/trunk/ant-import/build-deploy.xml =================================================================== --- stack/metro/trunk/ant-import/build-deploy.xml 2007-12-12 13:54:55 UTC (rev 5267) +++ stack/metro/trunk/ant-import/build-deploy.xml 2007-12-12 13:58:45 UTC (rev 5268) @@ -17,41 +17,63 @@ <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/> <!-- ================================================================== --> - <!-- Deployment --> + <!-- Deployment JBoss422 --> <!-- ================================================================== --> - <!-- Deploy to jboss50 --> - <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/sunri to jboss50"> - <macro-deploy-sunri500 + <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/sunri to jboss42"> + <macro-deploy-sunri422 stacklibs="${int.sunri.dir}/output/lib" thirdpartylibs="${int.sunri.dir}/thirdparty"/> <macro-deploy-framework thirdpartylibs="${int.sunri.dir}/thirdparty" - jbosshome="${jboss500.home}"/> + jbosshome="${jboss422.home}"/> </target> - <!-- Remove from jboss50 --> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50"> - <macro-undeploy-sunri500/> - <macro-undeploy-framework jbosshome="${jboss500.home}"/> + <!-- Remove from jboss422 --> + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42"> + <macro-undeploy-sunri422/> + <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> - <!-- Deploy to jboss42 --> - <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/sunri to jboss42"> - <macro-deploy-sunri422 + <!-- ================================================================== --> + <!-- Deployment JBoss423 --> + <!-- ================================================================== --> + + <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/sunri to jboss42"> + <macro-deploy-sunri423 stacklibs="${int.sunri.dir}/output/lib" thirdpartylibs="${int.sunri.dir}/thirdparty"/> <macro-deploy-framework thirdpartylibs="${int.sunri.dir}/thirdparty" - jbosshome="${jboss422.home}"/> + jbosshome="${jboss423.home}"/> </target> - <!-- Remove from jboss42 --> - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42"> - <macro-undeploy-sunri422/> - <macro-undeploy-framework jbosshome="${jboss422.home}"/> + <!-- Remove from jboss423 --> + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/sunri from jboss42"> + <macro-undeploy-sunri423/> + <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> + <!-- ================================================================== --> + <!-- Deployment JBoss500 --> + <!-- ================================================================== --> + + <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/sunri to jboss50"> + <macro-deploy-sunri500 + stacklibs="${int.sunri.dir}/output/lib" + thirdpartylibs="${int.sunri.dir}/thirdparty"/> + + <macro-deploy-framework + thirdpartylibs="${int.sunri.dir}/thirdparty" + jbosshome="${jboss500.home}"/> + </target> + + <!-- Remove from jboss500 --> + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50"> + <macro-undeploy-sunri500/> + <macro-undeploy-framework jbosshome="${jboss500.home}"/> + </target> + </project> Modified: stack/metro/trunk/ant-import/macros-deploy-sunri.xml =================================================================== --- stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2007-12-12 13:54:55 UTC (rev 5267) +++ stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2007-12-12 13:58:45 UTC (rev 5268) @@ -53,7 +53,7 @@ </sequential> </macrodef> - <!-- Remove jbossws/sunri from jboss42 --> + <!-- Remove jbossws/sunri from jboss422 --> <macrodef name="macro-undeploy-sunri422"> <sequential> <delete> @@ -78,6 +78,70 @@ </macrodef> <!-- ================================================================== --> + <!-- Deployment JBoss423 --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-sunri423"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <copy todir="${jboss423.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jbossws-sunri-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jaxws-api.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> + <include name="jsr181-api.jar"/> + <include name="saaj-api.jar"/> + <include name="saaj-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss423.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){stacklibs}/jbossws-sunri42.sar&quot;/&gt; + <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </sequential> + </macrodef> + + <!-- Remove jbossws/sunri from jboss423 --> + <macrodef name="macro-undeploy-sunri423"> + <sequential> + <delete> + <fileset dir="${jboss423.home}/client"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jaxws-api.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> + <include name="jsr181-api.jar"/> + <include name="saaj-api.jar"/> + <include name="saaj-impl.jar"/> + <include name="jbossws-sunri-client.jar"/> + </fileset> + </delete> + <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + + <!-- ================================================================== --> <!-- Deployment JBoss500 --> <!-- ================================================================== -->