[jbossws-commits] JBossWS SVN: r4834 - stack/native/branches/jbossws-native-2.0.2/src/main/distro.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sat Oct 20 15:17:27 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-10-20 15:17:27 -0400 (Sat, 20 Oct 2007)
New Revision: 4834
Modified:
stack/native/branches/jbossws-native-2.0.2/src/main/distro/ant.properties.example
stack/native/branches/jbossws-native-2.0.2/src/main/distro/bin-dist-build.xml
stack/native/branches/jbossws-native-2.0.2/src/main/distro/bin-dist-deploy.xml
Log:
Fix distro build
Modified: stack/native/branches/jbossws-native-2.0.2/src/main/distro/ant.properties.example
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/main/distro/ant.properties.example 2007-10-20 17:08:38 UTC (rev 4833)
+++ stack/native/branches/jbossws-native-2.0.2/src/main/distro/ant.properties.example 2007-10-20 19:17:27 UTC (rev 4834)
@@ -4,12 +4,13 @@
# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler at jboss.com $
# Optional JBoss Home
-jboss50.home=@jboss50.home@
-jboss42.home=@jboss42.home@
-jboss40.home=@jboss40.home@
+jboss405.home=@jboss405.home@
+jboss421.home=@jboss421.home@
+jboss422.home=@jboss422.home@
+jboss500.home=@jboss500.home@
-# The JBoss server under test. This can be [jboss50|jboss42|jboss40]
-jbossws.integration.target=jboss42
+# The JBoss server under test. This can be [jboss405|jboss421|jboss422|jboss500]
+jbossws.integration.target=jboss422
# The JBoss settings
jboss.server.instance=default
Modified: stack/native/branches/jbossws-native-2.0.2/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/main/distro/bin-dist-build.xml 2007-10-20 17:08:38 UTC (rev 4833)
+++ stack/native/branches/jbossws-native-2.0.2/src/main/distro/bin-dist-build.xml 2007-10-20 19:17:27 UTC (rev 4834)
@@ -28,37 +28,60 @@
<property file="${basedir}/ant.properties"/>
<property file="${basedir}/version.properties"/>
- <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="jboss405.lib" value="${jboss405.home}/lib"/>
+ <property name="jboss405.client" value="${jboss405.home}/client"/>
+ <property name="jboss405.server" value="${jboss405.home}/server/${jboss.server.instance}"/>
+ <property name="jboss405.server.lib" value="${jboss405.server}/lib"/>
+ <property name="jboss405.server.deploy" value="${jboss405.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="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="jboss405.lib" value="${jboss405.home}/lib"/>
- <property name="jboss405.client" value="${jboss405.home}/client"/>
- <property name="jboss405.server" value="${jboss405.home}/server/${jboss.server.instance}"/>
- <property name="jboss405.server.lib" value="${jboss405.server}/lib"/>
- <property name="jboss405.server.deploy" value="${jboss405.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="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="jboss405.available.file" value="${jboss405.client}/jboss-client.jar"/>
-
- <available property="jboss500.available" file="${jboss500.available.file}"/>
- <available property="jboss422.available" file="${jboss422.available.file}"/>
- <available property="jboss405.available" file="${jboss405.available.file}"/>
+ <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="jboss.server.instance.${jboss.server.instance}" value="true"/>
+
+ <property name="jboss405.available.file" value="${jboss405.client}/jboss-client.jar"/>
+ <property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/>
+ <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
+
+ <available property="jboss405.available" file="${jboss405.available.file}"/>
<available property="jboss405.ejb3.available" file="${jboss405.client}/jboss-ejb3-client.jar"/>
+ <available property="jboss421.available" file="${jboss421.available.file}"/>
+ <available property="jboss422.available" file="${jboss422.available.file}"/>
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <condition property="jbossws.integration.jboss40" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss405"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss405.no.ejb3"/>
+ </or>
+ </condition>
+ <condition property="jbossws.integration.jboss42" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ </or>
+ </condition>
+ <condition property="jbossws.integration.jboss50" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ </condition>
+
<!-- JDK Detection -->
<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
<available classname="java.io.Console" property="HAVE_JDK_1.6"/>
Modified: stack/native/branches/jbossws-native-2.0.2/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/main/distro/bin-dist-deploy.xml 2007-10-20 17:08:38 UTC (rev 4833)
+++ stack/native/branches/jbossws-native-2.0.2/src/main/distro/bin-dist-deploy.xml 2007-10-20 19:17:27 UTC (rev 4834)
@@ -12,85 +12,75 @@
<!-- $Id: bin-dist-deploy.xml 3576 2007-06-14 09:23:52Z thomas.diesler at jboss.com $ -->
<project>
-
- <!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/native to jboss50 -->
- <target name="deploy-jboss50" depends="undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws/native to jboss50">
- <macro-deploy-native50
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
- <macro-deploy-framework
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss500.home}"/>
- </target>
- <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed
- jbosshome="${jboss500.home}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
- </target>
-
- <!-- Remove jbossws/native from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50">
- <macro-undeploy-native50/>
- <macro-undeploy-framework jbosshome="${jboss500.home}"/>
- </target>
-
- <!-- Deploy jbossws/native to jboss42 -->
- <target name="deploy-jboss42" depends="undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws/native to jboss42">
- <macro-deploy-native42
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
- <macro-deploy-framework
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss422.home}"/>
- </target>
- <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed
- jbosshome="${jboss422.home}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
- </target>
-
- <!-- Remove jbossws/native from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws/native from jboss42">
- <macro-undeploy-native42/>
- <macro-undeploy-framework jbosshome="${jboss422.home}"/>
- </target>
- <target name="undeploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
- </target>
-
- <!-- Deploy jbossws/native to jboss40 -->
- <target name="deploy-jboss40" depends="deploy-jboss40-no-ejb3" description="Deploy jbossws/native to jboss40"/>
-
- <target name="deploy-jboss40-ejb3" depends="undeploy-jboss40">
- <macro-deploy-native40
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
+
+ <!-- Deploy jbossws/native to jboss405 -->
+ <target name="deploy-jboss405" depends="deploy-jboss405-no-ejb3" description="Deploy jbossws/native to jboss405"/>
+
+ <target name="deploy-jboss405-ejb3" depends="undeploy-jboss405">
+ <macro-deploy-native405 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- <macro-deploy-framework
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss405.home}"/>
- </target>
-
- <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss405.ejb3.available">
- <macro-setup-native40-no-ejb3/>
- <echo>
- ***********************************
- * JBossWS EJB3 support disabled *
- * All EJB3 tests will fail. *
- ***********************************
- </echo>
- </target>
-
- <!-- Remove jbossws/native from jboss40 -->
- <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40">
- <macro-undeploy-native40/>
- <macro-undeploy-framework jbosshome="${jboss405.home}"/>
- </target>
-
-</project>
+ <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss405.home}"/>
+ </target>
+
+ <target name="deploy-jboss405-no-ejb3" depends="deploy-jboss405-ejb3" unless="jboss405.ejb3.available">
+ <macro-setup-native40-no-ejb3/>
+ <echo>*********************************</echo>
+ <echo>* JBossWS EJB3 support disabled *</echo>
+ <echo>* All EJB3 tests will fail. *</echo>
+ <echo>*********************************</echo>
+ </target>
+
+ <target name="undeploy-jboss405" depends="prepare" description="Remove jbossws/native from jboss405">
+ <macro-undeploy-native405/>
+ <macro-undeploy-framework jbosshome="${jboss405.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/native to jboss421 -->
+ <target name="deploy-jboss421" depends="undeploy-jboss421,deploy-jboss421-endorsed" description="Deploy jbossws/native to jboss421">
+ <macro-deploy-native421 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
+ <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss421.home}"/>
+ </target>
+ <target name="deploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed jbosshome="${jboss421.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
+ </target>
+
+ <target name="undeploy-jboss421" depends="prepare,undeploy-jboss421-endorsed" description="Remove jbossws/native from jboss421">
+ <macro-undeploy-native421/>
+ <macro-undeploy-framework jbosshome="${jboss421.home}"/>
+ </target>
+ <target name="undeploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss421.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/native to jboss422 -->
+ <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/native to jboss422">
+ <macro-deploy-native422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
+ <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss422.home}"/>
+ </target>
+ <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed jbosshome="${jboss422.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
+ </target>
+
+ <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/native from jboss422">
+ <macro-undeploy-native422/>
+ <macro-undeploy-framework jbosshome="${jboss422.home}"/>
+ </target>
+ <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/native to jboss50 -->
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/native to jboss500">
+ <macro-deploy-native500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
+ <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss500.home}"/>
+ </target>
+ <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed jbosshome="${jboss500.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
+ </target>
+
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/native from jboss500">
+ <macro-undeploy-native500/>
+ <macro-undeploy-framework jbosshome="${jboss500.home}"/>
+ </target>
+
+</project>
\ No newline at end of file
More information about the jbossws-commits
mailing list