Commit: 025fac72618c07f4da96ab6bcd234208371a78a9

Author: Nate Abele | Date: 2010-07-05 13:57:22 -0400
Modifying the bootstrap process so the app can be loaded as a plugin.
diff --git a/config/bootstrap/libraries.php b/config/bootstrap/libraries.php index b59e56d..fa275d9 100644 --- a/config/bootstrap/libraries.php +++ b/config/bootstrap/libraries.php @@ -9,40 +9,11 @@ use lithium\core\Libraries; /** - * Optimize default request cycle by loading common classes. If you're implementing custom - * request/response or dispatch classes, you can safely remove these. Actually, you can safely - * remove them anyway, they're just there to give slightly you better out-of-the-box performance. + * Only add the Lithium core if the app is running standalone, and it has not already been added. */ -require LITHIUM_LIBRARY_PATH . '/lithium/core/Object.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/core/StaticObject.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/util/Collection.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/util/collection/Filters.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/util/Inflector.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/util/String.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/core/Adaptable.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/core/Environment.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/net/http/Message.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/net/http/Media.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/net/http/Request.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/net/http/Response.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/net/http/Route.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/net/http/Router.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/action/Controller.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/action/Dispatcher.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/action/Request.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/action/Response.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/template/View.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/template/view/Renderer.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/template/view/Compiler.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/template/view/adapter/File.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/storage/Cache.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/storage/cache/adapter/Apc.php'; - -/** - * Add the Lithium core library. This sets default paths and initializes the autoloader. You - * generally should not need to override any settings. - */ -Libraries::add('lithium'); +if (!Libraries::get('lithium')) { + Libraries::add('lithium'); +} /** * Add the application. You can pass a `'path'` key here if this bootstrap file is outside of @@ -50,9 +21,4 @@ Libraries::add('lithium'); */ Libraries::add('app', array('default' => true)); -/** - * Add some plugins - */ -// Libraries::add('plugin', 'li3_docs'); - ?> \ No newline at end of file