From b65a562721b27cca352d8ffb18f01ea847ca53e4 Mon Sep 17 00:00:00 2001
From: Ben Klang <ben@alkaloid.net>
Date: Sun, 3 Oct 2010 11:32:26 -0400
Subject: [PATCH] Rebuild factory for Horde_Secret

---
 framework/Core/lib/Horde/Core/{Binder => Factory}/Secret.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}/Secret.php (75%)

diff --git a/framework/Core/lib/Horde/Core/Binder/Secret.php b/framework/Core/lib/Horde/Core/Factory/Secret.php
similarity index 75%
rename from framework/Core/lib/Horde/Core/Binder/Secret.php
rename to framework/Core/lib/Horde/Core/Factory/Secret.php
index 19e4e21c7..0b506408b 100644
--- a/framework/Core/lib/Horde/Core/Binder/Secret.php
+++ b/framework/Core/lib/Horde/Core/Factory/Secret.php
@@ -3,7 +3,7 @@
  * @category Horde
  * @package  Core
  */
-class Horde_Core_Binder_Secret implements Horde_Injector_Binder
+class Horde_Core_Factory_Secret
 {
     public function create(Horde_Injector $injector)
     {
@@ -17,9 +17,4 @@ class Horde_Core_Binder_Secret implements Horde_Injector_Binder
             'session_name' => $conf['session']['name']
         ));
     }
-
-    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 b46fa833e..7eb141848 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -281,7 +281,6 @@ class Horde_Registry
             'Horde_Mime_Viewer' => new Horde_Core_Binder_MimeViewer(),
             'Horde_Notification' => new Horde_Core_Binder_Notification(),
             'Horde_Prefs_Identity' => new Horde_Core_Binder_Identity(),
-            'Horde_Secret' => new Horde_Core_Binder_Secret(),
             'Horde_SessionHandler' => new Horde_Core_Binder_SessionHandler(),
             'Horde_Share_Factory' => new Horde_Core_Binder_ShareFactory(),
             'Horde_Template' => new Horde_Core_Binder_Template(),
@@ -337,6 +336,10 @@ class Horde_Registry
                 'Horde_Core_Factory_Perms',
                 'create',
             ),
+            'Horde_Secret' => array(
+                'Horde_Core_Factory_Secret',
+                'create',
+            ),
             'Horde_Service_Twitter' => array(
                 'Horde_Core_Factory_Twitter',
                 'create',
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index b77ae0a27..dd6bae5c9 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:10:02</time>
+ <time>11:32:12</time>
  <version>
   <release>0.1.0</release>
   <api>0.1.0</api>
@@ -130,7 +130,6 @@ Application Framework.</description>
        <file name="Memcache.php" role="php" />
        <file name="MimeViewer.php" role="php" />
        <file name="Notification.php" role="php" />
-       <file name="Secret.php" role="php" />
        <file name="SessionHandler.php" role="php" />
        <file name="ShareFactory.php" role="php" />
        <file name="Template.php" role="php" />
@@ -170,6 +169,7 @@ Application Framework.</description>
        <file name="Perms.php" role="php" />
        <file name="Prefs.php" role="php" />
        <file name="Request.php" role="php" />
+       <file name="Secret.php" role="php" />
        <file name="Share.php" role="php" />
        <file name="TextFilter.php" role="php" />
        <file name="Tree.php" role="php" />
@@ -450,7 +450,6 @@ Application Framework.</description>
    <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/Secret.php" name="lib/Horde/Core/Binder/Secret.php" />
    <install as="Horde/Core/Binder/SessionHandler.php" name="lib/Horde/Core/Binder/SessionHandler.php" />
    <install as="Horde/Core/Binder/ShareFactory.php" name="lib/Horde/Core/Binder/ShareFactory.php" />
    <install as="Horde/Core/Binder/Template.php" name="lib/Horde/Core/Binder/Template.php" />
@@ -486,6 +485,7 @@ Application Framework.</description>
    <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" />
    <install as="Horde/Core/Factory/Request.php" name="lib/Horde/Core/Factory/Request.php" />
+   <install as="Horde/Core/Factory/Secret.php" name="lib/Horde/Core/Factory/Secret.php" />
    <install as="Horde/Core/Factory/Share.php" name="lib/Horde/Core/Factory/Share.php" />
    <install as="Horde/Core/Factory/TextFilter.php" name="lib/Horde/Core/Factory/TextFilter.php" />
    <install as="Horde/Core/Factory/Tree.php" name="lib/Horde/Core/Factory/Tree.php" />
-- 
2.11.0