Author: thomas.diesler(a)jboss.com Date: 2007-12-12 08:54:55 -0500 (Wed, 12 Dec 2007) New Revision: 5267 Modified: stack/cxf/trunk/ant-import/build-deploy.xml stack/cxf/trunk/ant-import/macros-deploy-cxf.xml Log: Add deploy-jboss423 Modified: stack/cxf/trunk/ant-import/build-deploy.xml =================================================================== --- stack/cxf/trunk/ant-import/build-deploy.xml 2007-12-12 13:31:36 UTC (rev 5266) +++ stack/cxf/trunk/ant-import/build-deploy.xml 2007-12-12 13:54:55 UTC (rev 5267) @@ -20,8 +20,8 @@ <!-- Deployment --> <!-- ================================================================== --> - <!-- Deploy to jboss50 --> - <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/cxf to jboss50"> + <!-- Deploy to jboss500 --> + <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/cxf to jboss500"> <macro-deploy-cxf500 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> @@ -31,14 +31,14 @@ jbosshome="${jboss500.home}"/> </target> - <!-- Remove from jboss50 --> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss50"> + <!-- Remove from jboss500 --> + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss500"> <macro-undeploy-cxf500/> <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> - <!-- Deploy to jboss42 --> - <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/cxf to jboss42"> + <!-- Deploy to jboss422 --> + <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/cxf to jboss422"> <macro-deploy-cxf422 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> @@ -48,10 +48,27 @@ jbosshome="${jboss422.home}"/> </target> - <!-- Remove from jboss42 --> - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss42"> + <!-- Remove from jboss422 --> + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss422"> <macro-undeploy-cxf422/> <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> + <!-- Deploy to jboss423 --> + <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/cxf to jboss423"> + <macro-deploy-cxf423 + stacklibs="${int.cxf.dir}/output/lib" + thirdpartylibs="${int.cxf.dir}/thirdparty"/> + + <macro-deploy-framework + thirdpartylibs="${int.cxf.dir}/thirdparty" + jbosshome="${jboss423.home}"/> + </target> + + <!-- Remove from jboss423 --> + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/cxf from jboss423"> + <macro-undeploy-cxf423/> + <macro-undeploy-framework jbosshome="${jboss423.home}"/> + </target> + </project> Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2007-12-12 13:31:36 UTC (rev 5266) +++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2007-12-12 13:54:55 UTC (rev 5267) @@ -17,7 +17,7 @@ <!-- Deployment --> <!-- ================================================================== --> - <!-- Deploy to jboss50 --> + <!-- Deploy jbossws/cxf to jboss500 --> <macrodef name="macro-deploy-cxf500"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> @@ -56,7 +56,7 @@ </sequential> </macrodef> - <!-- Undeploy from jboss50 --> + <!-- Undeploy jbossws/cxf from jboss500 --> <macrodef name="macro-undeploy-cxf500"> <sequential> <delete> @@ -85,6 +85,7 @@ </sequential> </macrodef> + <!-- Deploy jbossws/cxf to jboss422 --> <macrodef name="macro-deploy-cxf422"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> @@ -116,7 +117,7 @@ </sequential> </macrodef> - <!-- Remove jbossws/cxf from jboss42 --> + <!-- Undeploy jbossws/cxf from jboss422 --> <macrodef name="macro-undeploy-cxf422"> <sequential> <delete> @@ -131,4 +132,51 @@ </sequential> </macrodef> + <!-- Deploy jbossws/cxf to jboss423 --> + <macrodef name="macro-deploy-cxf423"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + + <!-- CLIENT JARS --> + <copy todir="${jboss423.home}/client" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + </fileset> + </copy> + + <!-- BOOTSTRAP JARS --> + <copy todir="${jboss423.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + + <!--SERVER JARS --> + <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/> + <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src=&quot;(a){stacklibs}/jbossws-cxf42.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> + + <!-- Undeploy jbossws/cxf from jboss423 --> + <macrodef name="macro-undeploy-cxf423"> + <sequential> + <delete> + <!-- CLIENT JARS --> + <fileset dir="${jboss423.home}/client"> + <include name="jbossws-spi.jar"/> + </fileset> + </delete> + + <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/> + <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + </project>