Fixed a class incompatibility introduced in 1.257 that breaks TFS and ClearCase plugins.

    (<a href="http://www.nabble.com/Build-257-IncompatibleClassChangeError-td20229011.html">report</a>)


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

core/src/main/java/hudson/tasks/Ant.java

@@ -163,11 +163,11 @@ public class Ant extends Builder {
             }
 
             for (Entry<Object,Object> entry : p.entrySet()) {
-                args.add("-D" + entry.getKey() + "=" + vr.replaceAll(entry.getValue().toString()));
+                args.add("-D" + entry.getKey() + "=" + Util.replaceMacro(entry.getValue().toString(),vr));
             }
         }
 
-        args.addTokenized(vr.replaceAll(targets).replaceAll("[\t\r\n]+"," "));
+        args.addTokenized(Util.replaceMacro(targets,vr).replaceAll("[\t\r\n]+"," "));
 
         Map<String,String> env = build.getEnvVars();
         if(ai!=null)

core/src/main/java/hudson/util/VariableResolver.java

 package hudson.util;
 
-import hudson.Util;
-
-import java.util.Map;
 import java.util.Collection;
+import java.util.Map;
 
 /**
  * Resolves variables to its value, while encapsulating
@@ -11,7 +9,7 @@ import java.util.Collection;
  *
  * @author Kohsuke Kawaguchi
  */
-public abstract class VariableResolver<V> {
+public interface VariableResolver<V> {
     /**
      * Receives a variable name and obtains the value associated with the name.
      *
@@ -31,13 +29,6 @@ public abstract class VariableResolver<V> {
      */
     public abstract V resolve(String name);
 
-    /**
-     * Short for {@code Util.replaceMacro(text,this)}
-     */
-    public final String replaceAll(String text) {
-        return Util.replaceMacro(text,(VariableResolver)this);
-    }
-
     /**
      * Empty resolver that always returns null.
      */
@@ -50,7 +41,7 @@ public abstract class VariableResolver<V> {
     /**
      * {@link VariableResolver} backed by a {@link Map}.
      */
-    public static final class ByMap<V> extends VariableResolver<V> {
+    public static final class ByMap<V> implements VariableResolver<V> {
         private final Map<String,V> data;
 
         public ByMap(Map<String, V> data) {
@@ -65,7 +56,7 @@ public abstract class VariableResolver<V> {
     /**
      * Union of multiple {@link VariableResolver}.
      */
-    public static final class Union<V> extends VariableResolver<V> {
+    public static final class Union<V> implements VariableResolver<V> {
         private final VariableResolver<? extends V>[] resolvers;
 
         public Union(VariableResolver<? extends V>... resolvers) {