[project @ [2/2] Change Services_Yadis_ and Services/Yadis/]

4 files changed, 22 insertions, 22 deletions

diff --git a/Auth/OpenID/Consumer.php b/Auth/OpenID/Consumer.php
index 23fae48..9b852eb 100644
--- a/Auth/OpenID/Consumer.php
+++ b/Auth/OpenID/Consumer.php
@@ -173,8 +173,8 @@ require_once "Auth/OpenID/DiffieHellman.php";
 require_once "Auth/OpenID/KVForm.php";
 require_once "Auth/OpenID/Nonce.php";
 require_once "Auth/OpenID/Discover.php";
-require_once "Services/Yadis/Manager.php";
-require_once "Services/Yadis/XRI.php";
+require_once "Auth/Yadis/Manager.php";
+require_once "Auth/Yadis/XRI.php";
 
 /**
  * This is the status code returned when the complete method returns
@@ -250,7 +250,7 @@ class Auth_OpenID_Consumer {
      * Auth_OpenID_DumbStore} can be used.
      *
      * @param mixed session An object which implements the interface
-     * of the Services_Yadis_Session class.  Particularly, this object
+     * of the Auth_Yadis_Session class.  Particularly, this object
      * is expected to have these methods: get($key), set($key,
      * $value), and del($key).  This defaults to a session object
      * which wraps PHP's native session machinery.  You should only
@@ -261,7 +261,7 @@ class Auth_OpenID_Consumer {
                                   $consumer_cls = null)
     {
         if ($session === null) {
-            $session = new Services_Yadis_PHPSession();
+            $session = new Auth_Yadis_PHPSession();
         }
 
         $this->session =& $session;
@@ -278,7 +278,7 @@ class Auth_OpenID_Consumer {
     function getDiscoveryObject(&$session, $openid_url,
                                 $session_key_prefix)
     {
-        return new Services_Yadis_Discovery($session, $openid_url,
+        return new Auth_Yadis_Discovery($session, $openid_url,
                                             $session_key_prefix);
     }
 
@@ -312,7 +312,7 @@ class Auth_OpenID_Consumer {
         // to be cleaned up next time discovery is attempted.
 
         $m = $disco->getManager();
-        $loader = new Services_Yadis_ManagerLoader();
+        $loader = new Auth_Yadis_ManagerLoader();
 
         if ($m) {
             if ($m->stale) {
@@ -558,7 +558,7 @@ class Auth_OpenID_GenericConsumer {
         $this->negotiator =& Auth_OpenID_getDefaultNegotiator();
         $this->_use_assocs = ($this->store ? true : false);
 
-        $this->fetcher = Services_Yadis_Yadis::getHTTPFetcher();
+        $this->fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
 
         $this->session_types = Auth_OpenID_getAvailableSessionTypes();
     }
diff --git a/Auth/OpenID/Discover.php b/Auth/OpenID/Discover.php
index 4f21e7a..caf805f 100644
--- a/Auth/OpenID/Discover.php
+++ b/Auth/OpenID/Discover.php
@@ -7,8 +7,8 @@
 require_once "Auth/OpenID.php";
 require_once "Auth/OpenID/Parse.php";
 require_once "Auth/OpenID/Message.php";
-require_once "Services/Yadis/XRIRes.php";
-require_once "Services/Yadis/Yadis.php";
+require_once "Auth/Yadis/XRIRes.php";
+require_once "Auth/Yadis/Yadis.php";
 
 // XML namespace value
 define('Auth_OpenID_XMLNS_1_0', 'http://openid.net/xmlns/1.0');
@@ -184,7 +184,7 @@ function Auth_OpenID_findOPLocalIdentifier($service, $type_uris)
                                         Auth_OpenID_XMLNS_1_0);
 
     $service->parser->registerNamespace('xrd',
-                                        Services_Yadis_XMLNS_XRD_2_0);
+                                        Auth_Yadis_XMLNS_XRD_2_0);
 
     $parser =& $service->parser;
 
@@ -338,7 +338,7 @@ function Auth_OpenID_discoverWithYadis($uri, &$fetcher)
     // OpenID 1.0 discovery on the same URL will help, so don't bother
     // to catch it.
     $openid_services = array();
-    $response = Services_Yadis_Yadis::discover($uri, $fetcher);
+    $response = Auth_Yadis_Yadis::discover($uri, $fetcher);
     $yadis_url = $response->normalized_uri;
     $yadis_services = array();
 
@@ -346,7 +346,7 @@ function Auth_OpenID_discoverWithYadis($uri, &$fetcher)
         return array($uri, array());
     }
 
-    $xrds =& Services_Yadis_XRDS::parseXRDS($response->response_text);
+    $xrds =& Auth_Yadis_XRDS::parseXRDS($response->response_text);
 
     if ($xrds) {
         $yadis_services =
@@ -412,7 +412,7 @@ function Auth_OpenID_discoverWithoutYadis($uri, &$fetcher)
 
 function Auth_OpenID_discoverXRI($iname, &$fetcher)
 {
-    $resolver = new Services_Yadis_ProxyResolver($fetcher);
+    $resolver = new Auth_Yadis_ProxyResolver($fetcher);
     list($canonicalID, $yadis_services) =
         $resolver->query($iname,
                          Auth_OpenID_getOpenIDTypeURIs(),
@@ -434,7 +434,7 @@ function Auth_OpenID_discoverXRI($iname, &$fetcher)
 
 function Auth_OpenID_discover($uri, &$fetcher)
 {
-    if (Services_Yadis_identifierScheme($uri) == 'XRI') {
+    if (Auth_Yadis_identifierScheme($uri) == 'XRI') {
         return Auth_OpenID_discoverXRI($uri, $fetcher);
     } else {
         return Auth_OpenID_discoverURI($uri, $fetcher);
diff --git a/Auth/OpenID/Message.php b/Auth/OpenID/Message.php
index 520f6d4..b8fd8d8 100644
--- a/Auth/OpenID/Message.php
+++ b/Auth/OpenID/Message.php
@@ -8,7 +8,7 @@
 
 require_once 'Auth/OpenID.php';
 require_once 'Auth/OpenID/KVForm.php';
-require_once 'Services/Yadis/XML.php';
+require_once 'Auth/Yadis/XML.php';
 
 // This doesn't REALLY belong here, but where is better?
 define('Auth_OpenID_IDENTIFIER_SELECT',
diff --git a/Auth/OpenID/URINorm.php b/Auth/OpenID/URINorm.php
index d1c653e..60e900a 100644
--- a/Auth/OpenID/URINorm.php
+++ b/Auth/OpenID/URINorm.php
@@ -9,7 +9,7 @@
  * @license http://www.gnu.org/copyleft/lesser.html LGPL
  */
 
-require_once 'Services/Yadis/Misc.php';
+require_once 'Auth/Yadis/Misc.php';
 
 // from appendix B of rfc 3986 (http://www.ietf.org/rfc/rfc3986.txt)
 function Auth_OpenID_getURIPattern()
@@ -57,8 +57,8 @@ function Auth_OpenID_getUnreserved()
 function Auth_OpenID_getEscapeRE()
 {
     $parts = array();
-    foreach (array_merge(Services_Yadis_getUCSChars(),
-                         Services_Yadis_getIPrivateChars()) as $pair) {
+    foreach (array_merge(Auth_Yadis_getUCSChars(),
+                         Auth_Yadis_getIPrivateChars()) as $pair) {
         list($m, $n) = $pair;
         $parts[] = sprintf("%s-%s", chr($m), chr($n));
     }
@@ -90,15 +90,15 @@ function Auth_OpenID_remove_dot_segments($path)
     $result_segments = array();
     
     while ($path) {
-        if (Services_Yadis_startswith($path, '../')) {
+        if (Auth_Yadis_startswith($path, '../')) {
             $path = substr($path, 3);
-        } else if (Services_Yadis_startswith($path, './')) {
+        } else if (Auth_Yadis_startswith($path, './')) {
             $path = substr($path, 2);
-        } else if (Services_Yadis_startswith($path, '/./')) {
+        } else if (Auth_Yadis_startswith($path, '/./')) {
             $path = substr($path, 2);
         } else if ($path == '/.') {
             $path = '/';
-        } else if (Services_Yadis_startswith($path, '/../')) {
+        } else if (Auth_Yadis_startswith($path, '/../')) {
             $path = substr($path, 3);
             if ($result_segments) {
                 array_pop($result_segments);