--- groovy/util/AntBuilder.java	2005-04-25 15:04:50.000000000 -0700
+++ /home/hchan/groovy-1.0-jsr-01/src/main/groovy/util/AntBuilder.java	2005-04-05 23:17:08.000000000 -0700
@@ -1,5 +1,5 @@
 /*
- $Id: AntBuilder.java,v 1.1 2005/04/22 22:33:35 q8e192 Exp $
+ $Id: AntBuilder.java,v 1.9 2004/12/13 23:48:21 glaforge Exp $
 
  Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
 
@@ -54,25 +54,17 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.Hashtable;
 
 import org.apache.tools.ant.*;
 import org.apache.tools.ant.types.DataType;
-import org.apache.tools.ant.taskdefs.ConditionTask;
-import org.apache.tools.ant.taskdefs.condition.Condition;
 import org.codehaus.groovy.ant.FileScanner;
 import org.codehaus.groovy.runtime.InvokerHelper;
-import net.sf.gravy.*;
 
 /**
  * Allows Ant tasks to be used with GroovyMarkup 
  * 
- * History
- * - fixed bug so this works with a ConditionTask
- * -- (<Henry Chan>hchan@apache.org)
- *
  * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>, changes by Dierk Koenig (dk)
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.9 $
  */
 public class AntBuilder extends BuilderSupport {
 
@@ -94,12 +86,6 @@
         return project;
     }
 
-    
-    // hc: convenience to get properties
-    public Hashtable getProperties() {
-	return project.getProperties();
-    }
-
     /**
      * @return Factory method to create new Project instances
      */
@@ -234,7 +220,6 @@
             }
 
             if (nested != null) {
-		
                 answer = nested;
 
                 // set the task ID if one is given
@@ -244,10 +229,7 @@
                 }
 
                 try {
-		    // some conditions have "name" as a parameter like Os
-		    if (!(nested instanceof Condition)) {
-			InvokerHelper.setProperty(nested, "name", tagName);
-		    }
+                    InvokerHelper.setProperty(nested, "name", tagName);
                 }
                 catch (Exception e) {
                 }
@@ -260,7 +242,6 @@
                     IntrospectionHelper ih = IntrospectionHelper.getHelper(parentObject.getClass());
                     try {
                         if (log.isLoggable(Level.FINE)) {
-			    /*
                             log.fine(
                                 "About to set the: "
                                     + tagName
@@ -270,7 +251,6 @@
                                     + nested
                                     + " with type: "
                                     + nested.getClass());
-			    */
                         }
 
                         ih.storeElement(project, parentObject, nested, tagName);
@@ -337,10 +317,6 @@
     // Implementation methods
     //-------------------------------------------------------------------------
     protected void setBeanProperties(Object object, Map map) {
-	if (object instanceof GravyConditionTask) {
-	    GravyConditionTask gct = (GravyConditionTask)object;
-	    object = gct.getConditionTask();
-	}
         for (Iterator iter = map.entrySet().iterator(); iter.hasNext();) {
             Map.Entry entry = (Map.Entry) iter.next();
             String name = (String) entry.getKey();
@@ -350,20 +326,15 @@
     }
 
     protected void setBeanProperty(Object object, String name, Object value) {
-
         if (log.isLoggable(Level.FINE)) {
-	    // note that logging object.toString might throw an exception
-	    // just log the object's classname
-	    String objectClass = object.getClass().getName();
-	    log.fine( "Setting bean property on: " + objectClass + " name: " + name + " value: " + value);
+            log.fine("Setting bean property on: " + object + " name: " + name + " value: " + value);
         }
 
         IntrospectionHelper ih = IntrospectionHelper.getHelper(object.getClass());
 
         if (value instanceof String) {
             try {
-		String valueStr = getProject().replaceProperties((String)value);
-                ih.setAttribute(getAntProject(), object, name.toLowerCase(), (String) valueStr);
+                ih.setAttribute(getAntProject(), object, name.toLowerCase(), (String) value);
                 return;
             }
             catch (Exception e) {
@@ -395,12 +366,7 @@
                     // properly with namespaces.
                     String namespaceUri = "";               // todo: how to set this?
                     UnknownElement unknownElement = null;   // todo: what is expected here?
-		    if (object instanceof GravyConditionTask) {
-			GravyConditionTask gct = (GravyConditionTask)object;
-			object = gct.getConditionTask();
-			ih = IntrospectionHelper.getHelper(object.getClass());
-		    }
-		    dataType = ih.getElementCreator(getAntProject(), namespaceUri, object, name.toLowerCase(), unknownElement).create();
+                    dataType = ih.getElementCreator(getAntProject(), namespaceUri, object, name.toLowerCase(), unknownElement).create();
                 }
                 catch (BuildException be) {
                     log.log(Level.SEVERE, "Caught: " + be, be);
@@ -485,19 +451,10 @@
         return createTask(taskName, (Class) getAntProject().getTaskDefinitions().get(taskName));
     }
 
-    protected Task createGravyConditionTask(String taskName) {
-	Task task = new GravyConditionTask();
-	task.setProject(getAntProject());
-	task.setTaskName(taskName);
-	return task;
-    }
-
     protected Task createTask(String taskName, Class taskType) {
         if (taskType == null) {
             return null;
-        } else if (taskType.equals(ConditionTask.class)) {
-	    return createGravyConditionTask(taskName);
-	}
+        }
         try {
             Object o = taskType.newInstance();
             Task task = null;