Merged revisions 25543 via svnmerge from

https://svn.dev.java.net/svn/hudson/branches/rc

........
  r25543 | kohsuke | 2010-01-08 13:52:04 -0800 (Fri, 08 Jan 2010) | 1 line
  
  added a hidden switch to control the 'workspace' name.
........


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@25544 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/java/hudson/model/Slave.java

@@ -255,7 +255,7 @@ public abstract class Slave extends Node implements Serializable {
     public FilePath getWorkspaceRoot() {
         FilePath r = getRootPath();
         if(r==null) return null;
-        return r.child("workspace");
+        return r.child(WORKSPACE_ROOT);
     }
 
     /**
@@ -414,4 +414,9 @@ public abstract class Slave extends Node implements Serializable {
 
         private static final long serialVersionUID = 1L;
     }
+
+    /**
+     * Determines the workspace root file name for those who really really need the shortest possible path name.
+     */
+    private static final String WORKSPACE_ROOT = System.getProperty(Slave.class.getName()+".workspaceRoot","workspace");
 }