From 28d3c557c6af161ebcee2bf8c171c56dffbd116a Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Thu, 7 Oct 2010 13:06:35 -0400
Subject: [PATCH] Move logger binder to a factory binder

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

diff --git a/framework/Core/lib/Horde/Core/Binder/Logger.php b/framework/Core/lib/Horde/Core/Factory/Logger.php
similarity index 93%
rename from framework/Core/lib/Horde/Core/Binder/Logger.php
rename to framework/Core/lib/Horde/Core/Factory/Logger.php
index 10ce01726..d7f085bd4 100644
--- a/framework/Core/lib/Horde/Core/Binder/Logger.php
+++ b/framework/Core/lib/Horde/Core/Factory/Logger.php
@@ -3,7 +3,7 @@
  * @category Horde
  * @package  Core
  */
-class Horde_Core_Binder_Logger implements Horde_Injector_Binder
+class Horde_Core_Factory_Logger
 {
     public function create(Horde_Injector $injector)
     {
@@ -71,8 +71,4 @@ class Horde_Core_Binder_Logger implements Horde_Injector_Binder
         return new Horde_Core_Log_Logger($handler);
     }
 
-    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 6d559009b..658469c37 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -265,7 +265,6 @@ class Horde_Registry
         $binders = array(
             'Horde_Auth_Factory' => new Horde_Core_Binder_AuthFactory(),
             'Horde_Core_Auth_Signup' => new Horde_Core_Binder_AuthSignup(),
-            'Horde_Log_Logger' => new Horde_Core_Binder_Logger(),
             'Horde_Mail' => new Horde_Core_Binder_Mail(),
             'Horde_Mime_Viewer' => new Horde_Core_Binder_MimeViewer(),
             'Horde_Share_Factory' => new Horde_Core_Binder_ShareFactory(),
@@ -313,6 +312,10 @@ class Horde_Registry
                 'Horde_Core_Factory_History',
                 'create',
             ),
+            'Horde_Log_Logger' => array(
+                'Horde_Core_Factory_Logger',
+                'create',
+            ),
             'Horde_Service_Facebook' => array(
                 'Horde_Core_Factory_Facebook',
                 'create',
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 1bc8f49ce..868ffbef2 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -113,7 +113,6 @@ Application Framework.</description>
        <file name="Auth.php" role="php" />
        <file name="AuthFactory.php" role="php" />
        <file name="AuthSignup.php" role="php" />
-       <file name="Logger.php" role="php" />
        <file name="Mail.php" role="php" />
        <file name="Mapper.php" role="php" />
        <file name="MimeViewer.php" role="php" />
@@ -152,6 +151,7 @@ Application Framework.</description>
        <file name="KolabStorage.php" role="php" />
        <file name="Ldap.php" role="php" />
        <file name="Lock.php" role="php" />
+       <file name="Logger.php" role="php" />
        <file name="LoginTasks.php" role="php" />
        <file name="Memcache.php" role="php" />
        <file name="MimeViewer.php" role="php" />
@@ -425,7 +425,6 @@ Application Framework.</description>
    <install as="Horde/Core/Binder/Auth.php" name="lib/Horde/Core/Binder/Auth.php" />
    <install as="Horde/Core/Binder/AuthFactory.php" name="lib/Horde/Core/Binder/AuthFactory.php" />
    <install as="Horde/Core/Binder/AuthSignup.php" name="lib/Horde/Core/Binder/AuthSignup.php" />
-   <install as="Horde/Core/Binder/Logger.php" name="lib/Horde/Core/Binder/Logger.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/MimeViewer.php" name="lib/Horde/Core/Binder/MimeViewer.php" />
@@ -460,6 +459,7 @@ Application Framework.</description>
    <install as="Horde/Core/Factory/KolabStorage.php" name="lib/Horde/Core/Factory/KolabStorage.php" />
    <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/Logger.php" name="lib/Horde/Core/Factory/Logger.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" />
-- 
2.11.0