[jboss-cvs] JBossAS SVN: r57463 - trunk/testsuite/imports/sections

[jboss-cvs-commits at lists.jboss.org]

Author: dimitris at jboss.org
Date: 2006-10-06 03:07:17 -0400 (Fri, 06 Oct 2006)
New Revision: 57463

Modified:
   trunk/testsuite/imports/sections/jmx.xml
Log:
JBAS-3742 - the ant we use doesn't support 'else' in a 'condition'

Modified: trunk/testsuite/imports/sections/jmx.xml
===================================================================
--- trunk/testsuite/imports/sections/jmx.xml	2006-10-06 07:06:35 UTC (rev 57462)
+++ trunk/testsuite/imports/sections/jmx.xml	2006-10-06 07:07:17 UTC (rev 57463)
@@ -712,20 +712,19 @@
       
       <!-- On windows the codebase needs an extra slash
       because the codebaseURL starts with a drive letter -->
-      <condition property="winslash" value="/" else="">
-         <os family="windows"/>
-      </condition>
+      <condition property="slash" value="/"><os family="windows"/></condition>
+      <condition property="slash" value=""><os family="unix"/></condition>
       <pathconvert targetos="unix" property="codebaseURL">
          <path path="${build.lib}"/>
       </pathconvert>
       <copy todir="${build.lib}" filtering="true" overwrite="true"
          file="${build.resources}/jmx/archivestest-service.xml">
          <filterset>
-            <filter token="codebase" value="file://${winslash}${codebaseURL}"/>
+            <filter token="codebase" value="file://${slash}${codebaseURL}"/>
          </filterset>
       </copy>
       <echo message="+++ build.lib=${build.lib}"/>            
-      <echo message="+++ codebase=file://${winslash}${codebaseURL}"/>
+      <echo message="+++ codebase=file://${slash}${codebaseURL}"/>
       
       <!-- internal test sar -->
       <jar destfile="${build.lib}/jmx-nointernal.sar">