From 01ea34f45240d3beef02d999c8a5efd6b102615f Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Thu, 4 Mar 2010 21:30:26 -0500
Subject: [PATCH] Moving features up to BakeTask.

---
 cake/console/libs/tasks/bake.php       | 16 ++++++++++++++++
 cake/console/libs/tasks/controller.php |  7 -------
 cake/console/libs/tasks/fixture.php    | 20 ++------------------
 cake/console/libs/tasks/model.php      | 15 ---------------
 cake/console/libs/tasks/view.php       |  8 --------
 5 files changed, 18 insertions(+), 48 deletions(-)

diff --git a/cake/console/libs/tasks/bake.php b/cake/console/libs/tasks/bake.php
index 408114b6b..34298ef8f 100644
--- a/cake/console/libs/tasks/bake.php
+++ b/cake/console/libs/tasks/bake.php
@@ -25,6 +25,22 @@ class BakeTask extends Shell {
  */
 	var $name = null;
 
+/**
+ * Name of plugin
+ *
+ * @var string
+ * @access public
+ */
+	var $plugin = null;
+
+/**
+ * The db connection being used for baking
+ *
+ * @var string
+ * @access public
+ */
+	var $connection = null;
+
 /**
  * Gets the path for output.  Checks the plugin property
  * and returns the correct path.
diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index ebfab47dc..08d23ae6e 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -29,13 +29,6 @@ include_once dirname(__FILE__) . DS . 'bake.php';
 class ControllerTask extends BakeTask {
 
 	var $name = 'Controller';
-/**
- * Name of plugin
- *
- * @var string
- * @access public
- */
-	var $plugin = null;
 
 /**
  * Tasks to be loaded by this Task
diff --git a/cake/console/libs/tasks/fixture.php b/cake/console/libs/tasks/fixture.php
index 195392d1c..86ea8e31b 100644
--- a/cake/console/libs/tasks/fixture.php
+++ b/cake/console/libs/tasks/fixture.php
@@ -17,22 +17,14 @@
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-
+include_once dirname(__FILE__) . DS . 'bake.php';
 /**
  * Task class for creating and updating fixtures files.
  *
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
  */
-class FixtureTask extends Shell {
-
-/**
- * Name of plugin
- *
- * @var string
- * @access public
- */
-	var $plugin = null;
+class FixtureTask extends BakeTask {
 
 /**
  * Tasks to be loaded by this Task
@@ -50,14 +42,6 @@ class FixtureTask extends Shell {
  */
 	var $path = null;
 
-/**
- * The db connection being used for baking
- *
- * @var string
- * @access public
- */
-	var $connection = null;
-
 /**
  * Schema instance
  *
diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index 96cff5c62..15449a3b9 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -29,21 +29,6 @@ include_once dirname(__FILE__) . DS . 'bake.php';
 class ModelTask extends BakeTask {
 
 	var $name = 'Model';
-/**
- * Name of plugin
- *
- * @var string
- * @access public
- */
-	var $plugin = null;
-
-/**
- * Name of the db connection used.
- *
- * @var string
- * @access public
- */
-	var $connection = null;
 
 /**
  * path to MODELS directory
diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php
index 07955ec65..b403b295c 100644
--- a/cake/console/libs/tasks/view.php
+++ b/cake/console/libs/tasks/view.php
@@ -30,14 +30,6 @@ class ViewTask extends BakeTask {
 
 	var $name = 'View';
 
-/**
- * Name of plugin
- *
- * @var string
- * @access public
- */
-	var $plugin = null;
-
 /**
  * Tasks to be loaded by this Task
  *