[jboss-cvs] JBossAS SVN: r57453 - branches/Branch_3_2/testsuite/imports/sections

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

Author: dimitris at jboss.org
Date: 2006-10-05 15:35:34 -0400 (Thu, 05 Oct 2006)
New Revision: 57453

Modified:
   branches/Branch_3_2/testsuite/imports/sections/jmx.xml
Log:
JBAS-3742 - On windows the codebase needs an extra slash because the codebaseURL starts with a drive letter

Modified: branches/Branch_3_2/testsuite/imports/sections/jmx.xml
===================================================================
--- branches/Branch_3_2/testsuite/imports/sections/jmx.xml	2006-10-05 19:35:08 UTC (rev 57452)
+++ branches/Branch_3_2/testsuite/imports/sections/jmx.xml	2006-10-05 19:35:34 UTC (rev 57453)
@@ -559,20 +559,22 @@
          </fileset>
       </jar>
 
-      <property environment="env"/>
-      <property name="win32.drive" value="${env.SYSTEMDRIVE}"/>
+      <!-- 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>
       <pathconvert targetos="unix" property="codebaseURL">
-         <map from="${win32.drive}" to=""/>
          <path path="${build.lib}"/>
       </pathconvert>
-      <echo message="+++ codebase=${codebaseURL}"/>
-      <echo message="+++ build.lib=${build.lib}"/>
       <copy todir="${build.lib}" filtering="true" overwrite="true"
-         file="${source.resources}/jmx/archivestest-service.xml">
+         file="${build.resources}/jmx/archivestest-service.xml">
          <filterset>
-            <filter token="codebase" value="file://${codebaseURL}"/>
+            <filter token="codebase" value="file://${winslash}${codebaseURL}"/>
          </filterset>
       </copy>
+      <echo message="+++ build.lib=${build.lib}"/>            
+      <echo message="+++ codebase=file://${winslash}${codebaseURL}"/>
 
       <!-- internal test sar -->
       <jar destfile="${build.lib}/jmx-nointernal.sar">