Author: thomas.diesler(a)jboss.com Date: 2007-12-13 03:49:06 -0500 (Thu, 13 Dec 2007) New Revision: 5288 Modified: stack/cxf/trunk/src/main/distro/ant.properties.example stack/cxf/trunk/src/main/distro/bin-dist-build.xml Log: Fix AS423 bin dist Modified: stack/cxf/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/src/main/distro/ant.properties.example 2007-12-13 08:45:14 UTC (rev 5287) +++ stack/cxf/trunk/src/main/distro/ant.properties.example 2007-12-13 08:49:06 UTC (rev 5288) @@ -6,9 +6,10 @@ # Optional JBoss Home jboss500.home=(a)jboss500.home@ jboss422.home=(a)jboss422.home@ +jboss423.home=(a)jboss423.home@ -# The JBoss server under test. This can be [jboss422|jboss500] -jbossws.integration.target=jboss500 +# The JBoss server under test. This can be [jboss422|jboss423|jboss500] +jbossws.integration.target=jboss422 # The JBoss settings jboss.server.instance=default Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2007-12-13 08:45:14 UTC (rev 5287) +++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2007-12-13 08:49:06 UTC (rev 5288) @@ -40,19 +40,30 @@ <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="jbossws.integration.${jbossws.integration.target}" value="true"/> <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/> <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> <available property="jboss500.available" file="${jboss500.available.file}"/> <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss423.available" file="${jboss423.available.file}"/> + <condition property="jbossws.integration.jboss50" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + </condition> <condition property="jbossws.integration.jboss42" value="true"> <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> </condition> - <condition property="jbossws.integration.jboss50" value="true"> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <condition property="jbossws.integration.jboss42" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> </condition> <!-- JDK Detection --> @@ -79,6 +90,9 @@ <condition property="jboss.home" value="${jboss422.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> + <condition property="jboss.home" value="${jboss423.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> <!-- Define excludesfile --> <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>