BUG 000 PM tables class generator & table build using phing

gulliver/thirdparty/phing/BuildEvent.php

@@ -101,7 +101,7 @@ class BuildEvent extends EventObject {
             $this->project = $source->getProject();
             $this->target = $source;
             $this->task = null;
-        } elseif ($source instanceof Task) {
+        } elseif ($source instanceof TaskPhing) {
             $this->project = $source->getProject();
             $this->target = $source->getOwningTarget();
             $this->task = $source;

gulliver/thirdparty/phing/Phing.php

@@ -22,7 +22,7 @@
 require_once 'phing/Project.php';
 require_once 'phing/ProjectComponent.php';
 require_once 'phing/Target.php';
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 
 include_once 'phing/BuildException.php';
 include_once 'phing/BuildEvent.php';

gulliver/thirdparty/phing/Project.php

@@ -598,7 +598,7 @@ class Project {
             
             $o = new $cls();        
     
-            if ($o instanceof Task) {
+            if ($o instanceof TaskPhing) {
                 $task = $o;
             } else {
                 $this->log ("  (Using TaskAdapter for: $taskType)", PROJECT_MSG_DEBUG);

gulliver/thirdparty/phing/Target.php

@@ -137,7 +137,7 @@ class Target implements TaskContainer {
      *  @param   object  The task object to add
      *  @access  public
      */
-    function addTask(Task $task) {
+    function addTask(TaskPhing $task) {
         $this->children[] = $task;
     }
 
@@ -164,7 +164,7 @@ class Target implements TaskContainer {
         $tasks = array();
         for ($i=0,$size=count($this->children); $i < $size; $i++) {
             $tsk = $this->children[$i];
-            if ($tsk instanceof Task) {
+            if ($tsk instanceof TaskPhing) {
                 // note: we're copying objects here!
                 $tasks[] = clone $tsk;
             }
@@ -235,7 +235,7 @@ class Target implements TaskContainer {
     public function main() {
         if ($this->testIfCondition() && $this->testUnlessCondition()) {
             foreach($this->children as $o) {
-                if ($o instanceof Task) {
+                if ($o instanceof TaskPhing) {
                     // child is a task
                     $o->perform();
                 } else {

gulliver/thirdparty/phing/TaskAdapter.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 
 /**
  *  Use introspection to "adapt" an arbitrary ( not extending Task, but with
@@ -30,7 +30,7 @@ require_once 'phing/Task.php';
  *  @version   $Revision: 1.7 $
  *  @package   phing
  */
-class TaskAdapter extends Task {
+class TaskAdapter extends TaskPhing {
     
     /** target object */
     private $proxy;

gulliver/thirdparty/phing/TaskContainer.php

@@ -38,5 +38,5 @@ interface TaskContainer {
      *  @param  object  The task to be added to the container
      *  @access public
      */
-    function addTask(Task $task);
+    function addTask(TaskPhing $task);
 }

gulliver/thirdparty/phing/TaskPhing.php

@@ -0,0 +1,266 @@
+<?php
+/*
+ *  $Id: Task.php 3076 2006-12-18 08:52:12Z fabien $
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information please see
+ * <http://phing.info>.
+ */
+
+require_once 'phing/ProjectComponent.php';
+include_once 'phing/RuntimeConfigurable.php';
+
+/**
+ * The base class for all Tasks.
+ *
+ * Use {@link Project#createTask} to register a new Task.
+ *
+ * @author    Andreas Aderhold <andi@binarycloud.com>
+ * @copyright <20> 2001,2002 THYRELL. All rights reserved
+ * @version   $Revision: 1.11 $
+ * @see       Project#createTask()
+ * @package   phing
+ */
+abstract class TaskPhing extends ProjectComponent {
+
+    /** owning Target object */
+    protected $target;
+    
+    /** description of the task */
+    protected $description;
+    
+    /** internal taskname (req) */
+    protected $taskType;
+    
+    /** taskname for logger */
+    protected $taskName;
+    
+    /** stored buildfile location */
+    protected $location;
+    
+    /** wrapper of the task */
+    protected $wrapper;
+
+    /**
+     * Sets the owning target this task belongs to.
+     *
+     * @param   object  Reference to owning target
+     * @access  public
+     */
+    function setOwningTarget(Target $target) {
+        $this->target = $target;
+    }
+
+    /**
+     *  Returns the owning target of this task.
+     *
+     *  @return  object    The target object that owns this task
+     *  @access  public
+     */
+    function getOwningTarget() {
+        return $this->target;
+    }
+
+    /**
+     *  Returns the name of task, used only for log messages
+     *
+     *  @return  string  Name of this task
+     *  @access  public
+     */
+    function getTaskName() {
+        if ($this->taskName === null) {
+            // if no task name is set, then it's possible
+            // this task was created from within another task.  We don't
+            // therefore know the XML tag name for this task, so we'll just
+            // use the class name stripped of "task" suffix.  This is only
+            // for log messages, so we don't have to worry much about accuracy.
+            return preg_replace('/task$/i', '', get_class($this));
+        }
+        return $this->taskName;
+    }
+
+    /**
+     *  Sets the name of this task for log messages
+     *
+     *  @return  string  A string representing the name of this task for log
+     *  @access  public
+     */
+    function setTaskName($name) {
+        $this->taskName = (string) $name;
+    }
+
+    /**
+     *  Returns the name of the task under which it was invoked,
+     *  usually the XML tagname
+     *
+     *  @return string The type of this task (XML Tag)
+     */
+    function getTaskType() {
+        return $this->taskType;
+    }
+
+    /**
+     *  Sets the type of the task. Usually this is the name of the XML tag
+     *
+     *  @param string The type of this task (XML Tag)
+     */
+    function setTaskType($name) {
+        $this->taskType = (string) $name;
+    }
+	
+	/**
+	 * Returns a name 
+	 * 
+	 */
+	protected function getRegisterSlot($slotName) {
+		return Register::getSlot('task.' . $this->getTaskName() . '.' . $slotName);
+	}
+	
+    /**
+     *  Provides a project level log event to the task.
+     *
+     *  @param string  The message to log
+     *  @param integer The priority of the message
+     *  @see BuildEvent
+     *  @see BuildListener
+     */
+    function log($msg, $level = PROJECT_MSG_INFO) {
+        $this->project->logObject($this, $msg, $level);
+    }
+
+    /**
+     *  Sets a textual description of the task
+     *
+     *  @param    string    The text describing the task
+     */
+    public function setDescription($desc) {
+        $this->description = $desc;
+    }
+
+    /**
+     *  Returns the textual description of the task
+     *
+     *  @return  string  The text description of the task
+     */
+    public function getDescription() {
+        return $this->description;
+    }
+
+    /**
+     *  Called by the parser to let the task initialize properly.
+     *  Should throw a BuildException if something goes wrong with the build
+     *
+     *  This is abstract here, but may not be overloaded by subclasses.
+     *
+     * @throws BuildException
+     */
+    public function init() {
+    }
+
+    /**
+     *  Called by the project to let the task do it's work. This method may be
+     *  called more than once, if the task is invoked more than once. For
+     *  example, if target1 and target2 both depend on target3, then running
+     *  <em>phing target1 target2</em> will run all tasks in target3 twice.
+     *
+     *  Should throw a BuildException if someting goes wrong with the build
+     *
+     *  This is abstract here. Must be overloaded by real tasks.
+     *
+     *  @access  public
+     */
+    abstract function main();
+
+    /**
+     *  Returns the location within the buildfile this task occurs. Used
+     *  by {@link BuildException} to give detailed error messages.
+     *
+     *  @return Location The location object describing the position of this
+     *                   task within the buildfile.
+     */
+    function getLocation() {
+        return $this->location;
+    }
+
+    /**
+     *  Sets the location within the buildfile this task occurs. Called by
+     *  the parser to set location information.
+     *
+     *  @return  object  The location object describing the position of this
+     *                   task within the buildfile.
+     *  @access  public
+     */
+    function setLocation(Location $location) {
+        $this->location = $location;
+    }
+
+    /**
+     *  Returns the wrapper object for runtime configuration
+     *
+     *  @return  object  The wrapper object used by this task
+     *  @access  public
+     */
+    function getRuntimeConfigurableWrapper() {
+        if ($this->wrapper === null) {
+            $this->wrapper = new RuntimeConfigurable($this, $this->getTaskName());
+        }
+        return $this->wrapper;
+    }
+
+    /**
+     *  Sets the wrapper object this task should use for runtime
+     *  configurable elements.
+     *
+     *  @param   object  The wrapper object this task should use
+     *  @access  public
+     */
+    function setRuntimeConfigurableWrapper(RuntimeConfigurable $wrapper) {
+        $this->wrapper = $wrapper;
+    }
+
+    /**
+     *  Configure this task if it hasn't been done already.
+     *
+     *  @access  public
+     */
+    function maybeConfigure() {
+        if ($this->wrapper !== null) {
+            $this->wrapper->maybeConfigure($this->project);
+        }
+    }
+
+    /**
+     *  Perfrom this task
+     *
+     *  @access  public
+     */
+    function perform() {
+
+        try { // try executing task
+            $this->project->fireTaskStarted($this);
+            $this->maybeConfigure();
+            $this->main();
+            $this->project->fireTaskFinished($this, $null=null);
+        } catch (Exception $exc) {
+            if ($exc instanceof BuildException) {
+                if ($exc->getLocation() === null) {
+                    $exc->setLocation($this->getLocation());
+                }
+            }
+            $this->project->fireTaskFinished($this, $exc);
+            throw $exc;
+        }
+    }
+}

gulliver/thirdparty/phing/UnknownElement.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 
 /**
  * Wrapper class that holds all information necessary to create a task
@@ -34,7 +34,7 @@ require_once 'phing/Task.php';
  * @version   $Revision: 1.9 $
  * @package   phing
  */
-class UnknownElement extends Task {
+class UnknownElement extends TaskPhing {
 
     private $elementName;
     private $realThing;
@@ -69,7 +69,7 @@ class UnknownElement extends Task {
     
         $this->realThing = $this->makeObject($this, $this->wrapper);
         $this->wrapper->setProxy($this->realThing);
-        if ($this->realThing instanceof Task) {
+        if ($this->realThing instanceof TaskPhing) {
             $this->realThing->setRuntimeConfigurableWrapper($this->wrapper);
         }
     
@@ -91,7 +91,7 @@ class UnknownElement extends Task {
             throw new BuildException("Should not be executing UnknownElement::main() -- task/type: {$this->elementName}");
         }
         
-        if ($this->realThing instanceof Task) {
+        if ($this->realThing instanceof TaskPhing) {
             $this->realThing->main();
         }
         
@@ -134,12 +134,12 @@ class UnknownElement extends Task {
             }
 
             $childWrapper->setProxy($realChild);
-            if ($realChild instanceof Task) {
+            if ($realChild instanceof TaskPhing) {
                 $realChild->setRuntimeConfigurableWrapper($childWrapper);
             }
 
             $child->handleChildren($realChild, $childWrapper);
-            if ($realChild instanceof Task) {
+            if ($realChild instanceof TaskPhing) {
                 $realChild->maybeConfigure();
             }
         }

gulliver/thirdparty/phing/tasks/ext/CapsuleTask.php

@@ -20,7 +20,7 @@
  * <http://phing.info>. 
  */
  
-include_once 'phing/Task.php';
+include_once 'phing/TaskPhing.php';
 include_once 'phing/BuildException.php';
 include_once 'phing/lib/Capsule.php';
 include_once 'phing/util/StringHelper.php';
@@ -34,7 +34,7 @@ include_once 'phing/util/StringHelper.php';
  * @version   $Revision: 1.17 $
  * @package   phing.tasks.ext
  */
-class CapsuleTask extends Task {
+class CapsuleTask extends TaskPhing {
 
     /**
      * Capsule "template" engine.

gulliver/thirdparty/phing/tasks/ext/CreoleTask.php

@@ -20,7 +20,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 include_once 'phing/types/Reference.php';
 
 /**
@@ -34,7 +34,7 @@ include_once 'phing/types/Reference.php';
  * @version   $Revision: 1.13 $
  * @package   phing.tasks.system
  */
-abstract class CreoleTask extends Task {
+abstract class CreoleTask extends TaskPhing {
 
     /**
      * Used for caching loaders / driver. This is to avoid

gulliver/thirdparty/phing/tasks/ext/MailTask.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
  
-include_once 'phing/Task.php';
+include_once 'phing/TaskPhing.php';
 
 /**
  *  Send a message by mail() 
@@ -30,7 +30,7 @@ include_once 'phing/Task.php';
  *  @version  $Revision: 1.1 $
  *  @package  phing.tasks.ext
  */
-class MailTask extends Task {
+class MailTask extends TaskPhing {
 
     protected $recipient;
       

gulliver/thirdparty/phing/tasks/ext/PackageAsPathTask.php

@@ -20,7 +20,7 @@
  * <http://phing.info>. 
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 
 /**
  * Convert dot-notation packages to relative paths.
@@ -29,7 +29,7 @@ require_once 'phing/Task.php';
  * @version   $Revision: 1.5 $
  * @package   phing.tasks.ext
  */
-class PackageAsPathTask extends Task {
+class PackageAsPathTask extends TaskPhing {
 
     /** The package to convert. */
     protected $pckg;

gulliver/thirdparty/phing/tasks/ext/PhpLintTask.php

@@ -1,5 +1,5 @@
 <?php
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 
 /**
  * A PHP lint task. Checking syntax of one or more PHP source file.
@@ -7,7 +7,7 @@ require_once 'phing/Task.php';
  * @author   Knut Urdalen <knut.urdalen@telio.no>
  * @package  phing.tasks.ext
  */
-class PhpLintTask extends Task {
+class PhpLintTask extends TaskPhing {
 
   protected $file;  // the source file (from xml attribute)
   protected $filesets = array(); // all fileset objects assigned to this task

gulliver/thirdparty/phing/tasks/ext/SmartyTask.php

@@ -20,7 +20,7 @@
  * <http://phing.info>. 
  */
  
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 include_once 'phing/BuildException.php';
 include_once 'phing/util/StringHelper.php';
 
@@ -40,7 +40,7 @@ include_once 'phing/util/StringHelper.php';
  * @version   $Id: SmartyTask.php 3076 2006-12-18 08:52:12Z fabien $
  * @package   phing.tasks.ext
  */
-class SmartyTask extends Task {
+class SmartyTask extends TaskPhing {
 
     /**
      * Smarty template engine.

gulliver/thirdparty/phing/tasks/ext/XmlLintTask.php

@@ -1,5 +1,5 @@
 <?php
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 
 /**
  * A XML lint task. Checking syntax of one or more XML files against an XML Schema using the DOM extension.
@@ -7,7 +7,7 @@ require_once 'phing/Task.php';
  * @author   Knut Urdalen <knut.urdalen@telio.no>
  * @package  phing.tasks.ext
  */
-class XmlLintTask extends Task {
+class XmlLintTask extends TaskPhing {
 
   protected $file;  // the source file (from xml attribute)
   protected $schema; // the schema file (from xml attribute)

gulliver/thirdparty/phing/tasks/ext/ZendCodeAnalyzerTask.php

@@ -1,5 +1,5 @@
 <?php
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 
 /**
  * ZendCodeAnalyzerTask analyze PHP source code using the ZendCodeAnalyzer included in Zend Studio 5.1
@@ -41,7 +41,7 @@ require_once 'phing/Task.php';
  * @author   Knut Urdalen <knut.urdalen@telio.no>
  * @package  phing.tasks.ext
  */
-class ZendCodeAnalyzerTask extends Task {
+class ZendCodeAnalyzerTask extends TaskPhing {
   
   protected $analyzerPath = ""; // Path to ZendCodeAnalyzer binary
   protected $file = "";  // the source file (from xml attribute)

gulliver/thirdparty/phing/tasks/ext/coverage/CoverageMergerTask.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 require_once 'phing/system/io/PhingFile.php';
 require_once 'phing/system/io/Writer.php';
 require_once 'phing/system/util/Properties.php';
@@ -33,7 +33,7 @@ require_once 'phing/tasks/ext/coverage/CoverageMerger.php';
  * @package phing.tasks.ext.coverage
  * @since 2.1.0
  */
-class CoverageMergerTask extends Task
+class CoverageMergerTask extends TaskPhing
 {
 	/** the list of filesets containing the .php filename rules */
 	private $filesets = array();

gulliver/thirdparty/phing/tasks/ext/coverage/CoverageReportTask.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 require_once 'phing/system/io/PhingFile.php';
 require_once 'phing/system/io/Writer.php';
 require_once 'phing/system/util/Properties.php';
@@ -34,7 +34,7 @@ require_once 'phing/tasks/ext/coverage/CoverageReportTransformer.php';
  * @package phing.tasks.ext.coverage
  * @since 2.1.0
  */
-class CoverageReportTask extends Task
+class CoverageReportTask extends TaskPhing
 {
 	private $outfile = "coverage.xml";
 

gulliver/thirdparty/phing/tasks/ext/coverage/CoverageReportTransformer.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 require_once 'phing/system/io/PhingFile.php';
 require_once 'phing/system/io/FileWriter.php';
 require_once 'phing/util/ExtendedFileStream.php';
@@ -40,7 +40,7 @@ class CoverageReportTransformer
 	private $toDir = "";
 	private $document = NULL;
 
-	function __construct(Task $task)
+	function __construct(TaskPhing $task)
 	{
 		$this->task = $task;
 	}

gulliver/thirdparty/phing/tasks/ext/coverage/CoverageSetupTask.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 require_once 'phing/system/io/PhingFile.php';
 require_once 'phing/system/io/Writer.php';
 require_once 'phing/system/util/Properties.php';
@@ -33,7 +33,7 @@ require_once 'phing/tasks/ext/coverage/CoverageMerger.php';
  * @package phing.tasks.ext.coverage
  * @since 2.1.0
  */
-class CoverageSetupTask extends Task
+class CoverageSetupTask extends TaskPhing
 {
 	/** the list of filesets containing the .php filename rules */
 	private $filesets = array();

gulliver/thirdparty/phing/tasks/ext/ioncube/IoncubeEncoderTask.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 require_once 'phing/tasks/ext/ioncube/IoncubeComment.php';
 
 /**
@@ -30,7 +30,7 @@ require_once 'phing/tasks/ext/ioncube/IoncubeComment.php';
  * @package phing.tasks.ext.ioncube
  * @since 2.2.0
  */
-class IoncubeEncoderTask extends Task
+class IoncubeEncoderTask extends TaskPhing
 {
 	private $phpVersion = "5";
 	private $ioncubePath = "/usr/local/ioncube";

gulliver/thirdparty/phing/tasks/ext/ioncube/IoncubeLicenseTask.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 require_once 'phing/tasks/ext/ioncube/IoncubeComment.php';
 
 /**
@@ -30,7 +30,7 @@ require_once 'phing/tasks/ext/ioncube/IoncubeComment.php';
  * @package phing.tasks.ext.ioncube
  * @since 2.2.0
  */
-class IoncubeLicenseTask extends Task
+class IoncubeLicenseTask extends TaskPhing
 {
 	private $ioncubePath = "/usr/local/ioncube";
 	

gulliver/thirdparty/phing/tasks/ext/phpdoc/PHPDocumentorTask.php

@@ -20,7 +20,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 
 /**
  * Task to run phpDocumentor.
@@ -29,7 +29,7 @@ require_once 'phing/Task.php';
  * @version $Id: PHPDocumentorTask.php 3076 2006-12-18 08:52:12Z fabien $
  * @package phing.tasks.ext.phpdoc
  */	
-class PHPDocumentorTask extends Task
+class PHPDocumentorTask extends TaskPhing
 {
 	/**
 	 * The path to the executable for phpDocumentor

gulliver/thirdparty/phing/tasks/ext/phpunit2/PHPUnit2ReportTask.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 require_once 'phing/system/io/PhingFile.php';
 require_once 'phing/system/io/FileWriter.php';
 require_once 'phing/util/ExtendedFileStream.php';
@@ -36,7 +36,7 @@ require_once 'phing/util/ExtendedFileStream.php';
  * @package phing.tasks.ext.phpunit2
  * @since 2.1.0
  */
-class PHPUnit2ReportTask extends Task
+class PHPUnit2ReportTask extends TaskPhing
 {
 	private $format = "noframes";
 	private $styleDir = "";

gulliver/thirdparty/phing/tasks/ext/phpunit2/PHPUnit2Task.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 require_once 'phing/system/io/PhingFile.php';
 require_once 'phing/system/io/Writer.php';
 require_once 'phing/util/LogWriter.php';
@@ -33,7 +33,7 @@ require_once 'phing/util/LogWriter.php';
  * @see BatchTest
  * @since 2.1.0
  */
-class PHPUnit2Task extends Task
+class PHPUnit2Task extends TaskPhing
 {
 	private $batchtests = array();
 	private $formatters = array();
@@ -70,7 +70,7 @@ class PHPUnit2Task extends Task
 		// add some defaults to the PHPUnit2 Filter
 		PHPUnit2_Util_Filter::addFileToFilter('PHPUnit2Task.php');
 		PHPUnit2_Util_Filter::addFileToFilter('PHPUnit2TestRunner.php');
-		PHPUnit2_Util_Filter::addFileToFilter('phing/Task.php');
+		PHPUnit2_Util_Filter::addFileToFilter('phing/TaskPhing.php');
 		PHPUnit2_Util_Filter::addFileToFilter('phing/Target.php');
 		PHPUnit2_Util_Filter::addFileToFilter('phing/Project.php');
 		PHPUnit2_Util_Filter::addFileToFilter('phing/Phing.php');

gulliver/thirdparty/phing/tasks/ext/simpletest/SimpleTestTask.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 require_once 'phing/system/io/PhingFile.php';
 require_once 'phing/system/io/Writer.php';
 require_once 'phing/util/LogWriter.php';
@@ -32,7 +32,7 @@ require_once 'phing/util/LogWriter.php';
  * @package phing.tasks.ext.simpletest
  * @since 2.2.0
  */
-class SimpleTestTask extends Task
+class SimpleTestTask extends TaskPhing
 {
 	private $formatters = array();
 	private $haltonerror = false;

gulliver/thirdparty/phing/tasks/ext/svn/SvnBaseTask.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
  
-include_once 'phing/Task.php';
+include_once 'phing/TaskPhing.php';
 
 /**
  *  Send a message by mail() 
@@ -30,7 +30,7 @@ include_once 'phing/Task.php';
  *  @version  $Id: SvnBaseTask.php 3076 2006-12-18 08:52:12Z fabien $
  *  @package  phing.tasks.ext
  */
-abstract class SvnBaseTask extends Task
+abstract class SvnBaseTask extends TaskPhing
 {
 	private $workingCopy = "";
 	

gulliver/thirdparty/phing/tasks/ext/svn/SvnExportTask.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 require_once 'phing/tasks/ext/svn/SvnBaseTask.php';
 
 /**

gulliver/thirdparty/phing/tasks/ext/svn/SvnLastRevisionTask.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
 
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 require_once 'phing/tasks/ext/svn/SvnBaseTask.php';
 
 /**

gulliver/thirdparty/phing/tasks/system/AdhocTask.php

@@ -19,7 +19,7 @@
  * <http://phing.info>.
  */
  
-require_once 'phing/Task.php';
+require_once 'phing/TaskPhing.php';
 
 /**
  * Abstract class for creating adhoc Phing components in buildfile.
@@ -34,7 +34,7 @@ require_once 'phing/Task.php';
  * @version  $Revision: 1.6 $
  * @package  phing.tasks.system
  */
-class AdhocTask extends Task {
+class AdhocTask extends TaskPhing {
             
     /**
      * The PHP script