Author: heiko.braun(a)jboss.com Date: 2008-04-10 05:37:46 -0400 (Thu, 10 Apr 2008) New Revision: 6320 Modified: stack/native/branches/hbraun/ant-import/build-bin-dist.xml stack/native/branches/hbraun/ant-import/build-setup.xml stack/native/branches/hbraun/ant-import/build-thirdparty.xml stack/native/branches/hbraun/ant-import/macros-deploy-native.xml stack/native/branches/hbraun/native-3.0.iml stack/native/branches/hbraun/version.properties Log: Update build to distinguish 422 and 423. Still lacks support for 421 Modified: stack/native/branches/hbraun/ant-import/build-bin-dist.xml =================================================================== --- stack/native/branches/hbraun/ant-import/build-bin-dist.xml 2008-04-10 09:37:04 UTC (rev 6319) +++ stack/native/branches/hbraun/ant-import/build-bin-dist.xml 2008-04-10 09:37:46 UTC (rev 6320) @@ -98,7 +98,7 @@ <include name="jbossws-framework.jar"/> <include name="jbossws-framework-scripts.zip"/> <include name="jbossws-spi.jar"/> - <include name="jbossws-jboss421.jar"/> + <include name="jbossws-jboss42.jar"/> </fileset> <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxrpc.jar"/> Modified: stack/native/branches/hbraun/ant-import/build-setup.xml =================================================================== --- stack/native/branches/hbraun/ant-import/build-setup.xml 2008-04-10 09:37:04 UTC (rev 6319) +++ stack/native/branches/hbraun/ant-import/build-setup.xml 2008-04-10 09:37:46 UTC (rev 6320) @@ -12,94 +12,106 @@ <!-- $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"/> + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> - <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"/> + <!-- 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 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 file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> - <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.jboss42" value="true"> - <or> + <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"/> - </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> + </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> - + <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> + </project> Modified: stack/native/branches/hbraun/ant-import/build-thirdparty.xml =================================================================== --- stack/native/branches/hbraun/ant-import/build-thirdparty.xml 2008-04-10 09:37:04 UTC (rev 6319) +++ stack/native/branches/hbraun/ant-import/build-thirdparty.xml 2008-04-10 09:37:46 UTC (rev 6320) @@ -23,8 +23,9 @@ </target> <target name="thirdparty-init" depends="prepare"> + + <property name="thirdparty.dir" value="${core.dir}/thirdparty"/> - <property name="thirdparty.dir" value="${core.dir}/thirdparty"/> <checksum file="${core.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <condition property="force.thirdparty"> <or> @@ -41,9 +42,26 @@ <!-- thirdpartry-get --> - <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" + + <target name="jboss422-get" if="jbossws.integration.jboss422"> + <echo>*** Using AS 422 container integration ***</echo> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> + </target> + + <target name="jboss423-get" if="jbossws.integration.jboss423"> + <echo>*** Using AS 423 container integration ***</echo> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> + </target> + + <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries"> + <mkdir dir="${thirdparty.dir}"/> + <!-- Note, the jboss-xml-binding and jboss-remoting jars are downloaded in the versions that are actually deployed. Currently only jboss-xml-binding is deployed. Remoting should be downloaded in the version of the oldest supported target container. @@ -51,8 +69,7 @@ It is a mistake to switch the download version dependent on the target container, in which case it is random which version is used by the start targets. --> - - <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common-src.zip" dest="${thirdparty.dir}/jbossws-common-src.zip" usetimestamp="true" verbose="true"/> @@ -61,10 +78,10 @@ <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.zip" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss421.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss421-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> - + + <antcall target="jboss422-get"/> + <antcall target="jboss423-get"/> + <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> Modified: stack/native/branches/hbraun/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/branches/hbraun/ant-import/macros-deploy-native.xml 2008-04-10 09:37:04 UTC (rev 6319) +++ stack/native/branches/hbraun/ant-import/macros-deploy-native.xml 2008-04-10 09:37:46 UTC (rev 6320) @@ -239,8 +239,17 @@ <fileset dir="@{stacklibs}"> <patternset refid="client.patternset"/> </fileset> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="client.patternset"/> + <include name="jbossws-jboss42.jar"/> + </fileset> + </copy> + + <!-- SERVER LIB JARS --> + <mkdir dir="${deploy.dir}/server/${jboss.server.instance}/lib"/> + <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> + <include name="jbossws-jboss42.jar"/> </fileset> </copy> Modified: stack/native/branches/hbraun/native-3.0.iml =================================================================== --- stack/native/branches/hbraun/native-3.0.iml 2008-04-10 09:37:04 UTC (rev 6319) +++ stack/native/branches/hbraun/native-3.0.iml 2008-04-10 09:37:46 UTC (rev 6320) @@ -153,15 +153,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss421.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/getopt.jar!/" /> </CLASSES> <JAVADOC /> Modified: stack/native/branches/hbraun/version.properties =================================================================== --- stack/native/branches/hbraun/version.properties 2008-04-10 09:37:04 UTC (rev 6319) +++ stack/native/branches/hbraun/version.properties 2008-04-10 09:37:46 UTC (rev 6320) @@ -27,8 +27,10 @@ jbossws-spi=3.0-snapshot jbossws-common=snapshot jbossws-framework=3.0-snapshot -jbossws-jboss42=4.2.1.GA +jbossws-jboss422=4.2.2.SP1 +jbossws-jboss423=snapshot_SPI-3.0 + # JBossAS-5.0 jboss-jbossxb-jboss50=2.0.0.CR5 jboss-remoting-jboss50=2.4.0.Beta2