Author: thomas.diesler(a)jboss.com Date: 2008-04-28 09:53:51 -0400 (Mon, 28 Apr 2008) New Revision: 6723 Modified: stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/build-setup.xml stack/native/trunk/ant-import/jbossws-deploy-macros.xml Log: update stack deployment Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2008-04-28 13:40:39 UTC (rev 6722) +++ stack/native/trunk/ant-import/build-deploy.xml 2008-04-28 13:53:51 UTC (rev 6723) @@ -150,7 +150,6 @@ <target name="undeploy-jboss500" depends="deploy-target-jboss500" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> - <macro-undeploy-deployer targetdir="${jboss500.server.deploy}/jbossws.sar"/> <delete dir="${jboss500.server.deploy}/juddi-service.sar"/> </target> @@ -174,7 +173,6 @@ <target name="undeploy-jboss501" depends="deploy-target-jboss501" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> - <macro-undeploy-deployer targetdir="${jboss501.server.deploy}/jbossws.sar"/> <delete dir="${jboss501.server.deploy}/juddi-service.sar"/> </target> Modified: stack/native/trunk/ant-import/build-setup.xml =================================================================== --- stack/native/trunk/ant-import/build-setup.xml 2008-04-28 13:40:39 UTC (rev 6722) +++ stack/native/trunk/ant-import/build-setup.xml 2008-04-28 13:53:51 UTC (rev 6723) @@ -12,114 +12,134 @@ <!-- $Id: build-setup.xml 4147 2007-08-03 10:08:11Z thomas.diesler(a)jboss.com $ --> <project> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <!-- Check if ant.properties is available --> - <available property="ant.properties.available" file="${basedir}/ant.properties"/> - <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> - - <property file="${basedir}/ant.properties"/> - <property file="${basedir}/version.properties"/> - - <property name="jboss421.lib" value="${jboss421.home}/lib"/> - <property name="jboss421.client" value="${jboss421.home}/client"/> - <property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/> - <property name="jboss421.server.lib" value="${jboss421.server}/lib"/> - <property name="jboss421.server.deploy" value="${jboss421.server}/deploy"/> - - <property name="jboss422.lib" value="${jboss422.home}/lib"/> - <property name="jboss422.client" value="${jboss422.home}/client"/> - <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> - <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> - <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> - - <property name="jboss423.lib" value="${jboss423.home}/lib"/> - <property name="jboss423.client" value="${jboss423.home}/client"/> - <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> - <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> - <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> - - <property name="jboss500.lib" value="${jboss500.home}/lib"/> - <property name="jboss500.client" value="${jboss500.home}/client"/> - <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> - <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> - <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> - <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - - <property name="jboss501.lib" value="${jboss501.home}/lib"/> - <property name="jboss501.client" value="${jboss501.home}/client"/> - <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> - <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> - <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> - - <property name="jboss.server.instance.${jboss.server.instance}" value="true"/> - - <property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/> - <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> - <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> - <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> - - <available property="jboss421.available" file="${jboss421.available.file}"/> - <available property="jboss422.available" file="${jboss422.available.file}"/> - <available property="jboss423.available" file="${jboss423.available.file}"/> - <available property="jboss500.available" file="${jboss500.available.file}"/> - <available property="jboss501.available" file="${jboss501.available.file}"/> - - <condition property="jbossws.integration.jboss421" value="true"> + + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> + + <!-- Check if ant.properties is available --> + <available property="ant.properties.available" file="${basedir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + + <property name="jboss421.lib" value="${jboss421.home}/lib"/> + <property name="jboss421.client" value="${jboss421.home}/client"/> + <property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/> + <property name="jboss421.server.lib" value="${jboss421.server}/lib"/> + <property name="jboss421.server.deploy" value="${jboss421.server}/deploy"/> + + <property name="jboss422.lib" value="${jboss422.home}/lib"/> + <property name="jboss422.client" value="${jboss422.home}/client"/> + <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> + <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> + <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> + + <property name="jboss423.lib" value="${jboss423.home}/lib"/> + <property name="jboss423.client" value="${jboss423.home}/client"/> + <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> + <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> + <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> + + <property name="jboss500.lib" value="${jboss500.home}/lib"/> + <property name="jboss500.client" value="${jboss500.home}/client"/> + <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> + <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> + <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> + + <property name="jboss501.lib" value="${jboss501.home}/lib"/> + <property name="jboss501.client" value="${jboss501.home}/client"/> + <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> + <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> + <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> + <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> + + <property name="jboss.server.instance.${jboss.server.instance}" value="true"/> + + <property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/> + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> + <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> + + <available property="jboss421.available" file="${jboss421.available.file}"/> + <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss423.available" file="${jboss423.available.file}"/> + <available property="jboss500.available" file="${jboss500.available.file}"/> + <available property="jboss501.available" file="${jboss501.available.file}"/> + + <condition property="jbossws.integration.jboss421" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> + </condition> + <condition property="jbossws.integration.jboss422" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + </condition> + <condition property="jbossws.integration.jboss423" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> + </condition> + <condition property="jbossws.integration.jboss500" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + </condition> + <condition property="jbossws.integration.jboss501" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </condition> + + <condition property="jbossws.integration.jboss42" value="true"> + <or> <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> - </condition> - - <condition property="jbossws.integration.jboss422" value="true"> <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - </condition> - - <condition property="jbossws.integration.jboss423" value="true"> <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </condition> - - <condition property="jbossws.integration.jboss500" value="true"> + </or> + </condition> + <condition property="jbossws.integration.jboss50" value="true"> + <or> <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - </condition> - - <condition property="jbossws.integration.jboss501" value="true"> <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </condition> - - <condition property="jbossws.integration.jboss42" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </or> - </condition> - <condition property="jbossws.integration.jboss50" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </or> - </condition> - - <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> - - <!-- JDK Detection --> - <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - <available classname="java.io.Console" property="HAVE_JDK_1.6"/> - - <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="prepare"> - <tstamp> - <format property="build.id" pattern="yyyyMMddHHmm"/> - </tstamp> - </target> - + </or> + </condition> + + <!-- Define jboss.home --> + <condition property="jboss.home" value="${jboss421.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> + </condition> + <condition property="jboss.home" value="${jboss422.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + </condition> + <condition property="jboss.home" value="${jboss423.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> + </condition> + <condition property="jboss.home" value="${jboss500.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + </condition> + <condition property="jboss.home" value="${jboss501.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </condition> + + <property name="jboss.client" value="${jboss.home}/client"/> + <property name="jboss.lib" value="${jboss.home}/lib"/> + <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> + <property name="jboss.server.lib" value="${jboss.server}/lib"/> + <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> + <property name="jboss.server.deployers" value="${jboss.server}/deployers"/> + + <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> + + <!-- JDK Detection --> + <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="prepare"> + <tstamp> + <format property="build.id" pattern="yyyyMMddHHmm"/> + </tstamp> + </target> + </project> Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-28 13:40:39 UTC (rev 6722) +++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-28 13:53:51 UTC (rev 6723) @@ -364,8 +364,8 @@ <!-- delete stale container integration jars --> <delete> - <fileset dir="${jboss.server.home}/lib"> - <include name="jbossws-jboss*.jar"/> + <fileset dir="${jboss.server.home}"> + <include name="**/jbossws-jboss*.jar"/> </fileset> <fileset dir="${jboss.home}/client"> <include name="jbossws-jboss*.jar"/> @@ -383,16 +383,4 @@ </sequential> </macrodef> - <macrodef name="macro-undeploy-deployer"> - <attribute name="targetdir"/> - <sequential> - <property name="jboss.server.home" value="@{targetdir}/../.."/> - <delete> - <fileset dir="${jboss.server.home}/deployers/jbossws.deployer"> - <include name="jbossws-jboss*.jar"/> - </fileset> - </delete> - </sequential> - </macrodef> - </project> \ No newline at end of file