From 2b65579b9710efab5b17144c49c554f9b54c0a04 Mon Sep 17 00:00:00 2001
From: Ben Klang <ben@alkaloid.net>
Date: Sun, 3 Oct 2010 13:35:19 -0400
Subject: [PATCH] Rebuild Memcache factory

---
 framework/Core/lib/Horde/Core/{Binder => Factory}/Memcache.php | 7 +------
 framework/Core/lib/Horde/Registry.php                          | 5 ++++-
 framework/Core/package.xml                                     | 6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)
 rename framework/Core/lib/Horde/Core/{Binder => Factory}/Memcache.php (68%)

diff --git a/framework/Core/lib/Horde/Core/Binder/Memcache.php b/framework/Core/lib/Horde/Core/Factory/Memcache.php
similarity index 68%
rename from framework/Core/lib/Horde/Core/Binder/Memcache.php
rename to framework/Core/lib/Horde/Core/Factory/Memcache.php
index b50e141e2..7fb0a145c 100644
--- a/framework/Core/lib/Horde/Core/Binder/Memcache.php
+++ b/framework/Core/lib/Horde/Core/Factory/Memcache.php
@@ -3,7 +3,7 @@
  * @category Horde
  * @package  Core
  */
-class Horde_Core_Binder_Memcache implements Horde_Injector_Binder
+class Horde_Core_Factory_Memcache
 {
     public function create(Horde_Injector $injector)
     {
@@ -11,9 +11,4 @@ class Horde_Core_Binder_Memcache implements Horde_Injector_Binder
             ? null
             : new Horde_Memcache(array_merge($GLOBALS['conf']['memcache'], array('logger' => $injector->getInstance('Horde_Log_Logger'))));
     }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
 }
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 7eb141848..1cc885d44 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -277,7 +277,6 @@ class Horde_Registry
             'Horde_Log_Logger' => new Horde_Core_Binder_Logger(),
             'Horde_LoginTasks' => new Horde_Core_Binder_LoginTasks(),
             'Horde_Mail' => new Horde_Core_Binder_Mail(),
-            'Horde_Memcache' => new Horde_Core_Binder_Memcache(),
             'Horde_Mime_Viewer' => new Horde_Core_Binder_MimeViewer(),
             'Horde_Notification' => new Horde_Core_Binder_Notification(),
             'Horde_Prefs_Identity' => new Horde_Core_Binder_Identity(),
@@ -332,6 +331,10 @@ class Horde_Registry
                 'Horde_Core_Factory_Lock',
                 'create',
             ),
+            'Horde_Memcache' => array(
+                'Horde_Core_Factory_Memcache',
+                'create',
+            ),
             'Horde_Perms' => array(
                 'Horde_Core_Factory_Perms',
                 'create',
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index dd6bae5c9..7836589b2 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -24,7 +24,7 @@ Application Framework.</description>
   <active>yes</active>
  </developer>
  <date>2010-10-03</date>
- <time>11:32:12</time>
+ <time>13:34:55</time>
  <version>
   <release>0.1.0</release>
   <api>0.1.0</api>
@@ -127,7 +127,6 @@ Application Framework.</description>
        <file name="LoginTasks.php" role="php" />
        <file name="Mail.php" role="php" />
        <file name="Mapper.php" role="php" />
-       <file name="Memcache.php" role="php" />
        <file name="MimeViewer.php" role="php" />
        <file name="Notification.php" role="php" />
        <file name="SessionHandler.php" role="php" />
@@ -165,6 +164,7 @@ Application Framework.</description>
        <file name="Ldap.php" role="php" />
        <file name="Lock.php" role="php" />
        <file name="LoginTasks.php" role="php" />
+       <file name="Memcache.php" role="php" />
        <file name="MimeViewer.php" role="php" />
        <file name="Perms.php" role="php" />
        <file name="Prefs.php" role="php" />
@@ -447,7 +447,6 @@ Application Framework.</description>
    <install as="Horde/Core/Binder/LoginTasks.php" name="lib/Horde/Core/Binder/LoginTasks.php" />
    <install as="Horde/Core/Binder/Mail.php" name="lib/Horde/Core/Binder/Mail.php" />
    <install as="Horde/Core/Binder/Mapper.php" name="lib/Horde/Core/Binder/Mapper.php" />
-   <install as="Horde/Core/Binder/Memcache.php" name="lib/Horde/Core/Binder/Memcache.php" />
    <install as="Horde/Core/Binder/MimeViewer.php" name="lib/Horde/Core/Binder/MimeViewer.php" />
    <install as="Horde/Core/Binder/Notification.php" name="lib/Horde/Core/Binder/Notification.php" />
    <install as="Horde/Core/Binder/SessionHandler.php" name="lib/Horde/Core/Binder/SessionHandler.php" />
@@ -481,6 +480,7 @@ Application Framework.</description>
    <install as="Horde/Core/Factory/Ldap.php" name="lib/Horde/Core/Factory/Ldap.php" />
    <install as="Horde/Core/Factory/Lock.php" name="lib/Horde/Core/Factory/Lock.php" />
    <install as="Horde/Core/Factory/LoginTasks.php" name="lib/Horde/Core/Factory/LoginTasks.php" />
+   <install as="Horde/Core/Factory/Memcache.php" name="lib/Horde/Core/Factory/Memcache.php" />
    <install as="Horde/Core/Factory/MimeViewer.php" name="lib/Horde/Core/Factory/MimeViewer.php" />
    <install as="Horde/Core/Factory/Perms.php" name="lib/Horde/Core/Factory/Perms.php" />
    <install as="Horde/Core/Factory/Prefs.php" name="lib/Horde/Core/Factory/Prefs.php" />
-- 
2.11.0