[jbossws-commits] JBossWS SVN: r3397 - in trunk/build: ant-import and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-06-02 17:25:55 -0400 (Sat, 02 Jun 2007)
New Revision: 3397

Modified:
   trunk/build/ant-import/build-setup.xml
   trunk/build/ant.properties.example
   trunk/build/build.xml
Log:
Add support for AS-4.0

Modified: trunk/build/ant-import/build-setup.xml
===================================================================
--- trunk/build/ant-import/build-setup.xml	2007-06-02 20:56:23 UTC (rev 3396)
+++ trunk/build/ant-import/build-setup.xml	2007-06-02 21:25:55 UTC (rev 3397)
@@ -28,6 +28,10 @@
   <property name="int.sunri.dir" value="${basedir}/integration/sunri"/>
   <property name="int.xfire.dir" value="${basedir}/integration/xfire"/>
   
+  <!-- Check if ant.properties is available -->
+  <available property="ant.properties.available" file="${build.dir}/ant.properties"/>
+  <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
+  
   <property file="${build.dir}/ant.properties"/>
   <property file="${build.dir}/version.properties"/>
   

Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example	2007-06-02 20:56:23 UTC (rev 3396)
+++ trunk/build/ant.properties.example	2007-06-02 21:25:55 UTC (rev 3397)
@@ -6,9 +6,9 @@
 # Optional JBoss Home
 #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
 #jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA
-#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1
+#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
 
-# The JBoss server under test. This can be [jboss50|jboss42]
+# The JBoss server under test. This can be [jboss50|jboss42|jboss40]
 jbossws.integration.target=jboss50
 
 # The JBoss settings
@@ -37,7 +37,7 @@
 hudson.jboss42.rev=HEAD
 
 hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0
-hudson.jboss40.build=jboss-4.0.5.SP1
+hudson.jboss40.build=jboss-4.0.5.SP1-ejb3
 hudson.jboss40.rev=HEAD
 
 hudson.mail.recipients=thomas.diesler at jboss.com, heiko.braun at jboss.com

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2007-06-02 20:56:23 UTC (rev 3396)
+++ trunk/build/build.xml	2007-06-02 21:25:55 UTC (rev 3397)
@@ -105,8 +105,6 @@
   <import file="${basedir}/build/ant-import/build-samples.xml"/>
   <import file="${basedir}/build/ant-import/build-hudson.xml"/>
   
-  <property name="build.output.dir" value="${build.dir}/output"/>
-  
   <!-- ================================================================== -->
   <!-- Archives                                                           -->
   <!-- ================================================================== -->