From 0cb703be45477347d339d624ca9ab5882156283a Mon Sep 17 00:00:00 2001
From: Larry Garfield <larry@garfieldtech.com>
Date: Sun, 22 Jan 2012 20:56:35 -0600
Subject: [PATCH 1/3] refs #1400748 by Crell: Move Drupal and Symfony code to
 core/lib and core/vendor respectively.

---
 core/includes/bootstrap.inc                               | 8 ++++----
 .../Drupal/Cache/CacheBackendInterface.php                | 0
 core/{includes => lib}/Drupal/Cache/DatabaseBackend.php   | 0
 core/{includes => lib}/Drupal/Cache/InstallBackend.php    | 0
 core/{includes => lib}/Drupal/Cache/NullBackend.php       | 0
 .../Component/ClassLoader/ApcUniversalClassLoader.php     | 0
 .../Component/ClassLoader/ClassCollectionLoader.php       | 0
 .../Component/ClassLoader/DebugUniversalClassLoader.php   | 0
 .../Symfony/Component/ClassLoader/LICENSE                 | 0
 .../Symfony/Component/ClassLoader/MapClassLoader.php      | 0
 .../Component/ClassLoader/UniversalClassLoader.php        | 0
 .../Symfony/Component/ClassLoader/composer.json           | 0
 .../Symfony/Component/HttpFoundation/ApacheRequest.php    | 0
 .../Symfony/Component/HttpFoundation/Cookie.php           | 0
 .../File/Exception/AccessDeniedException.php              | 0
 .../HttpFoundation/File/Exception/FileException.php       | 0
 .../File/Exception/FileNotFoundException.php              | 0
 .../File/Exception/UnexpectedTypeException.php            | 0
 .../HttpFoundation/File/Exception/UploadException.php     | 0
 .../Symfony/Component/HttpFoundation/File/File.php        | 0
 .../File/MimeType/ContentTypeMimeTypeGuesser.php          | 0
 .../File/MimeType/FileBinaryMimeTypeGuesser.php           | 0
 .../File/MimeType/FileinfoMimeTypeGuesser.php             | 0
 .../HttpFoundation/File/MimeType/MimeTypeGuesser.php      | 0
 .../File/MimeType/MimeTypeGuesserInterface.php            | 0
 .../Component/HttpFoundation/File/UploadedFile.php        | 0
 .../Symfony/Component/HttpFoundation/FileBag.php          | 0
 .../Symfony/Component/HttpFoundation/HeaderBag.php        | 0
 .../Symfony/Component/HttpFoundation/LICENSE              | 0
 .../Symfony/Component/HttpFoundation/ParameterBag.php     | 0
 .../Symfony/Component/HttpFoundation/RedirectResponse.php | 0
 .../Symfony/Component/HttpFoundation/Request.php          | 0
 .../Symfony/Component/HttpFoundation/RequestMatcher.php   | 0
 .../Component/HttpFoundation/RequestMatcherInterface.php  | 0
 .../Symfony/Component/HttpFoundation/Response.php         | 0
 .../Component/HttpFoundation/ResponseHeaderBag.php        | 0
 .../Symfony/Component/HttpFoundation/ServerBag.php        | 0
 .../Symfony/Component/HttpFoundation/Session.php          | 0
 .../HttpFoundation/SessionStorage/ArraySessionStorage.php | 0
 .../SessionStorage/FilesystemSessionStorage.php           | 0
 .../SessionStorage/NativeSessionStorage.php               | 0
 .../HttpFoundation/SessionStorage/PdoSessionStorage.php   | 0
 .../SessionStorage/SessionStorageInterface.php            | 0
 .../Symfony/Component/HttpFoundation/composer.json        | 0
 44 files changed, 4 insertions(+), 4 deletions(-)
 rename core/{includes => lib}/Drupal/Cache/CacheBackendInterface.php (100%)
 rename core/{includes => lib}/Drupal/Cache/DatabaseBackend.php (100%)
 rename core/{includes => lib}/Drupal/Cache/InstallBackend.php (100%)
 rename core/{includes => lib}/Drupal/Cache/NullBackend.php (100%)
 rename core/{includes => vendor}/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php (100%)
 rename core/{includes => vendor}/Symfony/Component/ClassLoader/ClassCollectionLoader.php (100%)
 rename core/{includes => vendor}/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php (100%)
 rename core/{includes => vendor}/Symfony/Component/ClassLoader/LICENSE (100%)
 rename core/{includes => vendor}/Symfony/Component/ClassLoader/MapClassLoader.php (100%)
 rename core/{includes => vendor}/Symfony/Component/ClassLoader/UniversalClassLoader.php (100%)
 rename core/{includes => vendor}/Symfony/Component/ClassLoader/composer.json (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/ApacheRequest.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/Cookie.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/File/Exception/AccessDeniedException.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/File/Exception/FileException.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/File/Exception/FileNotFoundException.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/File/Exception/UnexpectedTypeException.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/File/Exception/UploadException.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/File/File.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/File/MimeType/ContentTypeMimeTypeGuesser.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/File/UploadedFile.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/FileBag.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/HeaderBag.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/LICENSE (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/ParameterBag.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/RedirectResponse.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/Request.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/RequestMatcher.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/RequestMatcherInterface.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/Response.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/ResponseHeaderBag.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/ServerBag.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/Session.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/SessionStorage/ArraySessionStorage.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/SessionStorage/SessionStorageInterface.php (100%)
 rename core/{includes => vendor}/Symfony/Component/HttpFoundation/composer.json (100%)

diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 6c691502e7b..b6419a4d85a 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -2293,7 +2293,7 @@ function _drupal_bootstrap_configuration() {
   // Register explicit vendor namespaces.
   $loader->registerNamespaces(array(
     // All Symfony-borrowed code lives in /core/includes/Symfony.
-    'Symfony' => DRUPAL_ROOT . '/core/includes',
+    'Symfony' => DRUPAL_ROOT . '/core/vendor',
   ));
   // Register the Drupal namespace for classes in core as a fallback.
   // This allows to register additional namespaces within the Drupal namespace
@@ -2303,7 +2303,7 @@ function _drupal_bootstrap_configuration() {
   // register/overload namespaces in Drupal core.
   $loader->registerNamespaceFallbacks(array(
     // All Drupal-namespaced code in core lives in /core/includes/Drupal.
-    'Drupal' => DRUPAL_ROOT . '/core/includes',
+    'Drupal' => DRUPAL_ROOT . '/core/lib',
   ));
 }
 
@@ -3021,7 +3021,7 @@ function drupal_get_complete_schema($rebuild = FALSE) {
  */
 function drupal_classloader() {
   // Include the Symfony ClassLoader for loading PSR-0-compatible classes.
-  require_once DRUPAL_ROOT . '/core/includes/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+  require_once DRUPAL_ROOT . '/core/vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php';
 
   // By default, use the UniversalClassLoader which is best for development,
   // as it does not break when code is moved on the file system. However, as it
@@ -3033,7 +3033,7 @@ function drupal_classloader() {
     switch (variable_get('autoloader_mode', 'default')) {
       case 'apc':
         if (function_exists('apc_store')) {
-          require_once DRUPAL_ROOT . '/core/includes/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php';
+          require_once DRUPAL_ROOT . '/core/vendor/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php';
           $loader = new ApcUniversalClassLoader('drupal.' . $GLOBALS['drupal_hash_salt']);
           break;
         }
diff --git a/core/includes/Drupal/Cache/CacheBackendInterface.php b/core/lib/Drupal/Cache/CacheBackendInterface.php
similarity index 100%
rename from core/includes/Drupal/Cache/CacheBackendInterface.php
rename to core/lib/Drupal/Cache/CacheBackendInterface.php
diff --git a/core/includes/Drupal/Cache/DatabaseBackend.php b/core/lib/Drupal/Cache/DatabaseBackend.php
similarity index 100%
rename from core/includes/Drupal/Cache/DatabaseBackend.php
rename to core/lib/Drupal/Cache/DatabaseBackend.php
diff --git a/core/includes/Drupal/Cache/InstallBackend.php b/core/lib/Drupal/Cache/InstallBackend.php
similarity index 100%
rename from core/includes/Drupal/Cache/InstallBackend.php
rename to core/lib/Drupal/Cache/InstallBackend.php
diff --git a/core/includes/Drupal/Cache/NullBackend.php b/core/lib/Drupal/Cache/NullBackend.php
similarity index 100%
rename from core/includes/Drupal/Cache/NullBackend.php
rename to core/lib/Drupal/Cache/NullBackend.php
diff --git a/core/includes/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php b/core/vendor/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
similarity index 100%
rename from core/includes/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
rename to core/vendor/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
diff --git a/core/includes/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/core/vendor/Symfony/Component/ClassLoader/ClassCollectionLoader.php
similarity index 100%
rename from core/includes/Symfony/Component/ClassLoader/ClassCollectionLoader.php
rename to core/vendor/Symfony/Component/ClassLoader/ClassCollectionLoader.php
diff --git a/core/includes/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php b/core/vendor/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
similarity index 100%
rename from core/includes/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
rename to core/vendor/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
diff --git a/core/includes/Symfony/Component/ClassLoader/LICENSE b/core/vendor/Symfony/Component/ClassLoader/LICENSE
similarity index 100%
rename from core/includes/Symfony/Component/ClassLoader/LICENSE
rename to core/vendor/Symfony/Component/ClassLoader/LICENSE
diff --git a/core/includes/Symfony/Component/ClassLoader/MapClassLoader.php b/core/vendor/Symfony/Component/ClassLoader/MapClassLoader.php
similarity index 100%
rename from core/includes/Symfony/Component/ClassLoader/MapClassLoader.php
rename to core/vendor/Symfony/Component/ClassLoader/MapClassLoader.php
diff --git a/core/includes/Symfony/Component/ClassLoader/UniversalClassLoader.php b/core/vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php
similarity index 100%
rename from core/includes/Symfony/Component/ClassLoader/UniversalClassLoader.php
rename to core/vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php
diff --git a/core/includes/Symfony/Component/ClassLoader/composer.json b/core/vendor/Symfony/Component/ClassLoader/composer.json
similarity index 100%
rename from core/includes/Symfony/Component/ClassLoader/composer.json
rename to core/vendor/Symfony/Component/ClassLoader/composer.json
diff --git a/core/includes/Symfony/Component/HttpFoundation/ApacheRequest.php b/core/vendor/Symfony/Component/HttpFoundation/ApacheRequest.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/ApacheRequest.php
rename to core/vendor/Symfony/Component/HttpFoundation/ApacheRequest.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/Cookie.php b/core/vendor/Symfony/Component/HttpFoundation/Cookie.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/Cookie.php
rename to core/vendor/Symfony/Component/HttpFoundation/Cookie.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/File/Exception/AccessDeniedException.php b/core/vendor/Symfony/Component/HttpFoundation/File/Exception/AccessDeniedException.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/File/Exception/AccessDeniedException.php
rename to core/vendor/Symfony/Component/HttpFoundation/File/Exception/AccessDeniedException.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/File/Exception/FileException.php b/core/vendor/Symfony/Component/HttpFoundation/File/Exception/FileException.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/File/Exception/FileException.php
rename to core/vendor/Symfony/Component/HttpFoundation/File/Exception/FileException.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/File/Exception/FileNotFoundException.php b/core/vendor/Symfony/Component/HttpFoundation/File/Exception/FileNotFoundException.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/File/Exception/FileNotFoundException.php
rename to core/vendor/Symfony/Component/HttpFoundation/File/Exception/FileNotFoundException.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/File/Exception/UnexpectedTypeException.php b/core/vendor/Symfony/Component/HttpFoundation/File/Exception/UnexpectedTypeException.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/File/Exception/UnexpectedTypeException.php
rename to core/vendor/Symfony/Component/HttpFoundation/File/Exception/UnexpectedTypeException.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/File/Exception/UploadException.php b/core/vendor/Symfony/Component/HttpFoundation/File/Exception/UploadException.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/File/Exception/UploadException.php
rename to core/vendor/Symfony/Component/HttpFoundation/File/Exception/UploadException.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/File/File.php b/core/vendor/Symfony/Component/HttpFoundation/File/File.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/File/File.php
rename to core/vendor/Symfony/Component/HttpFoundation/File/File.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/File/MimeType/ContentTypeMimeTypeGuesser.php b/core/vendor/Symfony/Component/HttpFoundation/File/MimeType/ContentTypeMimeTypeGuesser.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/File/MimeType/ContentTypeMimeTypeGuesser.php
rename to core/vendor/Symfony/Component/HttpFoundation/File/MimeType/ContentTypeMimeTypeGuesser.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php b/core/vendor/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php
rename to core/vendor/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php b/core/vendor/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
rename to core/vendor/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php b/core/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
rename to core/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php b/core/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php
rename to core/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/File/UploadedFile.php b/core/vendor/Symfony/Component/HttpFoundation/File/UploadedFile.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/File/UploadedFile.php
rename to core/vendor/Symfony/Component/HttpFoundation/File/UploadedFile.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/FileBag.php b/core/vendor/Symfony/Component/HttpFoundation/FileBag.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/FileBag.php
rename to core/vendor/Symfony/Component/HttpFoundation/FileBag.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/HeaderBag.php b/core/vendor/Symfony/Component/HttpFoundation/HeaderBag.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/HeaderBag.php
rename to core/vendor/Symfony/Component/HttpFoundation/HeaderBag.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/LICENSE b/core/vendor/Symfony/Component/HttpFoundation/LICENSE
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/LICENSE
rename to core/vendor/Symfony/Component/HttpFoundation/LICENSE
diff --git a/core/includes/Symfony/Component/HttpFoundation/ParameterBag.php b/core/vendor/Symfony/Component/HttpFoundation/ParameterBag.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/ParameterBag.php
rename to core/vendor/Symfony/Component/HttpFoundation/ParameterBag.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/RedirectResponse.php b/core/vendor/Symfony/Component/HttpFoundation/RedirectResponse.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/RedirectResponse.php
rename to core/vendor/Symfony/Component/HttpFoundation/RedirectResponse.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/Request.php b/core/vendor/Symfony/Component/HttpFoundation/Request.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/Request.php
rename to core/vendor/Symfony/Component/HttpFoundation/Request.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/RequestMatcher.php b/core/vendor/Symfony/Component/HttpFoundation/RequestMatcher.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/RequestMatcher.php
rename to core/vendor/Symfony/Component/HttpFoundation/RequestMatcher.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/RequestMatcherInterface.php b/core/vendor/Symfony/Component/HttpFoundation/RequestMatcherInterface.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/RequestMatcherInterface.php
rename to core/vendor/Symfony/Component/HttpFoundation/RequestMatcherInterface.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/Response.php b/core/vendor/Symfony/Component/HttpFoundation/Response.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/Response.php
rename to core/vendor/Symfony/Component/HttpFoundation/Response.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/core/vendor/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
rename to core/vendor/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/ServerBag.php b/core/vendor/Symfony/Component/HttpFoundation/ServerBag.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/ServerBag.php
rename to core/vendor/Symfony/Component/HttpFoundation/ServerBag.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/Session.php b/core/vendor/Symfony/Component/HttpFoundation/Session.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/Session.php
rename to core/vendor/Symfony/Component/HttpFoundation/Session.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/SessionStorage/ArraySessionStorage.php b/core/vendor/Symfony/Component/HttpFoundation/SessionStorage/ArraySessionStorage.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/SessionStorage/ArraySessionStorage.php
rename to core/vendor/Symfony/Component/HttpFoundation/SessionStorage/ArraySessionStorage.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php b/core/vendor/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php
rename to core/vendor/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php b/core/vendor/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php
rename to core/vendor/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php b/core/vendor/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php
rename to core/vendor/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/SessionStorage/SessionStorageInterface.php b/core/vendor/Symfony/Component/HttpFoundation/SessionStorage/SessionStorageInterface.php
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/SessionStorage/SessionStorageInterface.php
rename to core/vendor/Symfony/Component/HttpFoundation/SessionStorage/SessionStorageInterface.php
diff --git a/core/includes/Symfony/Component/HttpFoundation/composer.json b/core/vendor/Symfony/Component/HttpFoundation/composer.json
similarity index 100%
rename from core/includes/Symfony/Component/HttpFoundation/composer.json
rename to core/vendor/Symfony/Component/HttpFoundation/composer.json

From 7048b2195fd5b5bcad11536467211e306e35569f Mon Sep 17 00:00:00 2001
From: Larry Garfield <larry@garfieldtech.com>
Date: Sun, 22 Jan 2012 21:05:01 -0600
Subject: [PATCH 2/3] refs #1400748 by Crell: Move Cache subsystem to the Core
 namespace.

---
 core/includes/cache.inc                                    | 6 +++---
 core/lib/Drupal/{ => Core}/Cache/CacheBackendInterface.php | 2 +-
 core/lib/Drupal/{ => Core}/Cache/DatabaseBackend.php       | 2 +-
 core/lib/Drupal/{ => Core}/Cache/InstallBackend.php        | 2 +-
 core/lib/Drupal/{ => Core}/Cache/NullBackend.php           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename core/lib/Drupal/{ => Core}/Cache/CacheBackendInterface.php (99%)
 rename core/lib/Drupal/{ => Core}/Cache/DatabaseBackend.php (99%)
 rename core/lib/Drupal/{ => Core}/Cache/InstallBackend.php (98%)
 rename core/lib/Drupal/{ => Core}/Cache/NullBackend.php (98%)

diff --git a/core/includes/cache.inc b/core/includes/cache.inc
index 48dbdd34e45..a90f54733dd 100644
--- a/core/includes/cache.inc
+++ b/core/includes/cache.inc
@@ -18,10 +18,10 @@
  *   The cache bin for which the cache object should be returned, defaults to
  *   'cache'.
  *
- * @return Drupal\Cache\CacheBackendInterface
+ * @return Drupal\Core\Cache\CacheBackendInterface
  *   The cache object associated with the specified bin.
  *
- * @see Drupal\Cache\CacheBackendInterface
+ * @see Drupal\Core\Cache\CacheBackendInterface
  */
 function cache($bin = 'cache') {
   // Temporary backwards compatibiltiy layer, allow old style prefixed cache
@@ -34,7 +34,7 @@ function cache($bin = 'cache') {
   if (!isset($cache_objects[$bin])) {
     $class = variable_get('cache_class_' . $bin);
     if (!isset($class)) {
-      $class = variable_get('cache_default_class', 'Drupal\Cache\DatabaseBackend');
+      $class = variable_get('cache_default_class', 'Drupal\Core\Cache\DatabaseBackend');
     }
     $cache_objects[$bin] = new $class($bin);
   }
diff --git a/core/lib/Drupal/Cache/CacheBackendInterface.php b/core/lib/Drupal/Core/Cache/CacheBackendInterface.php
similarity index 99%
rename from core/lib/Drupal/Cache/CacheBackendInterface.php
rename to core/lib/Drupal/Core/Cache/CacheBackendInterface.php
index 3cb3c462c4d..6284047456b 100644
--- a/core/lib/Drupal/Cache/CacheBackendInterface.php
+++ b/core/lib/Drupal/Core/Cache/CacheBackendInterface.php
@@ -5,7 +5,7 @@
  * Definition of CacheBackendInterface.
  */
 
-namespace Drupal\Cache;
+namespace Drupal\Core\Cache;
 
 /**
  * Defines an interface for cache implementations.
diff --git a/core/lib/Drupal/Cache/DatabaseBackend.php b/core/lib/Drupal/Core/Cache/DatabaseBackend.php
similarity index 99%
rename from core/lib/Drupal/Cache/DatabaseBackend.php
rename to core/lib/Drupal/Core/Cache/DatabaseBackend.php
index 5d9be1486bf..81522ca1e08 100644
--- a/core/lib/Drupal/Cache/DatabaseBackend.php
+++ b/core/lib/Drupal/Core/Cache/DatabaseBackend.php
@@ -5,7 +5,7 @@
  * Definition of DatabaseBackend.
  */
 
-namespace Drupal\Cache;
+namespace Drupal\Core\Cache;
 
 use Exception;
 
diff --git a/core/lib/Drupal/Cache/InstallBackend.php b/core/lib/Drupal/Core/Cache/InstallBackend.php
similarity index 98%
rename from core/lib/Drupal/Cache/InstallBackend.php
rename to core/lib/Drupal/Core/Cache/InstallBackend.php
index f13ff989b06..91805aee810 100644
--- a/core/lib/Drupal/Cache/InstallBackend.php
+++ b/core/lib/Drupal/Core/Cache/InstallBackend.php
@@ -5,7 +5,7 @@
  * Definition of InstallBackend.
  */
 
-namespace Drupal\Cache;
+namespace Drupal\Core\Cache;
 
 use Exception;
 
diff --git a/core/lib/Drupal/Cache/NullBackend.php b/core/lib/Drupal/Core/Cache/NullBackend.php
similarity index 98%
rename from core/lib/Drupal/Cache/NullBackend.php
rename to core/lib/Drupal/Core/Cache/NullBackend.php
index 3ab731c9f63..c0e1ab42d3b 100644
--- a/core/lib/Drupal/Cache/NullBackend.php
+++ b/core/lib/Drupal/Core/Cache/NullBackend.php
@@ -5,7 +5,7 @@
  * Definition of NullBackend.
  */
 
-namespace Drupal\Cache;
+namespace Drupal\Core\Cache;
 
 /**
  * Defines a stub cache implementation.

From 8b0adb6e1eec2d688865e38ede1a2d81246e022a Mon Sep 17 00:00:00 2001
From: Larry Garfield <larry@garfieldtech.com>
Date: Sun, 22 Jan 2012 21:18:56 -0600
Subject: [PATCH 3/3] refs #1400748 by Crell: Add README files to document the
 purpose of various core directories.

---
 core/lib/Drupal/Component/README.txt | 8 ++++++++
 core/lib/Drupal/Core/README.txt      | 6 ++++++
 core/tests/README.txt                | 3 +++
 core/vendor/README.txt               | 6 ++++++
 4 files changed, 23 insertions(+)
 create mode 100644 core/lib/Drupal/Component/README.txt
 create mode 100644 core/lib/Drupal/Core/README.txt
 create mode 100644 core/tests/README.txt
 create mode 100644 core/vendor/README.txt

diff --git a/core/lib/Drupal/Component/README.txt b/core/lib/Drupal/Component/README.txt
new file mode 100644
index 00000000000..694f233369b
--- /dev/null
+++ b/core/lib/Drupal/Component/README.txt
@@ -0,0 +1,8 @@
+Drupal Components are independent libraries that do not depend on the rest of
+Drupal in order to function.  Components MAY depend on other Components, but
+that is discouraged. Components MAY NOT depend on any code that is not part of
+PHP itself or another Drupal component.
+
+Each Component should be in its own namespace, and should be as self-contained
+as possible.  It should be possible to split a Component off to its own
+repository and use as a stand-alone library, independently of Drupal.
diff --git a/core/lib/Drupal/Core/README.txt b/core/lib/Drupal/Core/README.txt
new file mode 100644
index 00000000000..2ca1bbca00d
--- /dev/null
+++ b/core/lib/Drupal/Core/README.txt
@@ -0,0 +1,6 @@
+Code in the Core namespace represents Drupal subsystems provided by the base
+system.  These subsystems MAY depend on Drupal Components and other Subsystems,
+but MAY NOT depend on any code in a module.
+
+Each Component should be in its own namespace, and should be as self-contained
+as possible.
diff --git a/core/tests/README.txt b/core/tests/README.txt
new file mode 100644
index 00000000000..eaf3caee4dc
--- /dev/null
+++ b/core/tests/README.txt
@@ -0,0 +1,3 @@
+This directory contains test case code for Drupal core Components and Subsystems.
+Test classes should mirror the namespace of the code being tested. Supporting
+code for test classes is allowed.
diff --git a/core/vendor/README.txt b/core/vendor/README.txt
new file mode 100644
index 00000000000..7968995278a
--- /dev/null
+++ b/core/vendor/README.txt
@@ -0,0 +1,6 @@
+3rd party libraries provided by Drupal core should be placed in this directory.
+They should not be modified from their original form at any time. They should
+be changed only to keep up to date with upstream projects.
+
+Code in this directory MAY be licensed under a GPL-compatible non-GPL license. If
+so, it must be properly documented in COPYRIGHT.txt.