From c7764c205754e18a5f0f83ce1671861327ce17ea Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Wed, 5 Jan 2011 18:11:27 -0500
Subject: [PATCH] Horde_Oauth_SignatureMethod_Base ->
 Horde_Oauth_SignatureMethod

---
 .../lib/Horde/Oauth/{SignatureMethod/Base.php => SignatureMethod.php}   | 2 +-
 framework/Oauth/lib/Horde/Oauth/SignatureMethod/HmacSha1.php            | 2 +-
 framework/Oauth/lib/Horde/Oauth/SignatureMethod/Plaintext.php           | 2 +-
 framework/Oauth/lib/Horde/Oauth/SignatureMethod/RsaSha1.php             | 2 +-
 framework/Oauth/package.xml                                             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename framework/Oauth/lib/Horde/Oauth/{SignatureMethod/Base.php => SignatureMethod.php} (93%)

diff --git a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/Base.php b/framework/Oauth/lib/Horde/Oauth/SignatureMethod.php
similarity index 93%
rename from framework/Oauth/lib/Horde/Oauth/SignatureMethod/Base.php
rename to framework/Oauth/lib/Horde/Oauth/SignatureMethod.php
index 4cd16cdd6..990491b40 100644
--- a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/Base.php
+++ b/framework/Oauth/lib/Horde/Oauth/SignatureMethod.php
@@ -16,7 +16,7 @@
  * @category Horde
  * @package  Horde_Oauth
  */
-abstract class Horde_Oauth_SignatureMethod_Base
+abstract class Horde_Oauth_SignatureMethod
 {
     abstract public function getName();
 
diff --git a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/HmacSha1.php b/framework/Oauth/lib/Horde/Oauth/SignatureMethod/HmacSha1.php
index d3fb9a7fe..1e7f69d95 100644
--- a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/HmacSha1.php
+++ b/framework/Oauth/lib/Horde/Oauth/SignatureMethod/HmacSha1.php
@@ -16,7 +16,7 @@
  * @category Horde
  * @package  Horde_Oauth
  */
-class Horde_Oauth_SignatureMethod_HmacSha1 extends Horde_Oauth_SignatureMethod_Base
+class Horde_Oauth_SignatureMethod_HmacSha1 extends Horde_Oauth_SignatureMethod
 {
     public function getName()
     {
diff --git a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/Plaintext.php b/framework/Oauth/lib/Horde/Oauth/SignatureMethod/Plaintext.php
index 4e9fd8a3d..b12a078b6 100644
--- a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/Plaintext.php
+++ b/framework/Oauth/lib/Horde/Oauth/SignatureMethod/Plaintext.php
@@ -16,7 +16,7 @@
  * @category Horde
  * @package  Horde_Oauth
  */
-class Horde_Oauth_SignatureMethod_Plaintext extends Horde_Oauth_SignatureMethod_Base
+class Horde_Oauth_SignatureMethod_Plaintext extends Horde_Oauth_SignatureMethod
 {
     public function getName()
     {
diff --git a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/RsaSha1.php b/framework/Oauth/lib/Horde/Oauth/SignatureMethod/RsaSha1.php
index c118de731..2072db361 100644
--- a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/RsaSha1.php
+++ b/framework/Oauth/lib/Horde/Oauth/SignatureMethod/RsaSha1.php
@@ -16,7 +16,7 @@
  * @category Horde
  * @package  Horde_Oauth
  */
-class Horde_Oauth_SignatureMethod_RsaSha1 extends Horde_Oauth_SignatureMethod_Base
+class Horde_Oauth_SignatureMethod_RsaSha1 extends Horde_Oauth_SignatureMethod
 {
     public function __construct($publicKey = null, $privateKey = null)
     {
diff --git a/framework/Oauth/package.xml b/framework/Oauth/package.xml
index 9c0373626..91893ae30 100644
--- a/framework/Oauth/package.xml
+++ b/framework/Oauth/package.xml
@@ -33,7 +33,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <dir name="Horde">
      <dir name="Oauth">
       <dir name="SignatureMethod">
-       <file name="Base.php" role="php" />
        <file name="HmacSha1.php" role="php" />
        <file name="Plaintext.php" role="php" />
        <file name="RsaSha1.php" role="php" />
@@ -41,6 +40,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
       <file name="Consumer.php" role="php" />
       <file name="Exception.php" role="php" />
       <file name="Request.php" role="php" />
+      <file name="SignatureMethod.php" role="php" />
       <file name="Token.php" role="php" />
       <file name="Utils.php" role="php" />
      </dir> <!-- /lib/Horde/Oauth -->
-- 
2.11.0