[jbossws-commits] JBossWS SVN: r2188 - branches/jbossws-1.2.0/build/ant-import.
Author: thomas.diesler(a)jboss.com
Date: 2007-01-30 05:23:10 -0500 (Tue, 30 Jan 2007)
New Revision: 2188
Modified:
branches/jbossws-1.2.0/build/ant-import/build-hudson.xml
Log:
Rollback Win script stuff
Modified: branches/jbossws-1.2.0/build/ant-import/build-hudson.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-hudson.xml 2007-01-30 10:14:19 UTC (rev
2187)
+++ branches/jbossws-1.2.0/build/ant-import/build-hudson.xml 2007-01-30 10:23:10 UTC (rev
2188)
@@ -28,16 +28,6 @@
<available file="${hudson.root}"
property="hudson.root.available"/>
<available file="${hudson.tomcat}"
property="hudson.tomcat.available"/>
<fail message="Hudson root not available"
unless="hudson.root.available"/>
-
- <condition property="script.ext" value="bat">
- <os family="windows"/>
- </condition>
- <condition property="script.ext" value="sh">
- <not>
- <os family="windows"/>
- </not>
- </condition>
-
</target>
<!--
@@ -73,8 +63,12 @@
<target name="hudson-setup"
depends="init-hudson,hudson-tomcat-setup"
description="Setup the Hudson QA environment">
- <basename file="${svn.url}" property="svn.basename" />
- <dirname file="${basedir}" property="svn.basedir.local" />
+ <exec executable="basename" outputproperty="svn.basename">
+ <arg value="${svn.url}"/>
+ </exec>
+ <exec executable="dirname"
outputproperty="svn.basedir.local">
+ <arg value="${basedir}"/>
+ </exec>
<!-- Configure Hudson -->
<copy todir="${hudson.home}" overwrite="true">
@@ -94,7 +88,7 @@
<echo/>
<echo message="*************************************"/>
- <echo message="* Hudson setup sucessfuly *"/>
+ <echo message="* Hudson setup successfully *"/>
<echo message="* ant hudson-start *"/>
<echo message="*************************************"/>
<echo/>
@@ -103,13 +97,13 @@
<target name="hudson-stop" depends="init-hudson"
description="Stops the Hudson QA environment">
- <exec executable="${hudson.tomcat}/bin/catalina.${script.ext}"
failonerror="true" dir="${hudson.tomcat}">
+ <exec executable="${hudson.tomcat}/bin/catalina.sh"
failonerror="true">
<arg line="stop"/>
</exec>
<echo/>
<echo message="*************************************"/>
- <echo message="* Hudson stopped sucessfully *"/>
+ <echo message="* Hudson stoped successfully *"/>
<echo message="* ant hudson-start *"/>
<echo message="*************************************"/>
<echo/>
@@ -119,7 +113,7 @@
<target name="hudson-start" depends="init-hudson"
description="Start the Hudson QA environment">
<mkdir dir="${build.output.dir}"/>
- <exec executable="${hudson.tomcat}/bin/catalina.${script.ext}"
failonerror="true" dir="${hudson.tomcat}"
output="${build.output.dir}/hudson.log">
+ <exec executable="${hudson.tomcat}/bin/catalina.sh"
failonerror="true" output="${build.output.dir}/hudson.log">
<arg line="start"/>
</exec>