Renaming console/libs to console/shells so its more consistent with a…

…pp directories.
cakephp · Oct 17, 2010 · a76ce4a · a76ce4a
1 parent 463eedb
commit a76ce4a
Show file tree

Hide file tree

Showing 22 changed files with 10 additions and 3 deletions.
diff --git a/cake/console/libs/acl.php → cake/console/shells/acl.php b/cake/console/libs/acl.php → cake/console/shells/acl.php
diff --git a/cake/console/libs/api.php → cake/console/shells/api.php b/cake/console/libs/api.php → cake/console/shells/api.php
diff --git a/cake/console/libs/bake.php → cake/console/shells/bake.php b/cake/console/libs/bake.php → cake/console/shells/bake.php
diff --git a/cake/console/libs/command_list.php → cake/console/shells/command_list.php b/cake/console/libs/command_list.php → cake/console/shells/command_list.php
diff --git a/cake/console/libs/console.php → cake/console/shells/console.php b/cake/console/libs/console.php → cake/console/shells/console.php
diff --git a/cake/console/libs/i18n.php → cake/console/shells/i18n.php b/cake/console/libs/i18n.php → cake/console/shells/i18n.php
diff --git a/cake/console/libs/schema.php → cake/console/shells/schema.php b/cake/console/libs/schema.php → cake/console/shells/schema.php
diff --git a/cake/console/libs/shell.php → cake/console/shells/shell.php b/cake/console/libs/shell.php → cake/console/shells/shell.php
diff --git a/cake/console/libs/task_collection.php → cake/console/shells/task_collection.php b/cake/console/libs/task_collection.php → cake/console/shells/task_collection.php
@@ -38,7 +38,8 @@ public function __construct(Shell $Shell, ShellDispatcher $dispatcher) {
 		$this->_Dispatch = $dispatcher;
 	}
 /**
- * Loads/constructs a task.  Will return the instance in the registry if it already exists.
+ * Loads/constructs a task.  Will return the instance in the collection
+ * if it already exists.
  * 
  * @param string $task Task name to load
  * @param array $settings Settings for the task.

diff --git a/cake/console/libs/tasks/bake.php → cake/console/shells/tasks/bake.php b/cake/console/libs/tasks/bake.php → cake/console/shells/tasks/bake.php
diff --git a/cake/console/libs/tasks/controller.php → cake/console/shells/tasks/controller.php b/cake/console/libs/tasks/controller.php → cake/console/shells/tasks/controller.php
diff --git a/cake/console/libs/tasks/db_config.php → cake/console/shells/tasks/db_config.php b/cake/console/libs/tasks/db_config.php → cake/console/shells/tasks/db_config.php
diff --git a/cake/console/libs/tasks/extract.php → cake/console/shells/tasks/extract.php b/cake/console/libs/tasks/extract.php → cake/console/shells/tasks/extract.php
diff --git a/cake/console/libs/tasks/fixture.php → cake/console/shells/tasks/fixture.php b/cake/console/libs/tasks/fixture.php → cake/console/shells/tasks/fixture.php
diff --git a/cake/console/libs/tasks/model.php → cake/console/shells/tasks/model.php b/cake/console/libs/tasks/model.php → cake/console/shells/tasks/model.php
diff --git a/cake/console/libs/tasks/plugin.php → cake/console/shells/tasks/plugin.php b/cake/console/libs/tasks/plugin.php → cake/console/shells/tasks/plugin.php
diff --git a/cake/console/libs/tasks/project.php → cake/console/shells/tasks/project.php b/cake/console/libs/tasks/project.php → cake/console/shells/tasks/project.php
diff --git a/cake/console/libs/tasks/template.php → cake/console/shells/tasks/template.php b/cake/console/libs/tasks/template.php → cake/console/shells/tasks/template.php
diff --git a/cake/console/libs/tasks/test.php → cake/console/shells/tasks/test.php b/cake/console/libs/tasks/test.php → cake/console/shells/tasks/test.php
diff --git a/cake/console/libs/tasks/view.php → cake/console/shells/tasks/view.php b/cake/console/libs/tasks/view.php → cake/console/shells/tasks/view.php
diff --git a/cake/console/libs/testsuite.php → cake/console/shells/testsuite.php b/cake/console/libs/testsuite.php → cake/console/shells/testsuite.php
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
@@ -587,7 +587,11 @@ public static function build($paths = array(), $reset = false) {
 			'views' => array(VIEWS),
 			'helpers' => array(HELPERS),
 			'locales' => array(APP . 'locale' . DS),
-			'shells' => array(APP . 'vendors' . DS . 'shells' . DS, VENDORS . 'shells' . DS),
+			'shells' => array(
+				APP . 'console' . DS . 'shells' . DS,
+				APP . 'vendors' . DS . 'shells' . DS, 
+				VENDORS . 'shells' . DS
+			),
 			'vendors' => array(APP . 'vendors' . DS, VENDORS),
 			'plugins' => array(APP . 'plugins' . DS)
 		);
@@ -690,7 +694,9 @@ public static function core($type = null) {
 			$paths['helpers'][] = $libs . 'view' . DS . 'helpers' . DS;
 			$paths['plugins'][] = $path . 'plugins' . DS;
 			$paths['vendors'][] = $path . 'vendors' . DS;
-			$paths['shells'][] = $cake . 'console' . DS . 'libs' . DS;
+			$paths['shells'][] = $cake . 'console' . DS . 'shells' . DS;
+			// Provide BC path to vendors/shells
+			$paths['shells'][] = $path . 'vendors' . DS . 'shells' . DS;
 
 			Cache::write('core_paths', array_filter($paths), '_cake_core_');
 		}