[jbossws-commits] JBossWS SVN: r3075 - in trunk: build/ant-import and 1 other directories.
Author: thomas.diesler(a)jboss.com
Date: 2007-05-13 10:11:17 -0400 (Sun, 13 May 2007)
New Revision: 3075
Modified:
trunk/build/ant-import/build-setup.xml
trunk/build/ant.properties.example
trunk/jbossws-core/ant-import/build-testsuite.xml
Log:
Define jboss.home in setup
Modified: trunk/build/ant-import/build-setup.xml
===================================================================
--- trunk/build/ant-import/build-setup.xml 2007-05-13 04:55:04 UTC (rev 3074)
+++ trunk/build/ant-import/build-setup.xml 2007-05-13 14:11:17 UTC (rev 3075)
@@ -65,6 +65,19 @@
<available property="jboss42.available"
file="${jboss42.available.file}"/>
<available property="jboss40.available"
file="${jboss40.available.file}"/>
+ <available property="jbossws.portal.content.available"
file="${jbossws.portal.content}" type="dir"/>
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}"
arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}"
arg2="jboss42"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss40.home}">
+ <equals arg1="${jbossws.integration.target}"
arg2="jboss40"/>
+ </condition>
+
<!-- JDK Detection -->
<available classname="java.lang.StackTraceElement"
property="HAVE_JDK_1.4"/>
<available classname="java.lang.Enum"
property="HAVE_JDK_1.5"/>
@@ -75,11 +88,6 @@
<target name="prepare">
- <echo message="jboss50.home = ${jboss50.home}"/>
- <echo message="jboss42.home = ${jboss42.home}"/>
-
- <available property="jbossws.portal.content.available"
file="${jbossws.portal.content}" type="dir"/>
-
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-05-13 04:55:04 UTC (rev 3074)
+++ trunk/build/ant.properties.example 2007-05-13 14:11:17 UTC (rev 3075)
@@ -27,7 +27,6 @@
hudson.port=8180
hudson.jdk15=/usr/java/jdk1.5
-hudson.jdk14=/usr/java/jdk1.4
hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/trunk
hudson.jboss50.build=jboss-5.0.0.Beta3
@@ -41,7 +40,7 @@
hudson.jboss40.build=jboss-4.0.5.SP1
hudson.jboss40.rev=HEAD
-hudson.mail.recipients=thomas.diesler(a)jboss.com, heiko.braun(a)jboss.com,
alejandro.guizar(a)jboss.com
+hudson.mail.recipients=thomas.diesler(a)jboss.com, heiko.braun(a)jboss.com
hudson.smtp.host=mail.navisite.com
# JBossWS Release
Modified: trunk/jbossws-core/ant-import/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-testsuite.xml 2007-05-13 04:55:04 UTC (rev 3074)
+++ trunk/jbossws-core/ant-import/build-testsuite.xml 2007-05-13 14:11:17 UTC (rev 3075)
@@ -17,17 +17,6 @@
<!-- Available integration target -->
<property name="integration.target.${jbossws.integration.target}"
value="true"/>
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
- <equals arg1="${jbossws.integration.target}"
arg2="jboss50"/>
- </condition>
- <condition property="jboss.home" value="${jboss42.home}">
- <equals arg1="${jbossws.integration.target}"
arg2="jboss42"/>
- </condition>
- <condition property="jboss.home" value="${jboss40.home}">
- <equals arg1="${jbossws.integration.target}"
arg2="jboss40"/>
- </condition>
-
<!-- Define excluded tests -->
<property name="excludes-short-name"
value="tests-${jbossws.integration.target}-excludes.txt"/>
<property name="excludesfile"
value="${tests.resources.dir}/${excludes-short-name}"/>