Moving shell templates dirs.

Updating TemplateTask to reflect changes in directories.
Updating test cases to use App::build()/App::path()

cake/console/libs/tasks/template.php

@@ -52,7 +52,8 @@ function initialize() {
  * @return array Array of bake themes that are installed.
  **/
 	function _findThemes() {
-		$paths = $this->Dispatch->shellPaths;
+		$paths = App::path('shells');
+		array_unshift($paths, CAKE_CORE_INCLUDE_PATH . DS . CAKE . 'console' . DS);
 		$themes = array();
 		foreach ($paths as $path) {
 			$Folder =& new Folder($path . 'templates', false);

cake/tests/cases/console/libs/tasks/template.test.php

@@ -100,7 +100,7 @@ function testSet() {
  * @return void
  **/
 	function testFindingInstalledThemesForBake() {
-		$consoleLibs = CAKE_CORE_INCLUDE_PATH . DS . CONSOLE_LIBS;
+		$consoleLibs = CAKE_CORE_INCLUDE_PATH . DS . CAKE . 'console' . DS;
 		$this->Task->Dispatch->shellPaths = array($consoleLibs);
 		$this->Task->initialize();
 		$this->assertEqual($this->Task->templatePaths, array('default' => $consoleLibs . 'templates' . DS . 'default' . DS));
@@ -138,10 +138,13 @@ function testGetThemePath() {
  * @return void
  **/
 	function testGenerate() {
-		$this->Task->Dispatch->shellPaths = array(
-			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS .  'test_app' . DS . 'vendors' . DS . 'shells' . DS
-		);
+		App::build(array(
+			'shells' => array(
+				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS .  'test_app' . DS . 'vendors' . DS . 'shells' . DS
+			)
+		));
 		$this->Task->initialize();
+		$this->Task->setReturnValue('in', 1);
 		$result = $this->Task->generate('classes', 'test_object', array('test' => 'foo'));
 		$expected = "I got rendered\nfoo";
 		$this->assertEqual($result, $expected);
@@ -154,10 +157,12 @@ function testGenerate() {
  * @return void
  **/
 	function testGenerateWithTemplateFallbacks() {
-		$this->Task->Dispatch->shellPaths = array(
-			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS .  'test_app' . DS . 'vendors' . DS . 'shells' . DS,
-			CAKE_CORE_INCLUDE_PATH . DS . CONSOLE_LIBS
-		);
+		App::build(array(
+			'shells' => array(
+				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS .  'test_app' . DS . 'vendors' . DS . 'shells' . DS,
+				CAKE_CORE_INCLUDE_PATH . DS . 'console' . DS
+			)
+		));
 		$this->Task->initialize();
 		$this->Task->params['theme'] = 'test';
 		$this->Task->set(array(